ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Calculate scale to pass to getStreamSrc for thumbnail still and stream

pull/3023/head
Isaac Connor 2020-08-24 17:42:23 -04:00
parent 2d05fbda8d
commit fe5e005d8e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
web/skins/classic/views/console.php
View File

@ -284,16 +284,16 @@ for( $monitor_i = 0; $monitor_i < count($displayMonitors); $monitor_i += 1 ) {
<?php <?php
} }
$imgHTML=''; $imgHTML='';
if ( ZM_WEB_LIST_THUMBS && $monitor['Status'] == 'Connected' && $running ) { if ( ZM_WEB_LIST_THUMBS && ($monitor['Status'] == 'Connected') && $running ) {
$options = array(); $options = array();
$ratio_factor = $Monitor->Height() / $Monitor->Width(); $ratio_factor = $Monitor->Height() / $Monitor->Width();
$options['width'] = ZM_WEB_LIST_THUMB_WIDTH; $options['width'] = ZM_WEB_LIST_THUMB_WIDTH;
$options['height'] = ZM_WEB_LIST_THUMB_HEIGHT ? ZM_WEB_LIST_THUMB_HEIGHT : ZM_WEB_LIST_THUMB_WIDTH*$ratio_factor; $options['height'] = ZM_WEB_LIST_THUMB_HEIGHT ? ZM_WEB_LIST_THUMB_HEIGHT : ZM_WEB_LIST_THUMB_WIDTH*$ratio_factor;
$options['scale'] = intval(ZM_WEB_LIST_THUMB_WIDTH / $Monitor->Width()); $options['scale'] = intval(100*ZM_WEB_LIST_THUMB_WIDTH / $Monitor->Width());
$options['mode'] = 'single'; $options['mode'] = 'single';
$stillSrc = $Monitor->getStreamSrc($options); $stillSrc = $Monitor->getStreamSrc($options);
$streamSrc = $Monitor->getStreamSrc(array('scale'=>$scale)); $streamSrc = $Monitor->getStreamSrc(array('scale'=>$options['scale']*5));
$thmbWidth = ( $options['width'] ) ? 'width:'.$options['width'].'px;' : ''; $thmbWidth = ( $options['width'] ) ? 'width:'.$options['width'].'px;' : '';
$thmbHeight = ( $options['height'] ) ? 'height:'.$options['height'].'px;' : ''; $thmbHeight = ( $options['height'] ) ? 'height:'.$options['height'].'px;' : '';