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

eyeZm Plugin: Removed -s tag from ffmpeg to allow it to automatically pick size, and added viewport meta-tag to h264 splash page 

Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3315 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
jaidhar 2011-04-19 00:09:50 +00:00
parent f2caca6f2f
commit 6645cd0a8f
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/skins/xml/includes/functions.php
View File

@ -200,7 +200,7 @@ function gdExists()
function getFfmpeg264FoutParms($br, $fout)
{
$ffparms = "-analyzeduration 0 -acodec copy -s 320x240";
$ffparms = "-analyzeduration 0 -acodec copy";
$ffparms .= " -vcodec libx264 -b ".$br;
$ffparms .= " -flags +loop -cmp +chroma -partitions +parti4x4+partp8x8+partb8x8";
$ffparms .= " -subq 5 -trellis 1 -refs 1 -coder 0 -me_range 16 -keyint_min 25";

1
web/skins/xml/views/actions.php
View File

@ -150,6 +150,7 @@ if (isset($_GET['action'])) {
) );
logXml("Using thumbnail image from ".$thumbsrc);
/* Generate H264 Web-page */
echo "<meta name=\"viewport\" content=\"width=".$width."\" />\n";
h264vidHtml($width, $height, $monitor, $br, $thumbsrc);
} else if (!strcmp($vcodec, "mjpeg")) {
/* MJPEG streaming */