ffmpeg | branch: master | Zhao Zhili <zhiliz...@tencent.com> | Tue Mar 18 20:58:31 2025 +0800| [c6214b0d691566c7cb0f2ff5be08a24c3534e5bb] | committer: Zhao Zhili
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 <zhiliz...@tencent.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c6214b0d691566c7cb0f2ff5be08a24c3534e5bb --- libavcodec/videotoolbox.c | 10 ++++++---- 1 file 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); } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
