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

[Michael Niedermayer]

On Sat, Apr 05, 2025 at 02:49:30PM -0300, Arthur Grillo wrote:
> 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>
> ---
> Changes in v2:
> - Check for the presence of a video stream (Michael Niedermayer)
> - Link to v1: https://patchwork.ffmpeg.org/project/ffmpeg/patch/20250312-video-only-kf-recover-v1-1-1e0e340da663@riseup.net

[...]

>  } 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 {

The indention here is broken

thx

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Let us carefully observe those good qualities wherein our enemies excel us
and endeavor to excel them, by avoiding what is faulty, and imitating what
is excellent in them. -- Plutarch
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20250409/9305b54e/attachment.sig>