summaryrefslogtreecommitdiff
path: root/www/js/MonitorModalCtrl.js
diff options
context:
space:
mode:
Diffstat (limited to 'www/js/MonitorModalCtrl.js')
-rw-r--r--www/js/MonitorModalCtrl.js11
1 files changed, 7 insertions, 4 deletions
diff --git a/www/js/MonitorModalCtrl.js b/www/js/MonitorModalCtrl.js
index 19117627..14eb4429 100644
--- a/www/js/MonitorModalCtrl.js
+++ b/www/js/MonitorModalCtrl.js
@@ -1278,24 +1278,26 @@ 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 +
- "&scale=" + scale +
- '&buffer=1000';
+ "&scale=" + scale;
if (fps) {
stream +='&maxfps='+fps;
}
stream += $rootScope.authSession +
- "&rand=" + $rootScope.modalRand +
appendSingleStreamConnKey();
+ if (currentStreamState != streamState.SNAPSHOT_LOWQUALITY)
+ stream += "&rand=" + $rootScope.modalRand + "&buffer="+ld.liveStreamBuffer;
+
//console.log ("STREAM="+stream);
if (stream) stream += NVR.insertBasicAuthToken();
@@ -1306,6 +1308,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
function getSingleStreamMode() {
+ if (currentStreamState == streamState.SNAPSHOT_LOWQUALITY) return 'single';
return $scope.isModalStreamPaused ? 'single' : 'jpeg';
}