On Mon, 7 Jul 2025, Marton Balint wrote:
Signed-off-by: Marton Balint <c...@passwd.hu>
---
libavfilter/framequeue.c | 7 +++++++
libavfilter/framequeue.h | 18 +++++++++++++++---
2 files changed, 22 insertions(+), 3 deletions(-)
Will apply the series.
Regards,
Marton
diff --git a/libavfilter/framequeue.c b/libavfilter/framequeue.c
index 79255fe532..3363406ba7 100644
--- a/libavfilter/framequeue.c
+++ b/libavfilter/framequeue.c
@@ -30,6 +30,8 @@ static inline FFFrameBucket *bucket(FFFrameQueue *fq, size_t
idx)
void ff_framequeue_global_init(FFFrameQueueGlobal *fqg)
{
+ fqg->max_queued = SIZE_MAX;
+ fqg->queued = 0;
}
static void check_consistency(FFFrameQueue *fq)
@@ -49,6 +51,7 @@ void ff_framequeue_init(FFFrameQueue *fq, FFFrameQueueGlobal
*fqg)
{
fq->queue = &fq->first_bucket;
fq->allocated = 1;
+ fq->global = fqg;
}
void ff_framequeue_free(FFFrameQueue *fq)
@@ -66,6 +69,8 @@ int ff_framequeue_add(FFFrameQueue *fq, AVFrame *frame)
FFFrameBucket *b;
check_consistency(fq);
+ if (fq->global->queued >= fq->global->max_queued)
+ return AVERROR(ENOMEM);
if (fq->queued == fq->allocated) {
if (fq->allocated == 1) {
size_t na = 8;
@@ -89,6 +94,7 @@ int ff_framequeue_add(FFFrameQueue *fq, AVFrame *frame)
b = bucket(fq, fq->queued);
b->frame = frame;
fq->queued++;
+ fq->global->queued++;
fq->total_frames_head++;
fq->total_samples_head += frame->nb_samples;
check_consistency(fq);
@@ -103,6 +109,7 @@ AVFrame *ff_framequeue_take(FFFrameQueue *fq)
av_assert1(fq->queued);
b = bucket(fq, 0);
fq->queued--;
+ fq->global->queued--;
fq->tail++;
fq->tail &= fq->allocated - 1;
fq->total_frames_tail++;
diff --git a/libavfilter/framequeue.h b/libavfilter/framequeue.h
index c49d872e85..405a43c65d 100644
--- a/libavfilter/framequeue.h
+++ b/libavfilter/framequeue.h
@@ -40,11 +40,18 @@ typedef struct FFFrameBucket {
*
* This structure is intended to allow implementing global control of the
* frame queues, including memory consumption caps.
- *
- * It is currently empty.
*/
typedef struct FFFrameQueueGlobal {
- char dummy; /* C does not allow empty structs */
+
+ /**
+ * Maximum number of allowed frames in the queues combined.
+ */
+ size_t max_queued;
+
+ /**
+ * Total number of queued frames in the queues combined.
+ */
+ size_t queued;
} FFFrameQueueGlobal;
/**
@@ -52,6 +59,11 @@ typedef struct FFFrameQueueGlobal {
*/
typedef struct FFFrameQueue {
+ /**
+ * Pointer to the global frame queue struct holding statistics and limits
+ */
+ FFFrameQueueGlobal *global;
+
/**
* Array of allocated buckets, used as a circular buffer.
*/
--
2.43.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
