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

Bug 223 - Revamped video presentation, emded & object tags etc, mime-types. 

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1660 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
stan 2005-12-08 11:10:44 +00:00
parent fa0c5348a0
commit 74ac42fb96
5 changed files with 252 additions and 320 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

314
web/zm_funcs.php
View File

@ -145,6 +145,220 @@ function getStreamSrc( $args )
return( $stream_src ); return( $stream_src );
} }
function outputVideoStream( $src, $width, $height, $name, $format )
{
switch ( $format )
{
case "asf" :
$mime_type = "video/x-ms-asf";
break;
case "swf" :
$mime_type = "application/x-shockwave-flash";
break;
case "mp4" :
$mime_type = "video/mp4";
break;
case "mov" :
$mime_type = "video/quicktime";
break;
default :
$mime_type = "video/$format";
break;
}
$object_tag = false;
if ( ZM_WEB_USE_OBJECT_TAGS )
{
switch( $format )
{
case "asf" :
case "wmv" :
{
if ( isWindows() )
{
?>
<object id="<?= $name ?>" width="<?= $width ?>" height="<?= $height ?>"
classid="CLSID:22D6F312-B0F6-11D0-94AB-0080C74C7E95"
codebase="http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=6,0,02,902"
standby="Loading Microsoft Windows Media Player components..."
type="application/x-oleobject">
<param name="FileName" value="<?= $src ?>">
<param name="autoStart" value="1">
<param name="showControls" value="0">
<embed type="<?= $mime_type ?>"
pluginspage = "http://www.microsoft.com/Windows/MediaPlayer/"
src="<?= $src ?>"
name="<?= $name ?>"
width="<?= $width ?>"
height="<?= $height ?>"
autostart="1"
showcontrols="0">
</embed>
</object>
<?php
$object_tag = true;
}
break;
}
case "mov" :
{
?>
<object id="<?= $name ?>" width="<?= $width ?>" height="<?= $height ?>"
classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B"
codebase="http://www.apple.com/qtactivex/qtplugin.cab"
<param name="src" value="<?= $src ?>">
<PARAM name="autoplay" VALUE="true">
<PARAM name="controller" VALUE="false">
<embed type="<?= $mime_type ?>"
src="<?= $src ?>"
pluginspage="http://www.apple.com/quicktime/download/"
name="<?= $name ?>"
width="<?= $width ?>"
height="<?= $height ?>"
autoplay="true"
controller="true"
</embed>
</object>
<?php
$object_tag = true;
break;
}
case "swf" :
{
?>
<object id="<?= $name ?>" width="<?= $width ?>" height="<?= $height ?>"
classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0"
<param name="movie" value="<?= $src ?>">
<param name=quality value="high">
<param name=bgcolor value="#ffffff">
<embed type="<?= $mime_type ?>"
pluginspage="http://www.macromedia.com/go/getflashplayer"
src="<?= $src ?>"
width="<?= $width ?>"
height="<?= $height ?>"
name="<?= $name ?>"
quality="high"
bgcolor="#ffffff"
</embed>
</object>
<?php
$object_tag = true;
break;
}
}
}
if ( !$object_tag )
{
?>
<embed<?= isset($mime_type)?(' type="'.$mime_type.'"'):"" ?>
src="<?= $src ?>"
width="<?= $width ?>"
height="<?= $height ?>"
name="<?= $name ?>"
autostart="1"
autoplay="1"
showcontrols="0"
controller="0">
</embed>
<?php
}
}
function outputImageStream( $src, $width, $height, $name="" )
{
?>
<img src="<?= $src ?>" alt="<?= $name ?>" border="0" width="<?= $width ?>" height="<?= $height ?>">
<?php
}
function outputControlStream( $src, $width, $height, $monitor, $scale, $target )
{
global $PHP_SELF;
?>
<form name="ctrl_form" method="get" action="<?= $PHP_SELF ?>" target="<?= $target ?>">
<input type="hidden" name="view" value="blank">
<input type="hidden" name="mid" value="<?= $monitor['Id'] ?>">
<input type="hidden" name="action" value="control">
<?php
if ( $monitor['CanMoveMap'] )
{
?>
<input type="hidden" name="control" value="move_map">
<?php
}
elseif ( $monitor['CanMoveRel'] )
{
?>
<input type="hidden" name="control" value="move_pseudo_map">
<?php
}
elseif ( $monitor['CanMoveCon'] )
{
?>
<input type="hidden" name="control" value="move_con_map">
<?php
}
?>
<input type="hidden" name="scale" value="<?= $scale ?>">
<input type="image" src="<?= $src ?>" border="0" width="<?= $width ?>" height="<?= $height ?>">
</form>
<?php
}
function outputHelperStream( $src, $width, $height, $name="" )
{
?>
<applet code="com.charliemouse.cambozola.Viewer"
archive="<?= ZM_PATH_CAMBOZOLA ?>"
align="middle"
width="<?= $width ?>"
height="<?= $height ?>">
<param name="url" value="<?= $src ?>">
</applet>
<?php
}
function outputImageStill( $src, $width, $height, $name="" )
{
?>
<img name="zmImage" src="<?= $src ?>" alt="<?= $name ?>" border="0" width="<?= $width ?>" height="<?= $height ?>">
<?php
}
function outputControlStill( $src, $width, $height, $monitor, $scale, $target )
{
global $PHP_SELF;
?>
<form name="ctrl_form" method="get" action="<?= $PHP_SELF ?>" target="<?= $target ?>">
<input type="hidden" name="view" value="blank">
<input type="hidden" name="mid" value="<?= $monitor['Id'] ?>">
<input type="hidden" name="action" value="control">
<?php
if ( $monitor['CanMoveMap'] )
{
?>
<input type="hidden" name="control" value="move_map">
<?php
}
elseif ( $monitor['CanMoveRel'] )
{
?>
<input type="hidden" name="control" value="move_pseudo_map">
<?php
}
elseif ( $monitor['CanMoveCon'] )
{
?>
<input type="hidden" name="control" value="move_con_map">
<?php
}
?>
<input type="hidden" name="scale" value="<?= $scale ?>">
<input type="image" src="<?= $src ?>" border="0" width="<?= $width ?>" height="<?= $height ?>">
</form>
<?php
}
function getZmuCommand( $args ) function getZmuCommand( $args )
{ {
if ( version_compare( phpversion(), "4.1.0", "<") ) if ( version_compare( phpversion(), "4.1.0", "<") )
@ -1109,50 +1323,6 @@ function firstSet()
} }
} }
function getDeterminant( $x0, $y0, $x1, $y1 )
{
return( ( $x0 * $y1 ) - ( $x1 * $y0 ) );
}
function linesIntersect2( $line1, $line2 )
{
// Checking if bounding boxes intersect
if ( max( $line1[0]['x'], $line1[1]['x'] ) < min( $line2[0]['x'], $line2[1]['x'] ) )
return( false );
elseif ( max( $line2[0]['x'], $line2[1]['x'] ) < min( $line1[0]['x'], $line1[1]['x'] ) )
return( false );
elseif ( max( $line1[0]['y'], $line1[1]['y'] ) < min( $line2[0]['y'], $line2[1]['y'] ) )
return( false );
elseif ( max( $line2[0]['y'], $line2[1]['y'] ) < min( $line1[0]['y'], $line1[1]['y'] ) )
return( false );
$dx = $line1[1]['x'] - $line1[0]['x'];
$dy = $line1[1]['y'] - $line1[0]['y'];
$det1 = getDeterminant( $line2[0]['x'] - $line1[0]['x'], $line2[0]['y'] - $line1[0]['y'], $dx, $dy );
$det2 = getDeterminant( $line2[1]['x'] - $line1[0]['x'], $line2[1]['y'] - $line1[0]['y'], $dx, $dy );
if ( ( $det1 < 0 && $det2 > 0 ) || ( $det1 > 0 && $det2 < 0 ) )
{
return( true );
}
if ( !$det1 )
{
if ( !$det2 )
return( true );
elseif ( ($line2[1]['x'] == $line2[0]['x']) && ($line2[1]['y'] == $line2[0]['y']) )
return( true );
}
elseif ( !$det2 )
{
if ( !$dx && !$dy )
return( true );
}
return( false );
}
function linesIntersect( $line1, $line2 ) function linesIntersect( $line1, $line2 )
{ {
global $debug; global $debug;
@ -1199,55 +1369,33 @@ function linesIntersect( $line1, $line2 )
if ( $dx1 && $dx2 ) // Both not vertical if ( $dx1 && $dx2 ) // Both not vertical
{ {
//if ( isset($m1) && isset($m2) ) // Both not horizontal if ( $m1 != $m2 ) // Not parallel or colinear
{ {
if ( $m1 != $m2 ) // Not parallel or colinear $x = ( $b2 - $b1 ) / ( $m1 - $m2 );
{
$x = ( $b2 - $b1 ) / ( $m1 - $m2 );
if ( $x >= $min_x1 && $x <= $max_x1 && $x >= $min_x2 && $x <= $max_x2 ) if ( $x >= $min_x1 && $x <= $max_x1 && $x >= $min_x2 && $x <= $max_x2 )
{
if ( $debug ) echo "Intersecting, at x $x<br>";
return( true );
}
else
{
if ( $debug ) echo "Not intersecting, out of range at x $x<br>";
return( false );
}
}
elseif ( $b1 == $b2 )
{ {
// Colinear, must overlap due to box check, intersect? if ( $debug ) echo "Intersecting, at x $x<br>";
if ( $debug ) echo "Intersecting, colinear<br>";
return( true ); return( true );
} }
else else
{ {
// Parallel if ( $debug ) echo "Not intersecting, out of range at x $x<br>";
if ( $debug ) echo "Not intersecting, parallel<br>";
return( false ); return( false );
} }
} }
//elseif ( isset($m1) ) // Line 2 is horizontal elseif ( $b1 == $b2 )
//{ {
// // Colinear, must overlap due to box check, intersect?
//} if ( $debug ) echo "Intersecting, colinear<br>";
//else // Both lines are horizontal return( true );
//{ }
//if ( $line1[0]['y'] == $line2[0]['y'] ) else
//{ {
//// Colinear, must overlap due to box check, intersect? // Parallel
//if ( $debug ) echo "Intersecting, horizontal, colinear<br>"; if ( $debug ) echo "Not intersecting, parallel<br>";
//return( true ); return( false );
//} }
//else
//{
//// Parallel
//if ( $debug ) echo "Not intersecting, horizontal, parallel<br>";
//return( false );
//}
//}
} }
elseif ( !$dx1 ) // Line 1 is vertical elseif ( !$dx1 ) // Line 1 is vertical
{ {

6
web/zm_html_view_cycle.php
View File

@ -124,13 +124,13 @@ if ( $mode == "stream" )
if ( canStreamNative() ) if ( canStreamNative() )
{ {
?> ?>
<tr><td colspan="3" align="center"><a href="javascript: newWindow( '<?= $PHP_SELF ?>?view=watch&mid=<?= $monitor['Id'] ?>', 'zmWatch<?= $monitor['Id'] ?>', <?= $monitor['Width']+$jws['watch']['w'] ?>, <?= $monitor['Height']+$jws['watch']['h'] ?> );"><img src="<?= $stream_src ?>" border="0" width="<?= reScale( $monitor['Width'], $scale ) ?>" height="<?= reScale( $monitor['Height'], $scale ) ?>"></a></td></tr> <tr><td colspan="3" align="center"><a href="javascript: newWindow( '<?= $PHP_SELF ?>?view=watch&mid=<?= $monitor['Id'] ?>', 'zmWatch<?= $monitor['Id'] ?>', <?= $monitor['Width']+$jws['watch']['w'] ?>, <?= $monitor['Height']+$jws['watch']['h'] ?> );"><?php outputImageStream( $stream_src, reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ), $monitor['Name'] ) ?></a></td></tr>
<?php <?php
} }
else else
{ {
?> ?>
<tr><td colspan="3" align="center"><applet code="com.charliemouse.cambozola.Viewer" archive="<?= ZM_PATH_CAMBOZOLA ?>" align="middle" width="<?= reScale( $monitor['Width'], $scale ) ?>" height="<?= reScale( $monitor['Height'], $scale ) ?>"><param name="url" value="<?= $stream_src ?>"></applet></td></tr> <tr><td colspan="3" align="center"><?php outputHelperStream( $stream_src, reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ) ) ?></td></tr>
<?php <?php
} }
} }
@ -138,7 +138,7 @@ else
{ {
$image_src = getStreamSrc( array( "mode=single", "monitor=".$monitor['Id'], "scale=".$scale ) ); $image_src = getStreamSrc( array( "mode=single", "monitor=".$monitor['Id'], "scale=".$scale ) );
?> ?>
<tr><td colspan="3" align="center"><a href="javascript: newWindow( '<?= $PHP_SELF ?>?view=watch&mid=<?= $monitor['Id'] ?>', 'zmWatch<?= $monitor['Id'] ?>', <?= $monitor['Width']+$jws['watch']['w'] ?>, <?= $monitor['Height']+$jws['watch']['h'] ?> );"><img src="<?= $image_src ?>" border="0" width="<?= reScale( $monitor['Width'], $scale ) ?>" height="<?= reScale( $monitor['Height'], $scale ) ?>"></a></td></tr> <tr><td colspan="3" align="center"><a href="javascript: newWindow( '<?= $PHP_SELF ?>?view=watch&mid=<?= $monitor['Id'] ?>', 'zmWatch<?= $monitor['Id'] ?>', <?= $monitor['Width']+$jws['watch']['w'] ?>, <?= $monitor['Height']+$jws['watch']['h'] ?> );"><?php outputImageStill( $image_src, reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ), $monitor['Name'] ) ?></a></td></tr>
<?php <?php
} }
?> ?>

