[FFmpeg-cvslog] avformat/fifo: Check for keyframe video type before stop dropping

[Arthur Grillo]

ffmpeg | branch: master | Arthur Grillo <arthurgrillo at riseup.net> | Thu Apr 10 19:59:15 2025 -0300| [2fedb29780f4a47957467d4a4831efe69993f615] | committer: Michael Niedermayer

avformat/fifo: Check for keyframe video type before stop dropping

The current behavior when using restart_with_keyframe is that it will
recover if it also encounters any audio packet, as they are flagged as a
keyframe.

The expectation is that packets are dropped until the next _video_
keyframe.

To fix that, check if exists a video stream, if it exists check the
packet stream codec type, only letting it recover when it is a video
one. If there is no video stream, resume to the original behavior, not
checking the codec type.

Fixes ticket: #11467

Signed-off-by: Arthur Grillo <arthurgrillo at riseup.net>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2fedb29780f4a47957467d4a4831efe69993f615
---

 libavformat/fifo.c | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/libavformat/fifo.c b/libavformat/fifo.c
index 936a153a49..e66002b902 100644
--- a/libavformat/fifo.c
+++ b/libavformat/fifo.c
@@ -106,6 +106,9 @@ typedef struct FifoThreadContext {
     uint8_t header_written;
 
     int64_t last_received_dts;
+
+    /* If > 0 at least one of the streams is a video stream */
+    uint8_t has_video_stream;
 } FifoThreadContext;
 
 typedef enum FifoMessageType {
@@ -185,14 +188,26 @@ static int fifo_thread_write_packet(FifoThreadContext *ctx, AVPacket *pkt)
     AVRational src_tb, dst_tb;
     int ret, s_idx;
     int64_t orig_pts, orig_dts, orig_duration;
+    enum AVMediaType stream_codec_type = avf->streams[pkt->stream_index]->codecpar->codec_type;
 
     if (fifo->timeshift && pkt->dts != AV_NOPTS_VALUE)
         atomic_fetch_sub_explicit(&fifo->queue_duration, next_duration(avf, pkt, &ctx->last_received_dts), memory_order_relaxed);
 
     if (ctx->drop_until_keyframe) {
         if (pkt->flags & AV_PKT_FLAG_KEY) {
-            ctx->drop_until_keyframe = 0;
-            av_log(avf, AV_LOG_VERBOSE, "Keyframe received, recovering...\n");
+            if (!ctx->has_video_stream) {
+                ctx->drop_until_keyframe = 0;
+                av_log(avf, AV_LOG_VERBOSE, "Keyframe received, recovering...\n");
+            } else {
+                if (stream_codec_type == AVMEDIA_TYPE_VIDEO) {
+                    ctx->drop_until_keyframe = 0;
+                    av_log(avf, AV_LOG_VERBOSE, "Video keyframe received, recovering...\n");
+                } else {
+                    av_log(avf, AV_LOG_VERBOSE, "Dropping non-video keyframe\n");
+                    av_packet_unref(pkt);
+                    return 0;
+                }
+            }
         } else {
             av_log(avf, AV_LOG_VERBOSE, "Dropping non-keyframe packet\n");
             av_packet_unref(pkt);
@@ -425,7 +440,7 @@ static void *fifo_consumer_thread(void *data)
     FifoContext *fifo = avf->priv_data;
     AVThreadMessageQueue *queue = fifo->queue;
     FifoMessage msg = {fifo->timeshift ? FIFO_NOOP : FIFO_WRITE_HEADER, {0}};
-    int ret;
+    int ret, i;
 
     FifoThreadContext fifo_thread_ctx;
     memset(&fifo_thread_ctx, 0, sizeof(FifoThreadContext));
@@ -434,6 +449,13 @@ static void *fifo_consumer_thread(void *data)
 
     ff_thread_setname("fifo-consumer");
 
+    for (i = 0; i < avf->nb_streams; i++) {
+        if (avf->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) {
+            fifo_thread_ctx.has_video_stream = 1;
+            break;
+        }
+    }
+
     while (1) {
         uint8_t just_flushed = 0;