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

image may have been deleted, but analysis image may still be there. Correct logic so that analysis frame get saved again.

pull/3669/merge
Isaac Connor 2023-02-19 14:47:43 -05:00
parent ef9ce9b714
commit 9a996cb423
1 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/zm_event.cpp
View File

@ -438,38 +438,24 @@ void Event::AddFrame(const std::shared_ptr<ZMPacket>&packet) {
} else { } else {
Debug(3, "Not Writing alarm image because alarm frame already written"); Debug(3, "Not Writing alarm image because alarm frame already written");
} }
alarm_frames++;
} // end if is an alarm frame
if (packet->analysis_image and (save_jpegs & 2)) { if (save_jpegs & 2) {
if (packet->analysis_image) {
std::string event_file = stringtf(staticConfig.analyse_file_format.c_str(), path.c_str(), frames); std::string event_file = stringtf(staticConfig.analyse_file_format.c_str(), path.c_str(), frames);
Debug(1, "Writing analysis frame %d to %s", frames, event_file.c_str()); Debug(1, "Writing analysis frame %d to %s", frames, event_file.c_str());
if (!WriteFrameImage(packet->analysis_image, packet->timestamp, event_file.c_str(), true)) { if (!WriteFrameImage(packet->analysis_image, packet->timestamp, event_file.c_str(), true)) {
Error("Failed to write analysis frame image to %s", event_file.c_str()); Error("Failed to write analysis frame image to %s", event_file.c_str());
} }
if (packet->in_frame && } else {
( Debug(1, "Wanted to save analysis frame, but packet has no analysis_image");
((AVPixelFormat)packet->in_frame->format == AV_PIX_FMT_YUV420P) } // end if is an alarm frame
|| } // end if has analysis images turned on
((AVPixelFormat)packet->in_frame->format == AV_PIX_FMT_YUVJ420P)
)
) {
event_file = stringtf("%s/%d-y.jpg", path.c_str(), frames);
Image y_image(
packet->in_frame->width,
packet->in_frame->height,
1, ZM_SUBPIX_ORDER_NONE,
packet->in_frame->data[0], 0);
if (!WriteFrameImage(&y_image, packet->timestamp, event_file.c_str(), true)) {
Error("Failed to write y frame image to %s", event_file.c_str());
}
} // end if write y-channel image
} // end if has analysis images turned on
} // end if is an alarm frame
} else { } else {
Debug(1, "No image"); Debug(1, "No image");
} // end if has image } // end if has image
if (frame_type == ALARM) alarm_frames++;
bool db_frame = ( frame_type == BULK ) bool db_frame = ( frame_type == BULK )
or ( frame_type == ALARM ) or ( frame_type == ALARM )
or ( frames == 1 ) or ( frames == 1 )