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

proof of concept for dynamic/automatic video rotation using video-js plugin zoomrotate 

Conflicts:
	web/skins/classic/views/event.php
This commit is contained in:
user 2015-03-24 23:41:12 +01:00 committed by SteveGilvarry
parent de875d7c4b
commit 05e82d2a96
1 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,7 +27,7 @@ if ( !canView( 'Events' ) )
$eid = validInt( $_REQUEST['eid'] );
$fid = !empty($_REQUEST['fid'])?validInt($_REQUEST['fid']):1;
$sql = 'SELECT E.*,M.Name AS MonitorName,M.Width,M.Height,M.DefaultRate,M.DefaultScale,M.VideoWriter,M.SaveJPEGs FROM Events AS E INNER JOIN Monitors AS M ON E.MonitorId = M.Id WHERE E.Id = ?';
$sql = 'SELECT E.*,M.Name AS MonitorName,M.Width,M.Height,M.DefaultRate,M.DefaultScale,M.VideoWriter,M.SaveJPEGs,M.Orientation AS Orientation, M.VideoWriter as VideoWriter FROM Events AS E INNER JOIN Monitors AS M ON E.MonitorId = M.Id WHERE E.Id = ?';
$sql_values = array( $eid );
if ( $user['MonitorIds'] ) {
@ -134,8 +134,22 @@ if ( $event['VideoWriter'] )
?>
<link href="//vjs.zencdn.net/4.11/video-js.css" rel="stylesheet">
<script src="//vjs.zencdn.net/4.11/video.js"></script>
<script src='//raw.githubusercontent.com/xbgmsharp/videojs-rotatezoom/master/src/videojs.zoomrotate.js'></script>
<div id="videoFeed">
<video id="videoobj" class="video-js vjs-default-skin" width="<?php echo reScale( $event['Width'], $scale ) ?>" height="<?php echo reScale( $event['Height'], $scale ) ?>" data-setup='{ "controls": true, "autoplay": false, "preload": "auto" }' >
<video id="videoobj" class="video-js vjs-default-skin" width="<?php echo reScale( $event['Width'], $scale ) ?>" height="<?php echo reScale( $event['Height'], $scale ) ?>" data-setup='{ "controls": true, "autoplay": true, "preload": "auto", "plugins": { "zoomrotate": { "rotate": "<?php
if ( $event['VideoWriter'] == "2" ) {
echo $event['Orientation'];
echo '", "zoom": "';
if ( in_array($event['Orientation'],array("90","270")))
echo $event['Height']/$event['Width'];
else
echo "1";
echo '" } }';
} else {
echo '0';
echo '", "zoom": "1" } }';
}
?>}' >
<source src="<?php echo getEventDefaultVideoPath($event) ?>" type="video/mp4">
Your browser does not support the video tag.
</video>
@ -193,8 +207,12 @@ else
<?php
}
?>
</div>
</div>
</div>
<?php
}
?>
</div>
</div>
<?php
if ($event['SaveJPEGs'] & 3)
{
@ -233,7 +251,10 @@ if ($event['SaveJPEGs'] & 3)
</div>
</div>
</div>
</div>
<?php
}
}
?>
</div>
</body>
</html>