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

update to storageareas version, which changes the sql to use subqueries instead of JOINs

This commit is contained in:
Isaac Connor 2017-07-14 15:55:08 -04:00
parent 801d978898
commit 1264f0601f
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
scripts/zmvideo.pl.in
View File

@ -27,7 +27,9 @@ zmvideo.pl - ZoneMinder Video Creation Script
=head1 SYNOPSIS =head1 SYNOPSIS
zmvideo.pl [ -e <event_id>,--event=<event_id> | --filter=<filter name> ] [--format <format>] zmvideo.pl [ -e <event_id>,--event=<event_id> | --filter_name=<filter name> | --filter_id=<filter id> ]
[--concat=filename]
[--format <format>]
[--rate=<rate>] [--rate=<rate>]
[--scale=<scale>] [--scale=<scale>]
[--fps=<fps>] [--fps=<fps>]
@ -189,23 +191,21 @@ if ( $event_id ) {
Debug(@event_ids . " events found for $filter_name"); Debug(@event_ids . " events found for $filter_name");
} }
$concat_name = $filter_name if $concat_name eq ''; $concat_name = $filter_name if $concat_name eq '';
} else {
Warning("Nothing to do");
} }
my $sql = " SELECT max(F.Delta)-min(F.Delta) as FullLength, my $sql = " SELECT (SELECT max(Delta) FROM Frames WHERE EventId=Events.Id)-(SELECT min(Delta) FROM Frames WHERE EventId=Events.Id) as FullLength,
E.*, Events.*,
unix_timestamp(E.StartTime) as Time, unix_timestamp(Events.StartTime) as Time,
M.Name as MonitorName, M.Name as MonitorName,
M.Width as MonitorWidth, M.Width as MonitorWidth,
M.Height as MonitorHeight, M.Height as MonitorHeight,
M.Palette M.Palette
FROM Frames as F FROM Events
INNER JOIN Events as E on F.EventId = E.Id INNER JOIN Monitors as M on Events.MonitorId = M.Id
INNER JOIN Monitors as M on E.MonitorId = M.Id WHERE Events.Id = ?
WHERE EventId = ? ";
GROUP BY F.EventId";
my $sth = $dbh->prepare_cached( $sql ) or Fatal( "Can't prepare '$sql': ".$dbh->errstr() ); my $sth = $dbh->prepare_cached( $sql ) or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
Debug($sql);
my @video_files; my @video_files;
foreach my $event_id ( @event_ids ) { foreach my $event_id ( @event_ids ) {
@ -237,8 +237,9 @@ if ( $concat_name ) {
} }
close $fd; close $fd;
my $command = $Config{ZM_PATH_FFMPEG} my $command = $Config{ZM_PATH_FFMPEG}
. " -f concat -i $concat_list_file -c copy " . " -f concat -safe 0 -i $concat_list_file -c copy "
." '$video_file' > ffmpeg.log 2>&1" .$Config{ZM_FFMPEG_OUTPUT_OPTIONS}
." '$video_file' > $Config{ZM_PATH_LOGS}/ffmpeg_${concat_name}.log 2>&1"
; ;
Debug( $command."\n" ); Debug( $command."\n" );
my $output = qx($command); my $output = qx($command);
@ -247,7 +248,7 @@ if ( $concat_name ) {
unlink $concat_list_file; unlink $concat_list_file;
if ( $status ) { if ( $status ) {
Error( "Unable to generate video, check /ffmpeg.log for details"); Error( "Unable to generate video, check $Config{ZM_PATH_LOGS}/ffmpeg_${concat_name}.log for details");
exit(-1); exit(-1);
} }
print( STDOUT $video_file."\n" ); print( STDOUT $video_file."\n" );