diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2019-07-18 16:52:54 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2019-07-18 16:52:54 -0400 |
| commit | 6e594ab97ae1bc71d9737e49cdcb51be984731f2 (patch) | |
| tree | 27f7b649488713eb090fd8f9e0aef13ba59dd37d /www/js/MontageCtrl.js | |
| parent | ef082993d703c355576b9f163737adef53380a48 (diff) | |
allow max FPS settings for Montage Mode (irrelevant if not using multiport)
Diffstat (limited to 'www/js/MontageCtrl.js')
| -rw-r--r-- | www/js/MontageCtrl.js | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index e5274b81..c350df78 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -596,7 +596,7 @@ angular.module('zmApp.controllers') apiurl += '.json?sort=StartTime&direction=desc&limit=1'+$rootScope.authSession; - NVR.debug ("Getting event count"); + NVR.debug ("Getting event count "+apiurl); $http.get(apiurl) .then (function (data) { // console.log ("EVENTS GOT: "+JSON.stringify(data)); @@ -2022,6 +2022,7 @@ angular.module('zmApp.controllers') $scope.constructStream = function (monitor) { var stream; + var fps = NVR.getLogin().montageliveFPS; if (currentStreamState == streamState.STOPPED || monitor.Monitor.listDisplay == 'noshow' ) { //console.log ("STREAM=empty and auth="+$rootScope.authSession); return ""; @@ -2033,8 +2034,13 @@ angular.module('zmApp.controllers') "&monitor=" + monitor.Monitor.Id + "&scale=" + $scope.LoginData.montageQuality + "&rand=" + randToAvoidCacheMem + monitor.Monitor.Id + - "&buffer=1000" + - $rootScope.authSession + + "&buffer=1000" + + if (fps) { + stream +='&maxfps='+fps; + } + + stream += $rootScope.authSession + appendConnKey(monitor.Monitor.connKey); if (stream) stream += NVR.insertBasicAuthToken(); |