aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhao Zhili <zhilizhao@tencent.com>2025-03-18 20:58:31 +0800
committerZhao Zhili <zhilizhao@tencent.com>2025-03-24 14:53:27 +0800
commitc6214b0d691566c7cb0f2ff5be08a24c3534e5bb (patch)
treee02d83fc614ad4f89f843831c6ef26c32304643f
parent26f2f03e0de278f296fbd1e8a09c43245b65f5e3 (diff)
downloadffmpeg-c6214b0d691566c7cb0f2ff5be08a24c3534e5bb.tar.gz
avcodec/vt: Don't restart decoder when confronted with ReferenceMissingErr
Otherwise the decoder may enter an loop of repeated state resets. This can happen for streams with CRA but no IDR. Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
-rw-r--r--libavcodec/videotoolbox.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c
index 7c88555e0c..aaa6129576 100644
--- a/libavcodec/videotoolbox.c
+++ b/libavcodec/videotoolbox.c
@@ -728,8 +728,12 @@ static void videotoolbox_decoder_callback(void *opaque,
}
if (!image_buffer) {
+ if (status != kVTVideoDecoderReferenceMissingErr)
+ vtctx->reconfig_needed = true;
+
av_log(vtctx->logctx, status ? AV_LOG_WARNING : AV_LOG_DEBUG,
- "vt decoder cb: output image buffer is null: %i\n", status);
+ "vt decoder cb: output image buffer is null: %i, reconfig %d\n",
+ status, vtctx->reconfig_needed);
return;
}
@@ -1066,10 +1070,8 @@ int ff_videotoolbox_common_end_frame(AVCodecContext *avctx, AVFrame *frame)
return AVERROR_UNKNOWN;
}
- if (!vtctx->frame) {
- vtctx->reconfig_needed = true;
+ if (!vtctx->frame)
return AVERROR_UNKNOWN;
- }
return videotoolbox_buffer_create(avctx, frame);
}