44
web/zm_html_view_event.php
View File

@ -312,56 +312,18 @@ if ( $mode == "stream" )
if ( ZM_VIDEO_STREAM_METHOD == 'mpeg' && ZM_VIDEO_REPLAY_FORMAT ) if ( ZM_VIDEO_STREAM_METHOD == 'mpeg' && ZM_VIDEO_REPLAY_FORMAT )
{ {
$stream_src = getStreamSrc( array( "mode=mpeg", "event=".$eid, "scale=".$scale, "rate=".$rate, "bitrate=".ZM_WEB_VIDEO_BITRATE, "maxfps=".ZM_WEB_VIDEO_MAXFPS, "format=".ZM_VIDEO_REPLAY_FORMAT ) ); $stream_src = getStreamSrc( array( "mode=mpeg", "event=".$eid, "scale=".$scale, "rate=".$rate, "bitrate=".ZM_WEB_VIDEO_BITRATE, "maxfps=".ZM_WEB_VIDEO_MAXFPS, "format=".ZM_VIDEO_REPLAY_FORMAT ) );
if ( isWindows() ) outputVideoStream( $stream_src, reScale( $event['Width'], $scale ), reScale( $event['Height'], $scale ), $event['Name'], ZM_VIDEO_REPLAY_FORMAT );
{
?>
<object id="MediaPlayer" width="<?= reScale( $event['Width'], $scale ) ?>" height="<?= reScale( $event['Height'], $scale ) ?>"
classid="CLSID:22D6F312-B0F6-11D0-94AB-0080C74C7E95"
codebase="http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=6,0,02,902"
standby="Loading Microsoft Windows Media Player components..."
type="application/x-oleobject">
<param name="FileName" value="<?= $stream_src ?>">
<param name="autoStart" value="1">
<param name="showControls" value="0">
<embed type="application/x-mplayer2"
pluginspage = "http://www.microsoft.com/Windows/MediaPlayer/"
src="<?= $stream_src ?>"
name="MediaPlayer"
width="<?= reScale( $event['Width'], $scale ) ?>"
height="<?= reScale( $event['Height'], $scale ) ?>"
autostart="1"
showcontrols="0">
</embed>
</object>
<?php
}
else
{
?>
<embed type="video/mpeg"
src="<?= $stream_src ?>"
width="<?= reScale( $event['Width'], $scale ) ?>"
height="<?= reScale( $event['Height'], $scale ) ?>"
autostart="1"
showcontrols="0">
</embed>
<?php
}
} }
else else
{ {
$stream_src = getStreamSrc( array( "mode=jpeg", "event=".$eid, "scale=".$scale, "rate=".$rate, "maxfps=".ZM_WEB_VIDEO_MAXFPS ) ); $stream_src = getStreamSrc( array( "mode=jpeg", "event=".$eid, "scale=".$scale, "rate=".$rate, "maxfps=".ZM_WEB_VIDEO_MAXFPS ) );
if ( canStreamNative() ) if ( canStreamNative() )
{ {
?> outputImageStream( $stream_src, reScale( $event['Width'], $scale ), reScale( $event['Height'], $scale ), $event['Name'] );
<img src="<?= $stream_src ?>" border="0" width="<?= reScale( $event['Width'], $scale ) ?>" height="<?= reScale( $event['Height'], $scale ) ?>">
<?php
} }
else else
{ {
?> outputHelperStream( $stream_src, reScale( $event['Width'], $scale ), reScale( $event['Height'], $scale ) );
<applet code="com.charliemouse.cambozola.Viewer" archive="<?= ZM_PATH_CAMBOZOLA ?>" align="middle" width="<?= reScale( $event['Width'], $scale ) ?>" height="<?= reScale( $event['Height'], $scale ) ?>"><param name="url" value="<?= $stream_src ?>"></applet>
<?php
} }
} }
?> ?>

