From 9ad529d9eb1ed8982e4a99fc5daf6c66a2646a04 Mon Sep 17 00:00:00 2001 From: Ziver Koc Date: Fri, 29 Jan 2021 21:40:54 +0100 Subject: [PATCH] Added videojs player to play hls streams, fixed monitor web page --- .../resource/resource/web/camera_monitor.tmpl | 63 +++++----- .../resource/web/css/video-js.min.css | 1 + .../resource/resource/web/fonts/VideoJS.svg | 114 ++++++++++++++++++ .../resource/resource/web/fonts/VideoJS.ttf | Bin 0 -> 7080 bytes .../resource/resource/web/fonts/VideoJS.woff | Bin 0 -> 4324 bytes .../resource/resource/web/js/video.min.js | 25 ++++ .../web/js/videojs-http-streaming.min.js | 8 ++ ...toringWebPage.java => MonitorWebPage.java} | 10 +- .../hal-nvr/src/se/hal/plugin/nvr/plugin.json | 2 +- .../se/hal/plugin/nvr/RecorderFFmpeg4J.java | 8 +- 10 files changed, 197 insertions(+), 34 deletions(-) create mode 100644 plugins/hal-nvr/resource/resource/web/css/video-js.min.css create mode 100644 plugins/hal-nvr/resource/resource/web/fonts/VideoJS.svg create mode 100644 plugins/hal-nvr/resource/resource/web/fonts/VideoJS.ttf create mode 100644 plugins/hal-nvr/resource/resource/web/fonts/VideoJS.woff create mode 100644 plugins/hal-nvr/resource/resource/web/js/video.min.js create mode 100644 plugins/hal-nvr/resource/resource/web/js/videojs-http-streaming.min.js rename plugins/hal-nvr/src/se/hal/plugin/nvr/page/{MonitoringWebPage.java => MonitorWebPage.java} (80%) diff --git a/plugins/hal-nvr/resource/resource/web/camera_monitor.tmpl b/plugins/hal-nvr/resource/resource/web/camera_monitor.tmpl index 45f57780..b6d3680f 100644 --- a/plugins/hal-nvr/resource/resource/web/camera_monitor.tmpl +++ b/plugins/hal-nvr/resource/resource/web/camera_monitor.tmpl @@ -2,38 +2,45 @@ -
-
-
-