mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-26 17:52:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove dead code, fix not deleting packets when full

Browse Source
This commit is contained in:
Isaac Connor
2025-05-28 03:48:03 +05:30
parent ed2f809df0
commit d82bfbfb5e
1 changed files with 1 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/zm_packetqueue.cpp
View File

@@ -124,24 +124,6 @@ bool PacketQueue::queuePacket(std::shared_ptr<ZMPacket> add_packet) {
}
}
#if 0
// FIXME: This is pointless if we are encoding. Need to do something in ffmpeg_camera to more efficiently count keyframe
if (!max_keyframe_interval_ and add_packet->keyframe and (video_stream_id==add_packet->packet->stream_index)) {
auto rit = pktQueue.rbegin();
int packet_count = 0;
while (rit != pktQueue.rend()) {
std::shared_ptr<ZMPacket> prev_packet = *rit;
if (prev_packet->packet->stream_index == add_packet->packet->stream_index) {
packet_count ++;
if (prev_packet->keyframe) break;
}
++rit;
}
Debug(1, "Have keyframe interval: %d", packet_count);
max_keyframe_interval_ = packet_count;
}
#endif
pktQueue.push_back(add_packet);
/* Any iterators that are pointing to the end will now point to the newly pushed packet */
@@ -189,7 +171,7 @@ bool PacketQueue::queuePacket(std::shared_ptr<ZMPacket> add_packet) {
Warning("Found locked packet %d when trying to free up video packets.", zm_packet->image_index);
// Really shouldn't though. I think we can delete a locked packet, but we REALLY should delete a GOP's worth.
}
break;
//break;
//} else if (0 and !keep_keyframes) {
//it = this->deletePacket(it);
//if (zm_packet->packet->stream_index == video_stream_id and zm_packet->keyframe) break;