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

Merge branch 'fix_zone_edit' into storageareas

This commit is contained in:
Isaac Connor 2016-04-29 10:46:37 -04:00
parent 819dad455e be5f0cd4a9
commit 0044161b9c
2 changed files with 64 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

135
web/includes/functions.php
View File

@ -217,14 +217,20 @@ function getMimeType( $file )
return( trim( exec( 'file -bi '.escapeshellarg( $file ).' 2>/dev/null' ) ) ); return( trim( exec( 'file -bi '.escapeshellarg( $file ).' 2>/dev/null' ) ) );
} }
function outputVideoStream( $id, $src, $width, $height, $format, $title="" ) function outputVideoStream( $id, $src, $width, $height, $format, $title="" ) {
{ echo getVideoStreamHTML( $id, $src, $width, $height, $format, $title );
if ( file_exists( $src ) ) }
function getVideoStreamHTML( $id, $src, $width, $height, $format, $title="" ) {
$html = '';
$width = validInt($width);
$height = validInt($height);
$title = validHtmlStr($title);
if ( file_exists( $src ) ) {
$mimeType = getMimeType( $src ); $mimeType = getMimeType( $src );
else } else {
{ switch( $format ) {
switch( $format )
{
case 'asf' : case 'asf' :
$mimeType = "video/x-ms-asf"; $mimeType = "video/x-ms-asf";
break; break;
@ -252,118 +258,95 @@ function outputVideoStream( $id, $src, $width, $height, $format, $title="" )
} }
if ( !$mimeType || ($mimeType == 'application/octet-stream') ) if ( !$mimeType || ($mimeType == 'application/octet-stream') )
$mimeType = 'video/'.$format; $mimeType = 'video/'.$format;
$objectTag = false; if ( ZM_WEB_USE_OBJECT_TAGS ) {
if ( ZM_WEB_USE_OBJECT_TAGS ) switch( $mimeType ) {
{
switch( $mimeType )
{
case "video/x-ms-asf" : case "video/x-ms-asf" :
case "video/x-msvideo" : case "video/x-msvideo" :
case "video/mp4" : case "video/mp4" :
{ {
if ( isWindows() ) if ( isWindows() ) {
{ return '<object id="'.$id.'" width="'.$width.'" height="'.$height.'
?>
<object id="<?php echo $id ?>" width="<?php echo validNum($width) ?>" height="<?php echo validNum($height) ?>"
classid="CLSID:22D6F312-B0F6-11D0-94AB-0080C74C7E95" classid="CLSID:22D6F312-B0F6-11D0-94AB-0080C74C7E95"
codebase="http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=6,0,02,902" codebase="http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=6,0,02,902"
standby="Loading Microsoft Windows Media Player components..." standby="Loading Microsoft Windows Media Player components..."
type="<?php echo $mimeType ?>"> type="'.$mimeType.'">
<param name="FileName" value="<?php echo $src ?>"/> <param name="FileName" value="'.$src.'"/>
<param name="autoStart" value="1"/> <param name="autoStart" value="1"/>
<param name="showControls" value="0"/> <param name="showControls" value="0"/>
<embed type="<?php echo $mimeType ?>" <embed type="'.$mimeType.'"
pluginspage="http://www.microsoft.com/Windows/MediaPlayer/" pluginspage="http://www.microsoft.com/Windows/MediaPlayer/"
src="<?php echo $src ?>" src="'.$src.'"
name="<?php echo validHtmlStr($title) ?>" name="'.$title.'"
width="<?php echo validNum($width) ?>" width="'.$width.'"
height="<?php echo validInt($height) ?>" height="'.$height.'"
autostart="1" autostart="1"
showcontrols="0"> showcontrols="0">
</embed> </embed>
</object> </object>';
<?php
$objectTag = true;
} }
break;
} }
case "video/quicktime" : case "video/quicktime" :
{ {
?> return '<object id="'.$id.'" width="'.$width.'" height="'.$height.'"
<object id="<?php echo $id ?>" width="<?php echo $width ?>" height="<?php echo $height ?>"
classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B" classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B"
codebase="http://www.apple.com/qtactivex/qtplugin.cab" codebase="http://www.apple.com/qtactivex/qtplugin.cab"
type="<?php echo $mimeType ?>"> type="'.$mimeType.'">
<param name="src" value="<?php echo $src ?>"/> <param name="src" value="'.$src.'"/>
<param name="autoplay" VALUE="true"/> <param name="autoplay" VALUE="true"/>
<param name="controller" VALUE="false"/> <param name="controller" VALUE="false"/>
<embed type="<?php echo $mimeType ?>" <embed type="'.$mimeType.'"
src="<?php echo $src ?>" src="'.$src.'"
pluginspage="http://www.apple.com/quicktime/download/" pluginspage="http://www.apple.com/quicktime/download/"
name="<?php echo validHtmlStr($title) ?>" name="'.$title.'" width="'.$width.'" height="'.$height.'"
width="<?php echo validInt($width) ?>"
height="<?php echo validInt($height) ?>"
autoplay="true" autoplay="true"
controller="true"> controller="true">
</embed> </embed>
</object> </object>';
<?php
$objectTag = true;
break;
} }
case "application/x-shockwave-flash" : case "application/x-shockwave-flash" :
{ {
?> return '<object id="'.$id.'" width="'.$width.'" height="'.$height.'"
<object id="<?php echo $id ?>" width="<?php echo $width ?>" height="<?php echo $height ?>"
classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0" codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0"
type="<?php echo $mimeType ?>"> type="'.$mimeType.'">
<param name="movie" value="<?php echo $src ?>"/> <param name="movie" value="'.$src.'"/>
<param name="quality" value="high"/> <param name="quality" value="high"/>
<param name="bgcolor" value="#ffffff"/> <param name="bgcolor" value="#ffffff"/>
<embed type="<?php echo $mimeType ?>" <embed type="'.$mimeType.'"
pluginspage="http://www.macromedia.com/go/getflashplayer" pluginspage="http://www.macromedia.com/go/getflashplayer"
src="<?php echo $src ?>" src="'.$src.'"
name="<?php echo validHtmlStr($title) ?>" name="'.$title.'"
width="<?php echo validInt($width) ?>" width="'.$width.'"
height="<?php echo validInt($height) ?>" height="'.$height.'"
quality="high" quality="high"
bgcolor="#ffffff"> bgcolor="#ffffff">
</embed> </embed>
</object> </object>';
<?php
$objectTag = true;
break;
} }
} } # end switch
} } # end if use object tags
if ( !$objectTag ) return '<embed'. ( isset($mimeType)?(' type="'.$mimeType.'"'):'' ). '
{ src="'.$src.'"
?> name="'.$title.'"
<embed<?php echo isset($mimeType)?(' type="'.$mimeType.'"'):"" ?> width="'.$width.'"
src="<?php echo $src ?>" height="'.$height.'"
name="<?php echo validHtmlStr($title) ?>"
width="<?php echo validInt($width) ?>"
height="<?php echo validInt($height) ?>"
autostart="1" autostart="1"
autoplay="1" autoplay="1"
showcontrols="0" showcontrols="0"
controller="0"> controller="0">
</embed> </embed>';
<?php
}
} }
function outputImageStream( $id, $src, $width, $height, $title="" ) function outputImageStream( $id, $src, $width, $height, $title="" ) {
{ echo getImageStream( $id, $src, $width, $height, $title );
}
function getImageStream( $id, $src, $width, $height, $title="" ) {
if ( canStreamIframe() ) { if ( canStreamIframe() ) {
?> return '<iframe id="'.$id.'" src="'.$src.'" alt="'. validHtmlStr($title) .'" width="'. validInt($width)." height=".validInt($height).'"/>';
<iframe id="<?php echo $id ?>" src="<?php echo $src ?>" alt="<?php echo validHtmlStr($title) ?>" width="<?php echo $width ?>" height="<?php echo $height ?>"/>
<?php
} else { } else {
?> return '<img id="'.$id.'" src="'.$src.'" alt="'. validHtmlStr($title) .'" width="'. validInt($width) .'" height="'. validInt( $height ).'"/>';
<img id="<?php echo $id ?>" src="<?php echo $src ?>" alt="<?php echo validHtmlStr($title) ?>" width="<?php echo $width ?>" height="<?php echo $height ?>"/>
<?php
} }
} }
@ -2511,11 +2494,11 @@ function getStreamHTML( $monitor, $scale=100 ) {
//FIXME, the width and height of the image need to be scaled. //FIXME, the width and height of the image need to be scaled.
if ( ZM_WEB_STREAM_METHOD == 'mpeg' && ZM_MPEG_LIVE_FORMAT ) { if ( ZM_WEB_STREAM_METHOD == 'mpeg' && ZM_MPEG_LIVE_FORMAT ) {
$streamSrc = $monitor->getStreamSrc( array( "mode=mpeg", "scale=".$scale, "bitrate=".ZM_WEB_VIDEO_BITRATE, "maxfps=".ZM_WEB_VIDEO_MAXFPS, "format=".ZM_MPEG_LIVE_FORMAT ) ); $streamSrc = $monitor->getStreamSrc( array( "mode=mpeg", "scale=".$scale, "bitrate=".ZM_WEB_VIDEO_BITRATE, "maxfps=".ZM_WEB_VIDEO_MAXFPS, "format=".ZM_MPEG_LIVE_FORMAT ) );
outputVideoStream( "liveStream", $streamSrc, reScale( $monitor->Width(), $scale ), reScale( $monitor->Height(), $scale ), ZM_MPEG_LIVE_FORMAT, $monitor->Name() ); return getVideoStream( "liveStream", $streamSrc, reScale( $monitor->Width(), $scale ), reScale( $monitor->Height(), $scale ), ZM_MPEG_LIVE_FORMAT, $monitor->Name() );
} else if ( canStream() ) { } else if ( canStream() ) {
$streamSrc = $monitor->getStreamSrc( array( 'mode=jpeg', 'scale='.$scale, 'maxfps='.ZM_WEB_VIDEO_MAXFPS, 'buffer='.$monitor->StreamReplayBuffer() ) ); $streamSrc = $monitor->getStreamSrc( array( 'mode=jpeg', 'scale='.$scale, 'maxfps='.ZM_WEB_VIDEO_MAXFPS, 'buffer='.$monitor->StreamReplayBuffer() ) );
if ( canStreamNative() ) if ( canStreamNative() )
outputImageStream( "liveStream", $streamSrc, reScale( $monitor->Width(), $scale ), reScale( $monitor->Height(), $scale ), $monitor->Name() ); return getImageStream( "liveStream", $streamSrc, reScale( $monitor->Width(), $scale ), reScale( $monitor->Height(), $scale ), $monitor->Name() );
elseif ( canStreamApplet() ) elseif ( canStreamApplet() )
outputHelperStream( "liveStream", $streamSrc, reScale( $monitor->Width(), $scale ), reScale( $monitor->Height(), $scale ), $monitor->Name() ); outputHelperStream( "liveStream", $streamSrc, reScale( $monitor->Width(), $scale ), reScale( $monitor->Height(), $scale ), $monitor->Name() );
} else { } else {

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

@ -118,6 +118,10 @@ $selfIntersecting = isSelfIntersecting( $newZone['Points'] );
$focusWindow = true; $focusWindow = true;
$connkey = generateConnKey(); $connkey = generateConnKey();
$streamSrc = '';
$streamMode = '';
# Have to do this here, because the .js.php references somethings figured out when generating the streamHTML
$StreamHTML = getStreamHTML( $monitor, $scale );
xhtmlHeaders(__FILE__, translate('Zone') ); xhtmlHeaders(__FILE__, translate('Zone') );
?> ?>
@ -211,7 +215,7 @@ xhtmlHeaders(__FILE__, translate('Zone') );
<div id="definitionPanel"> <div id="definitionPanel">
<div id="imagePanel"> <div id="imagePanel">
<div id="imageFrame" style="width: <?php echo reScale( $monitor->Width(), $scale ) ?>px; height: <?php echo reScale( $monitor->Height(), $scale ) ?>px;"> <div id="imageFrame" style="width: <?php echo reScale( $monitor->Width(), $scale ) ?>px; height: <?php echo reScale( $monitor->Height(), $scale ) ?>px;">
<?php echo getStreamHTML( $monitor, $scale ); ?> <?php $StreamHTML; ?>
<svg id="zoneSVG" class="zones" style="width: <?php echo reScale( $monitor->Width(), $scale ) ?>px; height: <?php echo reScale( $monitor->Height(), $scale ) ?>px;margin-top: -<?php echo $monitor->Height ?>px;background: none;"> <svg id="zoneSVG" class="zones" style="width: <?php echo reScale( $monitor->Width(), $scale ) ?>px; height: <?php echo reScale( $monitor->Height(), $scale ) ?>px;margin-top: -<?php echo $monitor->Height ?>px;background: none;">
<polygon id="zonePoly" points="<?php echo $zone['AreaCoords'] ?>" class="<?php echo $zone['Type'] ?>"/> <polygon id="zonePoly" points="<?php echo $zone['AreaCoords'] ?>" class="<?php echo $zone['Type'] ?>"/>
Sorry, your browser does not support inline SVG Sorry, your browser does not support inline SVG