mirror of
https://github.com/ZoneMinder/zoneminder.git
synced 2026-06-27 06:45:37 -04:00
Two related changes to PacketQueue::clearPackets, called by the analysis thread on every video packet: 1. Lock-free call-site gate (should_try_clear) on the analysis path. In keep_keyframes mode the existing early-return at the top of clearPackets discards most non-keyframe video packets after acquiring the queue mutex. Add an inline lock-free check at the call site so non-keyframe packets skip the mutex acquire entirely. clear_packets_pending_ is now std::atomic<bool> so it can be read without the lock; a stale read is harmless (at worst we make one extra cheap early-returning call). The !keep_keyframes path always returns true from the gate because that mode pops one packet at a time on every video packet. 2. Iterator boundary in the scan loop changed from >= to >. Setting next_front to a packet that an iterator points at is safe because clearPackets deletes strictly before next_front, so the iterator's own packet stays in the queue. Previously, an event-start (or other) iterator landing exactly on a keyframe blocked the leading GOP from being dropped until the iterator advanced; now we can include that keyframe as next_front while the iterator continues to point at it. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
123 lines
4.4 KiB
C++
123 lines
4.4 KiB
C++
//ZoneMinder Packet Queue Interface Class
|
|
//Copyright 2016 Steve Gilvarry
|
|
//
|
|
//This file is part of ZoneMinder.
|
|
//
|
|
//ZoneMinder is free software: you can redistribute it and/or modify
|
|
//it under the terms of the GNU General Public License as published by
|
|
//the Free Software Foundation, either version 3 of the License, or
|
|
//(at your option) any later version.
|
|
//
|
|
//ZoneMinder is distributed in the hope that it will be useful,
|
|
//but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
//MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
//GNU General Public License for more details.
|
|
//
|
|
//You should have received a copy of the GNU General Public License
|
|
//along with ZoneMinder. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
#ifndef ZM_PACKETQUEUE_H
|
|
#define ZM_PACKETQUEUE_H
|
|
|
|
#include "zm_time.h"
|
|
|
|
#include <atomic>
|
|
#include <condition_variable>
|
|
#include <list>
|
|
#include <memory>
|
|
#include <mutex>
|
|
#include <vector>
|
|
|
|
class Monitor;
|
|
class ZMPacket;
|
|
class ZMPacketLock;
|
|
|
|
typedef std::list<std::shared_ptr<ZMPacket>>::iterator packetqueue_iterator;
|
|
|
|
class PacketQueue {
|
|
private: // For now just to ease development
|
|
std::list<std::shared_ptr<ZMPacket>> pktQueue;
|
|
std::list<std::shared_ptr<ZMPacket>>::iterator analysis_it;
|
|
|
|
int video_stream_id;
|
|
int max_video_packet_count; // allow a negative value to someday mean unlimited
|
|
// This is now a hard limit on the # of video packets to keep in the queue so that we can limit ram
|
|
int pre_event_video_packet_count; // Was max_video_packet_count
|
|
int max_stream_id;
|
|
std::unique_ptr<int[]> packet_counts; /* packet count for each stream_id, to keep track of how many video vs audio packets are in the queue */
|
|
bool deleting;
|
|
bool keep_keyframes;
|
|
std::list<packetqueue_iterator *> iterators;
|
|
|
|
std::mutex mutex;
|
|
std::condition_variable condition;
|
|
int warned_count;
|
|
bool has_out_of_order_packets_;
|
|
int max_keyframe_interval_;
|
|
int frames_since_last_keyframe_;
|
|
std::atomic<bool> clear_packets_pending_;
|
|
uint64_t next_queue_index_;
|
|
Monitor *monitor_;
|
|
|
|
public:
|
|
PacketQueue();
|
|
virtual ~PacketQueue();
|
|
std::list<std::shared_ptr<ZMPacket>>::const_iterator end() const { return pktQueue.end(); }
|
|
std::list<std::shared_ptr<ZMPacket>>::const_iterator begin() const { return pktQueue.begin(); }
|
|
|
|
int addStream();
|
|
void setMaxVideoPackets(int p);
|
|
void setPreEventVideoPackets(int p);
|
|
void setKeepKeyframes(bool k) { keep_keyframes = k; };
|
|
void setMonitor(Monitor *m) { monitor_ = m; };
|
|
|
|
bool queuePacket(std::shared_ptr<ZMPacket> packet);
|
|
void stop();
|
|
bool stopping() const { return deleting; };
|
|
void clear();
|
|
void dumpQueue();
|
|
unsigned int size();
|
|
unsigned int get_packet_count(int stream_id) const { return packet_counts[stream_id]; };
|
|
bool has_out_of_order_packets() {
|
|
std::unique_lock<std::mutex> lck(mutex);
|
|
return has_out_of_order_packets_; };
|
|
int get_max_keyframe_interval() const { return max_keyframe_interval_; };
|
|
|
|
bool clearPackets(const std::shared_ptr<ZMPacket> &packet);
|
|
|
|
// Lock-free gate for callers: returns false when a clearPackets() call would
|
|
// certainly early-return. When keep_keyframes is on we only have work to do
|
|
// on a keyframe (start of a droppable GOP) or when a previous attempt was
|
|
// deferred via clear_packets_pending_. A stale read of pending is harmless;
|
|
// worst case we make one extra (cheap) early-returning call.
|
|
bool should_try_clear(bool is_keyframe) const {
|
|
if (!keep_keyframes) return true;
|
|
return is_keyframe || clear_packets_pending_.load(std::memory_order_relaxed);
|
|
}
|
|
|
|
int packet_count(int stream_id);
|
|
|
|
bool increment_it(packetqueue_iterator *it, bool wait);
|
|
bool increment_it(packetqueue_iterator *it, int stream_id);
|
|
ZMPacketLock get_packet(packetqueue_iterator *);
|
|
ZMPacketLock get_packet_no_wait(packetqueue_iterator *);
|
|
ZMPacketLock get_packet_and_increment_it(packetqueue_iterator *);
|
|
packetqueue_iterator *get_video_it(bool wait);
|
|
packetqueue_iterator *get_stream_it(int stream_id);
|
|
void free_it(packetqueue_iterator *);
|
|
|
|
packetqueue_iterator *get_event_start_packet_it(
|
|
packetqueue_iterator snapshot_it,
|
|
unsigned int pre_event_count
|
|
);
|
|
bool is_there_an_iterator_pointing_to_packet(const std::shared_ptr<ZMPacket> zm_packet);
|
|
void unlock(ZMPacketLock *lp);
|
|
void notify_all();
|
|
void wait();
|
|
void wait_for(Microseconds duration);
|
|
private:
|
|
packetqueue_iterator deletePacket(packetqueue_iterator it, std::vector<std::shared_ptr<ZMPacket>> &deferred);
|
|
};
|
|
|
|
#endif /* ZM_PACKETQUEUE_H */
|