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

Only delete packets up to the next video keyframe. Don't be too aggressive

pull/3122/head
Isaac Connor 2021-01-12 14:13:12 -05:00
parent 5b7fc210fe
commit 3423d8ed05
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/zm_packetqueue.cpp
View File

@ -116,8 +116,10 @@ bool zm_packetqueue::queuePacket(ZMPacket* add_packet) {
ZMPacket *zm_packet = *it; ZMPacket *zm_packet = *it;
Debug(1, "Checking packet to see if we can delete them"); Debug(1, "Checking packet to see if we can delete them");
if ( zm_packet->packet.stream_index == video_stream_id ) { if ( zm_packet->packet.stream_index == video_stream_id ) {
if ( zm_packet->keyframe ) if ( zm_packet->keyframe ) {
Debug(1, "Have a video keyframe so breaking out");
break; break;
}
video_stream_packets ++; video_stream_packets ++;
} }
@ -152,20 +154,18 @@ bool zm_packetqueue::queuePacket(ZMPacket* add_packet) {
( *it != add_packet ) ( *it != add_packet )
) { ) {
Debug(1, "Deleting packets"); Debug(1, "Deleting packets");
// It is enough to delete the packets tested above. A subsequent queuePacket can clear a second set
// Now to clean ups mainting the queue size. while ( pktQueue.begin() != it ) {
while ( packet_counts[video_stream_id] > max_video_packet_count ) {
ZMPacket *zm_packet = *pktQueue.begin(); ZMPacket *zm_packet = *pktQueue.begin();
if ( !zm_packet ) { if ( !zm_packet ) {
Error("NULL zm_packet in queue"); Error("NULL zm_packet in queue");
continue; continue;
} }
Debug(1, "Deleting a packet with stream index (%d) image_index %d with keyframe(%d), video_frames_to_keep is (%d) max: %d, queuesuze:%d", Debug(1, "Deleting a packet with stream index (%d) image_index %d with keyframe(%d), video frames in queue(%d) max: %d, queuesuze:%d",
zm_packet->packet.stream_index, zm_packet->image_index, zm_packet->keyframe, packet_counts[video_stream_id], max_video_packet_count,pktQueue.size()); zm_packet->packet.stream_index, zm_packet->image_index, zm_packet->keyframe, packet_counts[video_stream_id], max_video_packet_count, pktQueue.size());
pktQueue.pop_front(); pktQueue.pop_front();
packet_counts[zm_packet->packet.stream_index] -= 1; packet_counts[zm_packet->packet.stream_index] -= 1;
zm_packet->unlock();
delete zm_packet; delete zm_packet;
} }
} // end if have at least max_video_packet_count video packets remaining } // end if have at least max_video_packet_count video packets remaining
@ -507,7 +507,7 @@ std::list<ZMPacket *>::iterator zm_packetqueue::get_event_start_packet_it(
// hit end, the first packet in the queue should ALWAYS be a video keyframe. // hit end, the first packet in the queue should ALWAYS be a video keyframe.
// So we should be able to return it. // So we should be able to return it.
if ( pre_event_count ) { if ( pre_event_count ) {
if ( (*it)->image_index < pre_event_count ) { if ( (*it)->image_index < (int)pre_event_count ) {
// probably just starting up // probably just starting up
Debug(1, "Hit end of packetqueue before satisfying pre_event_count. Needed %d more video frames", pre_event_count); Debug(1, "Hit end of packetqueue before satisfying pre_event_count. Needed %d more video frames", pre_event_count);
} else { } else {