101
web/zm_html_view_montagefeed.php
View File

@ -109,120 +109,37 @@ if ( $mode == "stream" )
if ( ZM_VIDEO_STREAM_METHOD == 'mpeg' && ZM_VIDEO_LIVE_FORMAT ) if ( ZM_VIDEO_STREAM_METHOD == 'mpeg' && ZM_VIDEO_LIVE_FORMAT )
{ {
$stream_src = getStreamSrc( array( "mode=mpeg", "monitor=".$monitor['Id'], "scale=".$scale, "bitrate=".ZM_WEB_VIDEO_BITRATE, "maxfps=".ZM_WEB_VIDEO_MAXFPS, "format=".ZM_VIDEO_LIVE_FORMAT ) ); $stream_src = getStreamSrc( array( "mode=mpeg", "monitor=".$monitor['Id'], "scale=".$scale, "bitrate=".ZM_WEB_VIDEO_BITRATE, "maxfps=".ZM_WEB_VIDEO_MAXFPS, "format=".ZM_VIDEO_LIVE_FORMAT ) );
if ( isWindows() ) outputVideoStream( $stream_src, reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ), $monitor['Name'], ZM_VIDEO_LIVE_FORMAT );
{
?>
<object id="MediaPlayer" width="<?= reScale( $monitor['Width'], $scale ) ?>" height="<?= reScale( $monitor['Height'], $scale ) ?>"
classid="CLSID:22D6F312-B0F6-11D0-94AB-0080C74C7E95"
codebase="http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=6,0,02,902"
standby="Loading Microsoft Windows Media Player components..."
type="application/x-oleobject">
<param name="FileName" value="<?= $stream_src ?>">
<param name="autoStart" value="1">
<param name="showControls" value="0">
<embed type="application/x-mplayer2"
pluginspage = "http://www.microsoft.com/Windows/MediaPlayer/"
src="<?= $stream_src ?>"
name="MediaPlayer"
width="<?= reScale( $monitor['Width'], $scale ) ?>"
height="<?= reScale( $monitor['Height'], $scale ) ?>"
autostart="1"
showcontrols="0">
</embed>
</object>
<?php
}
else
{
?>
<embed type="video/mpeg"
src="<?= $stream_src ?>"
width="<?= reScale( $monitor['Width'], $scale ) ?>"
height="<?= reScale( $monitor['Height'], $scale ) ?>"
autostart="1"
showcontrols="0">
</embed>
<?php
}
} }
else else
{ {
$stream_src = getStreamSrc( array( "mode=jpeg", "monitor=".$monitor['Id'], "scale=".$scale, "maxfps=".ZM_WEB_VIDEO_MAXFPS ) ); $stream_src = getStreamSrc( array( "mode=jpeg", "monitor=".$mid, "scale=".$scale, "maxfps=".ZM_WEB_VIDEO_MAXFPS ) );
if ( canStreamNative() ) if ( canStreamNative() )
{ {
if ( ZM_OPT_CONTROL && ($monitor['CanMoveMap'] || $monitor['CanMoveRel']) ) if ( $control && ($monitor['CanMoveMap'] || $monitor['CanMoveRel'] || $monitor['CanMoveCon']) )
{ {
?> outputControlStream( $stream_src, reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ), $monitor, $scale, "MontageSink".$mid );
<form name="ctrl_form" method="get" action="<?= $PHP_SELF ?>" target="MontageSink">
<input type="hidden" name="view" value="blank">
<input type="hidden" name="mid" value="<?= $mid ?>">
<input type="hidden" name="action" value="control">
<?php
if ( $monitor['CanMoveMap'] )
{
?>
<input type="hidden" name="control" value="move_map">
<?php
}
elseif ( $monitor['CanMoveRel'] )
{
?>
<input type="hidden" name="control" value="move_pseudo_map">
<?php
}
?>
<input type="hidden" name="scale" value="<?= $scale ?>">
<input type="image" src="<?= $stream_src ?>" border="0" width="<?= reScale( $monitor['Width'], $scale ) ?>" height="<?= reScale( $monitor['Height'], $scale ) ?>">
</form>
<?php
} }
else else
{ {
?> outputImageStream( $stream_src, reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ), $monitor['Name'] );
<img src="<?= $stream_src ?>" alt="<?= $monitor['Name'] ?>" border="0" width="<?= reScale( $monitor['Width'], $scale ) ?>" height="<?= reScale( $monitor['Height'], $scale ) ?>">
<?php
} }
} }
else else
{ {
?> outputHelperStream( $stream_src, reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ) );
<applet code="com.charliemouse.cambozola.Viewer" archive="<?= ZM_PATH_CAMBOZOLA ?>" align="middle" width="<?= reScale( $monitor['Width'], $scale ) ?>" height="<?= reScale( $monitor['Height'], $scale ) ?>"><param name="url" value="<?= $stream_src ?>"></applet>
<?php
} }
} }
} }
else else
{ {
if ( ZM_OPT_CONTROL && ($monitor['CanMoveMap'] || $monitor['CanMoveRel']) ) if ( $control && ($monitor['CanMoveMap'] || $monitor['CanMoveRel'] || $monitor['CanMoveCon']) )
{ {
?> outputControlStill( $image_src, reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ), $monitor, $scale, "MontageSink".$mid );
<form name="ctrl_form" method="get" action="<?= $PHP_SELF ?>" target="MontageSink">
<input type="hidden" name="view" value="blank">
<input type="hidden" name="mid" value="<?= $mid ?>">
<input type="hidden" name="action" value="control">
<?php
if ( $monitor['CanMoveMap'] )
{
?>
<input type="hidden" name="control" value="move_map">
<?php
}
elseif ( $monitor['CanMoveRel'] )
{
?>
<input type="hidden" name="control" value="move_pseudo_map">
<?php
}
?>
<input type="image" src="<?= $image_src ?>" border="0" width="<?= reScale( $monitor['Width'], $scale ) ?>" height="<?= reScale( $monitor['Height'], $scale ) ?>">
</form>
<?php
} }
else else
{ {
?> outputImageStill( $image_src, reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ), $monitor['Name'] );
<img name="zmImage" src="<?= $image_src ?>" alt="<?= $monitor['Name'] ?>" border="0" width="<?= reScale( $monitor['Width'], $scale ) ?>" height="<?= reScale( $monitor['Height'], $scale ) ?>">
<?php
} }
} }
?> ?>

