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

Better debug when fail to attach images

This commit is contained in:
Isaac Connor 2018-04-20 15:56:14 -04:00
parent 3ea39ad417
commit a868bb70ed
3 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
scripts/zmfilter.pl.in
View File

@ -426,7 +426,7 @@ sub generateVideo {
sub generateImage {
my $Event = shift;
my $frame = shift;
my $analyse = do { @_ ? shift : 0 }; # don't return analyse image by default
my $analyse = @_ ? shift : 0; # don't return analyse image by default
my $event_path = $Event->Path();
my $capture_image_path = sprintf('%s/%0'.$Config{ZM_EVENT_IMAGE_DIGITS}.'d-capture.jpg', $event_path, $frame->{FrameId});
@ -439,8 +439,18 @@ sub generateImage {
$image_path = $analyse_image_path;
} elsif ( -r $capture_image_path ) {
$image_path = $capture_image_path;
} elsif ( -e $video_path ) {
if ( !system('ffmpeg -y -v 0 -i '.$video_path." -vf 'select=gte(n\\,".$frame->{FrameId}."),setpts=PTS-STARTPTS' -vframes 1 -f image2 ".$capture_image_path) ) {
} elsif ( -r $video_path ) {
my $command ="ffmpeg -ss $$frame{Delta} -i '$video_path' -frames:v 1 '$capture_image_path'";
#$command = "ffmpeg -y -v 0 -i $video_path -vf 'select=gte(n\\,$$frame{FrameId}),setpts=PTS-STARTPTS' -vframes 1 -f image2 $capture_image_path";
my $output = qx($command);
chomp( $output );
my $status = $? >> 8;
if ( $status || logDebugging() ) {
Debug("Output: $output\n");
}
if ( $status ) {
Error("Failed $command status $status");
} else {
$image_path = $capture_image_path;
}
}
@ -611,6 +621,7 @@ sub substituteTags {
or Fatal( "Unable toprepare '$sql': ".$dbh->errstr() );
my $res = $sth->execute( $Event->{Id} )
or Fatal( "Unable toexecute '$sql': ".$sth->errstr() );
my $rows = 0;
while( my $frame = $sth->fetchrow_hashref() ) {
if ( !$first_alarm_frame ) {
$first_alarm_frame = $frame;
@ -619,7 +630,9 @@ sub substituteTags {
$max_alarm_frame = $frame;
$max_alarm_score = $frame->{Score};
}
$rows ++;
}
Debug("Frames: rows: $rows first alarm frame: $first_alarm_frame max_alaarm_frame: $max_alarm_frame, score: $max_alarm_score");
$sth->finish();
}
@ -660,14 +673,16 @@ sub substituteTags {
}
}
if ( $attachments_ref && $text =~ s/%EIM%//g ) {
if ( $attachments_ref && ( $text =~ s/%EIM%//g ) ) {
# Don't attach the same image twice
if ( !@$attachments_ref
|| ($first_alarm_frame->{FrameId} != $max_alarm_frame->{FrameId} )
|| ( $first_alarm_frame->{FrameId} != $max_alarm_frame->{FrameId} )
) {
my $path = generateImage($Event, $max_alarm_frame);
if ( -e $path ) {
push @$attachments_ref, { type=>'image/jpeg', path=>$path };
} else {
Warning("No image for EIM");
}
}
}
@ -675,6 +690,8 @@ sub substituteTags {
my $path = generateImage($Event, $first_alarm_frame, 'analyse');
if ( -e $path ) {
push @$attachments_ref, { type=>'image/jpeg', path=>$path };
} else {
Warning("No image for EI1A");
}
}
if ( $attachments_ref && $text =~ s/%EIMA%//g ) {
@ -685,6 +702,8 @@ sub substituteTags {
my $path = generateImage($Event, $max_alarm_frame, 'analyse');
if ( -e $path ) {
push @$attachments_ref, { type=>'image/jpeg', path=>$path };
} else {
Warning("No image for EIMA");
}
}
}

2
web/api/app/Plugin/CakePHP-Enum-Behavior

@ -1 +1 @@
Subproject commit 7108489f218c54d36d235d3af91d6da2f8311237
Subproject commit ca91b87fda8e006e4fca2ed870f24f9a29c2905d

2
web/api/app/Plugin/Crud

@ -1 +1 @@
Subproject commit c3976f1478c681b0bbc132ec3a3e82c3984eeed5
Subproject commit 1351dde6b4c75b215099ae8bcf5a21d6c6e10298