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

Merge pull request #26 from digital-gnome/NPH-ZMS-loading-on-mp4 

Only load imageFeed if needed
This commit is contained in:
Isaac Connor 2017-10-05 17:09:45 -04:00 committed by GitHub
parent 69ab1b18ad 6952e84c01
commit ed3d001c65
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/skins/classic/views/event.php
View File

@ -182,7 +182,8 @@ if ( $Event->DefaultVideo() ) {
} // end if DefaultVideo
?>
</div><!--eventVideo-->
<div id="imageFeed"<?php if ( $Event->DefaultVideo() ) { ?> class="hidden"<?php } ?>>
<?php if (!$Event->DefaultVideo()) { ?>
<div id="imageFeed">
<?php
if ( ZM_WEB_STREAM_METHOD == 'mpeg' && ZM_MPEG_LIVE_FORMAT ) {
$streamSrc = $Event->getStreamSrc( array( 'mode'=>'mpeg', 'scale'=>$scale, 'rate'=>$rate, 'bitrate'=>ZM_WEB_VIDEO_BITRATE, 'maxfps'=>ZM_WEB_VIDEO_MAXFPS, 'format'=>ZM_MPEG_REPLAY_FORMAT, 'replay'=>$replayMode ) );
@ -220,6 +221,7 @@ if ( ZM_WEB_STREAM_METHOD == 'mpeg' && ZM_MPEG_LIVE_FORMAT ) {
</div><!--progressBar-->
</div><!--imageFeed-->
</div>
<?php } /*end if !DefaultVideo*/ ?>
<?php
if ( $Event->SaveJPEGs() & 3 ) { // frames or analysis
?>