From 0c12e440bdb5ad7c6bbea98a76fd1570187d23ac Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Wed, 25 Nov 2020 07:42:00 -0500 Subject: specify mjpeg and h264 modes - ZM seems to do it --- www/js/EventCtrl.js | 8 ++++---- www/js/EventModalCtrl.js | 2 +- www/js/MontageHistoryCtrl.js | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js index 12a45e36..b9e76747 100644 --- a/www/js/EventCtrl.js +++ b/www/js/EventCtrl.js @@ -732,7 +732,7 @@ angular.module('zmApp.controllers') - myevents[i].Event.videoPath = myevents[i].Event.recordingURL + "/index.php?view=view_video&eid=" + myevents[i].Event.Id; + myevents[i].Event.videoPath = myevents[i].Event.recordingURL + "/index.php?mode=mpeg&format=h264&view=view_video&eid=" + myevents[i].Event.Id; // if (idfound) if (idfound) { @@ -2631,7 +2631,7 @@ angular.module('zmApp.controllers') var videoURL; - videoURL = event.Event.recordingURL + "/index.php?view=view_video&eid=" + event.Event.Id; + videoURL = event.Event.recordingURL + "/index.php?view=view_video&mode=mpeg&format=h264&eid=" + event.Event.Id; videoURL += $rootScope.authSession; videoURL += NVR.insertSpecialTokens(); @@ -3204,7 +3204,7 @@ angular.module('zmApp.controllers') - myevents[i].Event.videoPath = myevents[i].Event.recordingURL + "/index.php?view=view_video&eid=" + myevents[i].Event.Id; + myevents[i].Event.videoPath = myevents[i].Event.recordingURL + "/index.php?view=view_video&mode=mpeg&format=h264&eid=" + myevents[i].Event.Id; if (idfound) $scope.events.push(myevents[i]); } @@ -3298,7 +3298,7 @@ angular.module('zmApp.controllers') // console.log ("COMPARING "+NVR.getLogin().url+ " TO " +myevents[currentPagePosition].Event.recordingURL); - myevents[currentPagePosition].Event.videoPath = myevents[currentPagePosition].Event.recordingURL + "/index.php?view=view_video&eid=" + myevents[currentPagePosition].Event.Id; + myevents[currentPagePosition].Event.videoPath = myevents[currentPagePosition].Event.recordingURL + "/index.php?view=view_video&mode=mpeg&format=h264&eid=" + myevents[currentPagePosition].Event.Id; // if (idfound) if (idfound) { diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js index 045c8296..8bab2ac7 100644 --- a/www/js/EventModalCtrl.js +++ b/www/js/EventModalCtrl.js @@ -2201,7 +2201,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro event.Event.video = {}; var videoURL; - videoURL = event.Event.recordingURL + "/index.php?view=view_video&eid=" + event.Event.Id; + videoURL = event.Event.recordingURL + "/index.php?view=view_video&mode=mpeg&format=h264&eid=" + event.Event.Id; if ($rootScope.authSession != 'undefined') videoURL += $rootScope.authSession; if ($rootScope.basicAuthToken) videoURL = videoURL + "&basicauth=" + $rootScope.basicAuthToken; diff --git a/www/js/MontageHistoryCtrl.js b/www/js/MontageHistoryCtrl.js index 501c0f48..ccc02ec0 100644 --- a/www/js/MontageHistoryCtrl.js +++ b/www/js/MontageHistoryCtrl.js @@ -303,7 +303,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc var bw = NVR.getBandwidth() == "lowbw" ? zm.eventMontageQualityLowBW : ld.montageHistoryQuality; if (eType=='video') { - var videoURL= $scope.MontageMonitors[j].Monitor.baseURL + "/index.php?view=view_video&eid=" + eid; + var videoURL= $scope.MontageMonitors[j].Monitor.baseURL + "/index.php?view=view_video&mode=mpeg&format=h264&eid=" + eid; videoURL += $rootScope.authSession; if ($rootScope.basicAuthToken) videoURL = videoURL + "&basicauth=" + $rootScope.basicAuthToken; @@ -428,7 +428,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc var eid = data.events[0].Event.Id; if (eType=='video') { - var videoURL= $scope.MontageMonitors[i].Monitor.baseURL + "/index.php?view=view_video&eid=" + eid; + var videoURL= $scope.MontageMonitors[i].Monitor.baseURL + "/index.php?view=view_video&mode=mpeg&format=h264&eid=" + eid; videoURL += $rootScope.authSession; if ($rootScope.basicAuthToken) videoURL = videoURL + "&basicauth=" + $rootScope.basicAuthToken; @@ -884,7 +884,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc if (success.eid != "null" && success.eid != m.Monitor.eid && success.eid !="-1") { - var videoURL= m.Monitor.baseURL + "/index.php?view=view_video&eid=" + success.eid; + var videoURL= m.Monitor.baseURL + "/index.php?view=view_video&mode=mpeg&format=h264&eid=" + success.eid; videoURL += $rootScope.authSession; if ($rootScope.basicAuthToken) videoURL = videoURL + "&basicauth=" + $rootScope.basicAuthToken; -- cgit v1.2.3