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

We can lockup if MaxImageBufferCount is less than keyframe interval. Give up after 10 tries and drop the packet

This commit is contained in:
Isaac Connor 2021-10-14 10:08:44 -04:00
parent 8a9c283c1c
commit 411d15605a
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/zm_packetqueue.cpp
View File

@ -93,11 +93,19 @@ bool PacketQueue::queuePacket(std::shared_ptr<ZMPacket> add_packet) {
" your camera's keyframe interval is larger than this setting." " your camera's keyframe interval is larger than this setting."
, max_video_packet_count); , max_video_packet_count);
while (packet_counts[video_stream_id] > max_video_packet_count) { int count = 10; // give it 10 wake ups to resolve the situation
while (count and (packet_counts[video_stream_id] > max_video_packet_count)) {
Error("Unable to free up older packets. Waiting."); Error("Unable to free up older packets. Waiting.");
condition.wait(lck); condition.wait(lck);
if (deleting or zm_terminate) if (deleting or zm_terminate)
return false; return false;
count --;
}
if (packet_counts[video_stream_id] > max_video_packet_count) {
Error("Unable to free up older packets. packet_counts %d > max %d. Dropping this packet."
" You may need to increase MaxImageBuffer or reduce keyframe interval.",
packet_counts[video_stream_id], max_video_packet_count);
return false;
} }
} }
} // end if this packet is a video packet } // end if this packet is a video packet