From d5a9f7bdd4d971029159975269a43480c92caf4d Mon Sep 17 00:00:00 2001 From: Timo Rothenpieler Date: Wed, 21 May 2025 01:16:19 +0200 Subject: [PATCH] avcodec/cuviddec: only flush cuvid when output queue is empty --- libavcodec/cuviddec.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavcodec/cuviddec.c b/libavcodec/cuviddec.c index bb24fad3d4..3437ee2109 100644 --- a/libavcodec/cuviddec.c +++ b/libavcodec/cuviddec.c @@ -505,7 +505,12 @@ static int cuvid_decode_packet(AVCodecContext *avctx, const AVPacket *avpkt) ctx->decoder_flushing = 1; } - ret = CHECK_CU(ctx->cvdl->cuvidParseVideoData(ctx->cuparser, &cupkt)); + // When flushing, only actually flush cuvid when the output buffer has been fully emptied. + // CUVID happily dumps out a ton of frames with no regard for its own available surfaces. + if (!ctx->decoder_flushing || (ctx->decoder_flushing && !av_fifo_can_read(ctx->frame_queue))) + ret = CHECK_CU(ctx->cvdl->cuvidParseVideoData(ctx->cuparser, &cupkt)); + else + ret = 0; if (ret < 0) goto error;