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

Use packetqueue unlock to also notify

pull/3208/head
Isaac Connor 2021-04-02 21:26:01 -04:00
parent 87fc35dbe6
commit 405be70430
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/zm_monitor.cpp
View File

@ -2280,7 +2280,9 @@ bool Monitor::Analyse() {
} // end if state machine } // end if state machine
if ( (function == MODECT or function == MOCORD) and snap->image ) { if ( (function == MODECT or function == MOCORD) and snap->image ) {
Debug(1, "Blending");
ref_image.Blend(*(snap->image), ( state==ALARM ? alarm_ref_blend_perc : ref_blend_perc )); ref_image.Blend(*(snap->image), ( state==ALARM ? alarm_ref_blend_perc : ref_blend_perc ));
Debug(1, "Done Blending");
} }
last_signal = signal; last_signal = signal;
} // end if videostream } // end if videostream
@ -2755,7 +2757,7 @@ bool Monitor::Decode() {
ZMPacket *packet = packet_lock->packet_; ZMPacket *packet = packet_lock->packet_;
packetqueue.increment_it(decoder_it); packetqueue.increment_it(decoder_it);
if (packet->codec_type != AVMEDIA_TYPE_VIDEO) { if (packet->codec_type != AVMEDIA_TYPE_VIDEO) {
delete packet_lock; packetqueue.unlock(packet_lock);
return true; // Don't need decode return true; // Don't need decode
} }
@ -2871,7 +2873,7 @@ bool Monitor::Decode() {
shared_data->signal = ( capture_image and signal_check_points ) ? CheckSignal(capture_image) : true; shared_data->signal = ( capture_image and signal_check_points ) ? CheckSignal(capture_image) : true;
shared_data->last_write_index = index; shared_data->last_write_index = index;
shared_data->last_write_time = packet->timestamp->tv_sec; shared_data->last_write_time = packet->timestamp->tv_sec;
delete packet_lock; packetqueue.unlock(packet_lock);
return true; return true;
} // end bool Monitor::Decode() } // end bool Monitor::Decode()