From 32d07119c85e9d1c6d310c9a530335d0e8930830 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Wed, 3 Jun 2020 16:57:07 -0400 Subject: #951 add forced mjpeg support on per monitor basis --- www/js/EventModalCtrl.js | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'www/js/EventModalCtrl.js') diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js index 351253c8..c62c2cf6 100644 --- a/www/js/EventModalCtrl.js +++ b/www/js/EventModalCtrl.js @@ -35,6 +35,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro var playState = 'play'; var isSeeking = false; $scope.useFilters = true; + var broadcastHandles = []; @@ -2136,7 +2137,19 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro } - $scope.defaultVideo = event.Event.DefaultVideo; + + + var ld = NVR.getLogin(); + if (ld.monitorSpecific[event.Event.MonitorId] && + ld.monitorSpecific[event.Event.MonitorId].forceMjpeg) { + NVR.debug ('Monitor:'+event.Event.MonitorId+' has forced MJPEG playback'); + $scope.defaultVideo =''; + } else { + + $scope.defaultVideo = event.Event.DefaultVideo; + } + + $scope.connKey = (Math.floor((Math.random() * 999999) + 1)).toString(); -- cgit v1.2.3