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

Merge pull request #7 from connortechnology/feature-h264-videostorage 

Feature h264 videostorage
This commit is contained in:
Steve Gilvarry 2016-09-01 01:07:33 +10:00 committed by GitHub
parent 7c5cc6f35e e74bf3fedf
commit e371d9ec7f
4 changed files with 63 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
distros/debian/postinst
View File

@ -38,6 +38,7 @@ if [ "$1" = "configure" ]; then
invoke-rc.d zoneminder stop || true
zmupdate.pl --nointeractive
zmupdate.pl --nointeractive -f
echo "Done Updating, starting ZoneMinder"
invoke-rc.d zoneminder start || true
else
echo 'NOTE: mysql not running, please start mysql and run dpkg-reconfigure zoneminder when it is running.'

1
distros/ubuntu1204/zoneminder.postinst
View File

@ -38,6 +38,7 @@ if [ "$1" = "configure" ]; then
invoke-rc.d zoneminder stop || true
zmupdate.pl --nointeractive
zmupdate.pl --nointeractive -f
echo "Done Updating, starting ZoneMinder"
invoke-rc.d zoneminder start || true
else
echo 'NOTE: mysql not running, please start mysql and run dpkg-reconfigure zoneminder when it is running.'

1
distros/ubuntu1604/zoneminder.postinst
View File

@ -41,6 +41,7 @@ if [ "$1" = "configure" ]; then
deb-systemd-invoke stop zoneminder.service || exit $?
zmupdate.pl --nointeractive
zmupdate.pl --nointeractive -f
echo "Done Updating, starting ZoneMinder"
deb-systemd-invoke start zoneminder.service || exit $?
else

82
web/views/view_video.php
View File

@ -25,36 +25,74 @@
// Does not support scaling at this time.
//
if ( !canView( 'Events' ) )
{
$view = "error";
return;
if ( !canView( 'Events' ) ) {
$view = "error";
return;
}
require_once('includes/Storage.php');
require_once('includes/Event.php');
$Storage = NULL;
$errorText = false;
$path = '';
if ( ! empty($_REQUEST['eid'] ) ) {
$Event = new Event( $_REQUEST['eid'] );
$Storage = $Event->Storage();
$path = $Event->Relative_Path().'/'.$Event->DefaultVideo();
Error("Path: $path");
$Event = new Event( $_REQUEST['eid'] );
$path = $Event->Path().'/'.$Event->DefaultVideo();
Debug("Path: $path");
} else {
$errorText = "No video path";
$errorText = "No video path";
}
if ( $errorText )
Error( $errorText );
else{
# FIXME guess it from the video file
header( 'Content-type: video/mp4' );
if ( ! readfile( $Storage->Path().'/'.$path ) ) {
Error("No bytes read from ". $Storage->Path() . '/'.$path );
} else {
Error("Success sending " . $Storage->Path().'/'.$path );
}
if ( $errorText ) {
Error( $errorText );
header ("HTTP/1.0 404 Not Found");
die();
}
$size = filesize($path);
$fh = @fopen($path,'rb');
if ( ! $fh ) {
header ("HTTP/1.0 404 Not Found");
die();
}
$begin = 0;
$end = $size;
if ( isset( $_SERVER['HTTP_RANGE'] ) ) {
Debug("Using Range " . $_SERVER['HTTP_RANGE'] );
if ( preg_match( '/bytes=\h*(\d+)-(\d*)[\D.*]?/i', $_SERVER['HTTP_RANGE'], $matches) ) {
$begin = intval( $matches[1] );
if ( ! empty( $matches[2]) ) {
$end = intval( $matches[2] );
}
Debug("Using Range $begin $end size: $size");
}
} # end if HTTP_RANGE
if ( $begin > 0 || $end < $size ) {
header('HTTP/1.0 206 Partial Content');
} else {
header('HTTP/1.0 200 OK');
}
header('Content-type: video/mp4');
header('Accept-Ranges: bytes');
header('Content-Length:'.($end-$begin));
header("Content-Disposition: inline;");
header("Content-Range: bytes $begin-$end/$size");
header("Content-Transfer-Encoding: binary\n");
header('Connection: close');
$cur = $begin;
fseek( $fh, $begin, 0 );
while( ! feof( $fh ) && $cur < $end && ( connection_status() == 0 ) ) {
#Error("Sending $cur");
print fread( $fh, min( 1024*16, $end - $cur ) );
$cur += 1024*16;
usleep(100);
}
?>