107
web/zm_html_view_watchfeed.php
View File

@ -99,41 +99,7 @@ if ( $mode == "stream" )
if ( ZM_VIDEO_STREAM_METHOD == 'mpeg' && ZM_VIDEO_LIVE_FORMAT ) if ( ZM_VIDEO_STREAM_METHOD == 'mpeg' && ZM_VIDEO_LIVE_FORMAT )
{ {
$stream_src = getStreamSrc( array( "mode=mpeg", "monitor=".$mid, "scale=".$scale, "bitrate=".ZM_WEB_VIDEO_BITRATE, "maxfps=".ZM_WEB_VIDEO_MAXFPS, "format=".ZM_VIDEO_LIVE_FORMAT ) ); $stream_src = getStreamSrc( array( "mode=mpeg", "monitor=".$mid, "scale=".$scale, "bitrate=".ZM_WEB_VIDEO_BITRATE, "maxfps=".ZM_WEB_VIDEO_MAXFPS, "format=".ZM_VIDEO_LIVE_FORMAT ) );
if ( isWindows() ) outputVideoStream( $stream_src, reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ), $monitor['Name'], ZM_VIDEO_LIVE_FORMAT );
{
?>
<object id="MediaPlayer" width="<?= reScale( $monitor['Width'], $scale ) ?>" height="<?= reScale( $monitor['Height'], $scale ) ?>"
classid="CLSID:22D6F312-B0F6-11D0-94AB-0080C74C7E95"
codebase="http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=6,0,02,902"
standby="Loading Microsoft Windows Media Player components..."
type="application/x-oleobject">
<param name="FileName" value="<?= $stream_src ?>">
<param name="autoStart" value="1">
<param name="showControls" value="0">
<embed type="application/x-mplayer2"
pluginspage = "http://www.microsoft.com/Windows/MediaPlayer/"
src="<?= $stream_src ?>"
name="MediaPlayer"
width="<?= reScale( $monitor['Width'], $scale ) ?>"
height="<?= reScale( $monitor['Height'], $scale ) ?>"
autostart="1"
showcontrols="0">
</embed>
</object>
<?php
}
else
{
?>
<embed type="video/mpeg"
src="<?= $stream_src ?>"
width="<?= reScale( $monitor['Width'], $scale ) ?>"
height="<?= reScale( $monitor['Height'], $scale ) ?>"
autostart="1"
showcontrols="0">
</embed>
<?php
}
} }
else else
{ {
@ -142,48 +108,16 @@ showcontrols="0">
{ {
if ( $control && ($monitor['CanMoveMap'] || $monitor['CanMoveRel'] || $monitor['CanMoveCon']) ) if ( $control && ($monitor['CanMoveMap'] || $monitor['CanMoveRel'] || $monitor['CanMoveCon']) )
{ {
?> outputControlStream( $stream_src, reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ), $monitor, $scale, "ControlSink".$mid );
<form name="ctrl_form" method="get" action="<?= $PHP_SELF ?>" target="ControlSink<?= $mid ?>">
<input type="hidden" name="view" value="blank">
<input type="hidden" name="mid" value="<?= $mid ?>">
<input type="hidden" name="action" value="control">
<?php
if ( $monitor['CanMoveMap'] )
{
?>
<input type="hidden" name="control" value="move_map">
<?php
}
elseif ( $monitor['CanMoveRel'] )
{
?>
<input type="hidden" name="control" value="move_pseudo_map">
<?php
}
elseif ( $monitor['CanMoveCon'] )
{
?>
<input type="hidden" name="control" value="move_con_map">
<?php
}
?>
<input type="hidden" name="scale" value="<?= $scale ?>">
<input type="image" src="<?= $stream_src ?>" border="0" width="<?= reScale( $monitor['Width'], $scale ) ?>" height="<?= reScale( $monitor['Height'], $scale ) ?>">
</form>
<?php
} }
else else
{ {
?> outputImageStream( $stream_src, reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ), $monitor['Name'] );
<img src="<?= $stream_src ?>" alt="<?= $monitor['Name'] ?>" border="0" width="<?= reScale( $monitor['Width'], $scale ) ?>" height="<?= reScale( $monitor['Height'], $scale ) ?>">
<?php
} }
} }
else else
{ {
?> outputHelperStream( $stream_src, reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ) );
<applet code="com.charliemouse.cambozola.Viewer" archive="<?= ZM_PATH_CAMBOZOLA ?>" align="middle" width="<?= reScale( $monitor['Width'], $scale ) ?>" height="<?= reScale( $monitor['Height'], $scale ) ?>"><param name="url" value="<?= $stream_src ?>"></applet>
<?php
} }
} }
} }
@ -191,40 +125,11 @@ else
{ {
if ( $control && ($monitor['CanMoveMap'] || $monitor['CanMoveRel'] || $monitor['CanMoveCon']) ) if ( $control && ($monitor['CanMoveMap'] || $monitor['CanMoveRel'] || $monitor['CanMoveCon']) )
{ {
?> outputControlStill( $image_src, reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ), $monitor, $scale, "ControlSink".$mid );
<form name="ctrl_form" method="get" action="<?= $PHP_SELF ?>" target="ControlSink<?= $mid ?>">
<input type="hidden" name="view" value="blank">
<input type="hidden" name="mid" value="<?= $mid ?>">
<input type="hidden" name="action" value="control">
<?php
if ( $monitor['CanMoveMap'] )
{
?>
<input type="hidden" name="control" value="move_map">
<?php
}
elseif ( $monitor['CanMoveRel'] )
{
?>
<input type="hidden" name="control" value="move_pseudo_map">
<?php
}
elseif ( $monitor['CanMoveCon'] )
{
?>
<input type="hidden" name="control" value="move_con_map">
<?php
}
?>
<input type="image" src="<?= $image_src ?>" border="0" width="<?= reScale( $monitor['Width'], $scale ) ?>" height="<?= reScale( $monitor['Height'], $scale ) ?>">
</form>
<?php
} }
else else
{ {
?> outputImageStill( $image_src, reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ), $monitor['Name'] );
<img name="zmImage" src="<?= $image_src ?>" alt="<?= $monitor['Name'] ?>" border="0" width="<?= reScale( $monitor['Width'], $scale ) ?>" height="<?= reScale( $monitor['Height'], $scale ) ?>">
<?php
} }
} }
?> ?>