ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix scaling the image after changeScale. Limit stream scale to 100, let browser do the scaling

This commit is contained in:
Isaac Connor 2021-10-14 13:00:49 -04:00
parent 086bf7a84f
commit 26ac52aaa9
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
web/skins/classic/views/js/watch.js
View File

@ -98,6 +98,7 @@ function changeScale() {
var scale = $j('#scale').val(); var scale = $j('#scale').val();
var newWidth; var newWidth;
var newHeight; var newHeight;
var autoScale;
// Always turn it off, we will re-add it below. I don't know if you can add a callback multiple // Always turn it off, we will re-add it below. I don't know if you can add a callback multiple
// times and what the consequences would be // times and what the consequences would be
@ -118,6 +119,10 @@ function changeScale() {
var streamImg = $j('#liveStream'+monitorId); var streamImg = $j('#liveStream'+monitorId);
if (streamImg) { if (streamImg) {
var oldSrc = streamImg.attr('src'); var oldSrc = streamImg.attr('src');
streamImg.attr('src', '');
// This is so that we don't waste bandwidth and let the browser do all the scaling.
if (autoScale > 100) autoScale = 100;
if (scale > 100) scale = 100;
var newSrc = oldSrc.replace(/scale=\d+/i, 'scale='+((scale == 'auto' || scale == '0') ? autoScale : scale)); var newSrc = oldSrc.replace(/scale=\d+/i, 'scale='+((scale == 'auto' || scale == '0') ? autoScale : scale));
streamImg.width(newWidth); streamImg.width(newWidth);