mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-18 05:48:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix skipping over the head packet when deleting packets.

Browse Source
This commit is contained in:
Isaac Connor
2021-01-31 11:42:51 -05:00
parent ee5d5e3cab
commit 0fb7cb935f
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/zm_packetqueue.cpp
View File

@@ -111,7 +111,6 @@ bool zm_packetqueue::queuePacket(ZMPacket* add_packet) {
int video_stream_packets = 0;
// Since we have many packets in the queue, we should NOT be pointing at end so don't need to test for that
do {
it++;
ZMPacket *zm_packet = *it;
Debug(1, "Checking packet to see if we can delete them");
if ( zm_packet->packet.stream_index == video_stream_id ) {
@@ -149,7 +148,7 @@ bool zm_packetqueue::queuePacket(ZMPacket* add_packet) {
video_stream_packets = max_video_packet_count;
}
} // end foreach iterator
it++;
} while ( *it != add_packet );
Debug(1, "Resulting video_stream_packets count %d, %d > %d, pointing at latest packet? %d",
video_stream_packets,
@@ -448,6 +447,8 @@ ZMPacket *zm_packetqueue::get_packet(packetqueue_iterator *it) {
if ( deleting or zm_terminate )
return nullptr;
Debug(4, "get_packet using it %p queue end? %d, packet %p",
*it, (*it == pktQueue.end()), *(*it));
ZMPacket *p = *(*it);
if ( !p ) {
Error("Null p?!");