diff options
Diffstat (limited to 'www/js')
| -rw-r--r-- | www/js/MonitorModalCtrl.js | 5 | ||||
| -rw-r--r-- | www/js/MontageCtrl.js | 2 | ||||
| -rw-r--r-- | www/js/NVR.js | 7 |
3 files changed, 10 insertions, 4 deletions
diff --git a/www/js/MonitorModalCtrl.js b/www/js/MonitorModalCtrl.js index 5f3f0c4d..14eb4429 100644 --- a/www/js/MonitorModalCtrl.js +++ b/www/js/MonitorModalCtrl.js @@ -1278,11 +1278,12 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$ $scope.constructSingleStream = function () { + var ld = NVR.getLogin(); var scale = (currentStreamState == streamState.SNAPSHOT_LOWQUALITY) ? '10':$scope.quality; var stream; - var fps = NVR.getLogin().singleliveFPS; + var fps =ld.singleliveFPS; stream = $scope.monitor.Monitor.streamingURL + "/nph-zms?mode=" + getSingleStreamMode() + "&monitor=" + $scope.monitorId + @@ -1295,7 +1296,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$ appendSingleStreamConnKey(); if (currentStreamState != streamState.SNAPSHOT_LOWQUALITY) - stream += "&rand=" + $rootScope.modalRand + "&buffer=1000"; + stream += "&rand=" + $rootScope.modalRand + "&buffer="+ld.liveStreamBuffer; //console.log ("STREAM="+stream); diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index d01628c3..f03677b7 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -2070,7 +2070,7 @@ angular.module('zmApp.controllers') "/nph-zms?mode=" + getMode() + "&monitor=" + monitor.Monitor.Id + "&scale=" + $scope.LoginData.montageQuality + - "&buffer=1000"+ + "&buffer="+ $scope.LoginData.liveStreamBuffer + "&rand=" + randToAvoidCacheMem + monitor.Monitor.Id; if (fps) { diff --git a/www/js/NVR.js b/www/js/NVR.js index 0572d3ab..36ddf880 100644 --- a/www/js/NVR.js +++ b/www/js/NVR.js @@ -21,7 +21,7 @@ angular.module('zmApp.controllers') DO NOT TOUCH zmAppVersion It is changed by sync_version.sh */ - var zmAppVersion = "1.3.083"; + var zmAppVersion = "1.3.085"; var zmAPIVersion = null; var isBackground = false; var justResumed = false; @@ -209,6 +209,7 @@ angular.module('zmApp.controllers') 'kioskPassword': '', 'useAPICaching': true, 'pauseStreams': false, + 'liveStreamBuffer': 100, }; @@ -1597,6 +1598,10 @@ angular.module('zmApp.controllers') } + if (typeof loginData.liveStreamBuffer == 'undefined') { + loginData.liveStreamBuffer = 100; + } + loginData.canSwipeMonitors = true; loginData.forceImageModePath = false; loginData.enableBlog = true; |