avfilter/framequeue: add support for limiting and tracking buffered frames in the queues

Marton Balint committed 1 year ago

Commit 71468e81 parent 35a6de12 files · +22 −3Browse files

Unified · Split

2 files

 void ff_framequeue_global_init(FFFrameQueueGlobal *fqg)
 {
+    fqg->max_queued = SIZE_MAX;
+    fqg->queued = 0;
 }
 static void check_consistency(FFFrameQueue *fq)
 {
     fq->queue = &fq->first_bucket;
     fq->allocated = 1;
+    fq->global = fqg;
 }
 void ff_framequeue_free(FFFrameQueue *fq)
     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;
     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);
     av_assert1(fq->queued);
     b = bucket(fq, 0);
     fq->queued--;
+    fq->global->queued--;
     fq->tail++;
     fq->tail &= fq->allocated - 1;
     fq->total_frames_tail++;

@@ -40,11 +40,18 @@ typedef struct FFFrameBucket { · 39 unmodified lines
40	*	40	*
41	* This structure is intended to allow implementing global control of the	41	* This structure is intended to allow implementing global control of the
42	* frame queues, including memory consumption caps.	42	* frame queues, including memory consumption caps.
43	*
44	* It is currently empty.
45	*/	43	*/
46	typedef struct FFFrameQueueGlobal {	44	typedef struct FFFrameQueueGlobal {
47	char dummy; /* C does not allow empty structs */	45
		46	/**
		47	* Maximum number of allowed frames in the queues combined.
		48	*/
		49	size_t max_queued;
		50
		51	/**
		52	* Total number of queued frames in the queues combined.
		53	*/
		54	size_t queued;
48	} FFFrameQueueGlobal;	55	} FFFrameQueueGlobal;
49		56
50	/**	57	/**
@@ -52,6 +59,11 @@ typedef struct FFFrameQueueGlobal { · 1 unmodified line
52	*/	59	*/
53	typedef struct FFFrameQueue {	60	typedef struct FFFrameQueue {
54		61
		62	/**
		63	* Pointer to the global frame queue struct holding statistics and limits
		64	*/
		65	FFFrameQueueGlobal *global;
		66
55	/**	67	/**
56	* Array of allocated buckets, used as a circular buffer.	68	* Array of allocated buckets, used as a circular buffer.
57	*/	69	*/

Keyboard shortcuts