ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix merge

pull/1624/head
Isaac Connor 2016-06-23 12:49:27 -04:00
parent 081c0add72
commit c1f30480e3
1 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
web/includes/functions.php
View File

@ -962,19 +962,13 @@ function zmaCheck( $monitor ) {
} }
function getImageSrc( $event, $frame, $scale=SCALE_BASE, $captureOnly=false, $overwrite=false ) { function getImageSrc( $event, $frame, $scale=SCALE_BASE, $captureOnly=false, $overwrite=false ) {
<<<<<<< HEAD
$Storage = new Storage( $event['StorageId'] ); $Storage = new Storage( $event['StorageId'] );
$Event = new Event( $event ); $Event = new Event( $event );
$eventPath = $Event->Path(); $eventPath = $Event->Path();
=======
$eventPath = getEventPath( $event );
>>>>>>> feature-h264-videostorage
if ( !is_array($frame) ) if ( !is_array($frame) )
$frame = array( 'FrameId'=>$frame, 'Type'=>'' ); $frame = array( 'FrameId'=>$frame, 'Type'=>'' );
<<<<<<< HEAD
if ( file_exists( $eventPath.'/snapshot.jpg' ) ) { if ( file_exists( $eventPath.'/snapshot.jpg' ) ) {
$captImage = "snapshot.jpg"; $captImage = "snapshot.jpg";
} else { } else {
@ -992,21 +986,6 @@ function getImageSrc( $event, $frame, $scale=SCALE_BASE, $captureOnly=false, $ov
Error("Can't create frame images from video becuase there is no video file for this event (".$Event->DefaultVideo() ); Error("Can't create frame images from video becuase there is no video file for this event (".$Event->DefaultVideo() );
} }
} }
=======
if ( file_exists( $eventPath.'/snapshot.jpg' ) ) {
$captImage = "snapshot.jpg";
} else {
$captImage = sprintf( "%0".ZM_EVENT_IMAGE_DIGITS."d-capture.jpg", $frame['FrameId'] );
if ( ! file_exists( $eventPath.'/'.$captImage ) ) {
# Generate the frame JPG
if ( $event['DefaultVideo'] ) {
$command ='ffmpeg -v 0 -i '.$eventPath.'/'.$Event->DefaultVideo().' -vf "select=gte(n\\,'.$frame['FrameId'].'),setpts=PTS-STARTPTS" '.$eventPath.'/'.$captImage;
system( $command, $output, $retval );
} else {
Error("Can't create frame images from video because there is no video file for this event " );
}
}
>>>>>>> feature-h264-videostorage
} }
$captPath = $eventPath.'/'.$captImage; $captPath = $eventPath.'/'.$captImage;
@ -1020,10 +999,7 @@ function getImageSrc( $event, $frame, $scale=SCALE_BASE, $captureOnly=false, $ov
$analImage = sprintf( "%0".ZM_EVENT_IMAGE_DIGITS."d-analyse.jpg", $frame['FrameId'] ); $analImage = sprintf( "%0".ZM_EVENT_IMAGE_DIGITS."d-analyse.jpg", $frame['FrameId'] );
$analPath = $eventPath.'/'.$analImage; $analPath = $eventPath.'/'.$analImage;
<<<<<<< HEAD
=======
>>>>>>> feature-h264-videostorage
$thumbAnalPath = ZM_DIR_IMAGES.'/'.$event['Id'].'-'.$analImage; $thumbAnalPath = ZM_DIR_IMAGES.'/'.$event['Id'].'-'.$analImage;
//echo "AI:$analImage, AP:$analPath, TAP:$thumbAnalPath<br>"; //echo "AI:$analImage, AP:$analPath, TAP:$thumbAnalPath<br>";
@ -1054,10 +1030,6 @@ function getImageSrc( $event, $frame, $scale=SCALE_BASE, $captureOnly=false, $ov
$thumbPath = $thumbCaptPath; $thumbPath = $thumbCaptPath;
} }
<<<<<<< HEAD
$imageFile = $imagePath;
=======
>>>>>>> feature-h264-videostorage
$thumbFile = $thumbPath; $thumbFile = $thumbPath;
if ( $overwrite || !file_exists( $thumbFile ) || !filesize( $thumbFile ) ) if ( $overwrite || !file_exists( $thumbFile ) || !filesize( $thumbFile ) )
{ {