Allow count to be more correct in frame_queue API

queue_libplacebo's behavior is currently unchanged, though.

Signed-off-by: Andrew Opalach <andrew@akon.city>

1 files changed, 8 insertions, 12 deletions

diff --git a/src/render/queue_momo.c b/src/render/queue_momo.c
index bc7caf8..2f7d535 100644
--- a/src/render/queue_momo.c
+++ b/src/render/queue_momo.c
@@ -11,20 +11,22 @@ static bool queue_momo_configure_subtitles(struct camu_frame_queue *queue, u32 w
     return false;
 }
 
-static void queue_momo_push(struct camu_frame_queue *queue, struct camu_codec_frame *frame, f64 pts)
+static void queue_momo_push(struct camu_frame_queue *queue, struct camu_codec_frame *frame, f64 pts, u32 *count)
 {
     struct camu_frame_queue_momo *mq = (struct camu_frame_queue_momo *)queue;
     (void)mq;
     (void)pts;
+    (void)count;
     camu_codec_frame_discard(frame);
 }
 
 #ifdef CAMU_HAVE_FFMPEG
-static void queue_momo_push_av_frame(struct camu_frame_queue *queue, AVFrame *frame, f64 pts)
+static void queue_momo_push_av_frame(struct camu_frame_queue *queue, AVFrame *frame, f64 pts, u32 *count)
 {
     struct camu_frame_queue_momo *mq = (struct camu_frame_queue_momo *)queue;
     (void)mq;
     (void)pts;
+    (void)count;
     av_frame_free(&frame);
 }
 #endif
@@ -36,24 +38,19 @@ static void queue_momo_push_subtitle(struct camu_frame_queue *queue, struct camu
     (void)packet;
 }
 
-static void queue_momo_flush(struct camu_frame_queue *queue)
+static void queue_momo_flush(struct camu_frame_queue *queue, u32 *count)
 {
     (void)queue;
+    (void)count;
 }
 
-static s32 queue_momo_count(struct camu_frame_queue *queue)
-{
-    struct camu_frame_queue_momo *mq = (struct camu_frame_queue_momo *)queue;
-    (void)mq;
-    return 1;
-}
-
-static u8 queue_momo_read(struct camu_frame_queue *queue, f64 pts, void *out)
+static u8 queue_momo_read(struct camu_frame_queue *queue, f64 pts, void *out, u32 *count)
 {
     struct camu_frame_queue_momo *mq = (struct camu_frame_queue_momo *)queue;
     (void)mq;
     (void)pts;
     (void)out;
+    (void)count;
     return CAMU_QUEUE_OK;
 }
 
@@ -80,7 +77,6 @@ struct camu_frame_queue *camu_frame_queue_momo_create(void)
 #endif
     mq->q.push_subtitle = queue_momo_push_subtitle;
     mq->q.flush = queue_momo_flush;
-    mq->q.count = queue_momo_count;
     mq->q.read = queue_momo_read;
     mq->q.reset = queue_momo_reset;
     mq->q.free = queue_momo_free;