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

Merge pull request #162 from knnniggett/streaming 

Improve Chrome browser support & log streaming events
pull/120/merge
Kyle Johnson 2013-09-23 06:15:46 -07:00
parent 304065cd51 6d00540b5d
commit df13eb1242
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
web/includes/functions.php
View File

@ -796,7 +796,15 @@ function getBrowser( &$browser, &$version )
elseif ( preg_match( '/Chrome\/([0-9.]+)/', $_SERVER['HTTP_USER_AGENT'], $logVersion) ) elseif ( preg_match( '/Chrome\/([0-9.]+)/', $_SERVER['HTTP_USER_AGENT'], $logVersion) )
{ {
$version = $logVersion[1]; $version = $logVersion[1];
$browser = 'chrome'; // Check for old version of Chrome with bug 5876
if ( $version < 7 )
{
$browser = 'oldchrome';
}
else
{
$browser = 'chrome';
}
} }
elseif ( preg_match( '/Safari\/([0-9.]+)/', $_SERVER['HTTP_USER_AGENT'], $logVersion) ) elseif ( preg_match( '/Safari\/([0-9.]+)/', $_SERVER['HTTP_USER_AGENT'], $logVersion) )
{ {
@ -849,6 +857,13 @@ function isInternetExplorer()
return( $browser == "ie" ); return( $browser == "ie" );
} }
function isOldChrome()
{
getBrowser( $browser, $version );
return( $browser == "oldchrome" );
}
function isChrome() function isChrome()
{ {
getBrowser( $browser, $version ); getBrowser( $browser, $version );
@ -882,12 +897,17 @@ function canStreamIframe()
function canStreamNative() function canStreamNative()
{ {
// Chrome can display the stream, but then it blocks everything else (Chrome bug 5876) // Old versions of Chrome can display the stream, but then it blocks everything else (Chrome bug 5876)
return( ZM_WEB_CAN_STREAM == "yes" || ( ZM_WEB_CAN_STREAM == "auto" && (!isInternetExplorer() && !isChrome()) ) ); return( ZM_WEB_CAN_STREAM == "yes" || ( ZM_WEB_CAN_STREAM == "auto" && (!isInternetExplorer() && !isOldChrome()) ) );
} }
function canStreamApplet() function canStreamApplet()
{ {
if ( (ZM_OPT_CAMBOZOLA && !file_exists( ZM_PATH_WEB.'/'.ZM_PATH_CAMBOZOLA )) )
{
Warning ( "ZM_OPT_CAMBOZOLA is enabled, but the system cannot find ".ZM_PATH_WEB."/".ZM_PATH_CAMBOZOLA );
}
return( (ZM_OPT_CAMBOZOLA && file_exists( ZM_PATH_WEB.'/'.ZM_PATH_CAMBOZOLA )) ); return( (ZM_OPT_CAMBOZOLA && file_exists( ZM_PATH_WEB.'/'.ZM_PATH_CAMBOZOLA )) );
} }

1
web/skins/classic/views/watch.php
View File

@ -55,6 +55,7 @@ else
{ {
$streamMode = "single"; $streamMode = "single";
$streamSrc = getStreamSrc( array( "mode=".$streamMode, "monitor=".$monitor['Id'], "scale=".$scale ) ); $streamSrc = getStreamSrc( array( "mode=".$streamMode, "monitor=".$monitor['Id'], "scale=".$scale ) );
Info( "The system has fallen back to single jpeg mode for streaming. Consider enabling Cambozola or upgrading the client browser.");
} }
$showDvrControls = ( $streamMode == 'jpeg' && $monitor['StreamReplayBuffer'] != 0 ); $showDvrControls = ( $streamMode == 'jpeg' && $monitor['StreamReplayBuffer'] != 0 );