From 0d2ac60f32a2504e09ea6faab86ccd57fed171e7 Mon Sep 17 00:00:00 2001 From: nyanmisaka Date: Mon, 10 Feb 2025 22:12:43 +0800 Subject: [PATCH] fixup! lavc/rkmppdec: refactor RKMPP decoders and extend codecs Remove `dump_extra` bsf from h264/hevc_rkmpp decoder. It causes issues in some rstp streams, and users have been able to set the -bsf:v option for video input in FFmpeg 7.0+. Signed-off-by: nyanmisaka --- configure | 4 ++-- libavcodec/rkmppdec.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 0c07123b63..4449985cd4 100755 --- a/configure +++ b/configure @@ -3186,7 +3186,7 @@ h264_omx_encoder_deps="omx" h264_qsv_decoder_select="h264_mp4toannexb_bsf qsvdec" h264_qsv_encoder_select="atsc_a53 qsvenc" h264_rkmpp_decoder_deps="rkmpp" -h264_rkmpp_decoder_select="h264_mp4toannexb_bsf dump_extradata_bsf" +h264_rkmpp_decoder_select="h264_mp4toannexb_bsf" h264_rkmpp_encoder_deps="rkmpp" h264_vaapi_encoder_select="atsc_a53 cbs_h264 vaapi_encode" h264_v4l2m2m_decoder_deps="v4l2_m2m h264_v4l2_m2m" @@ -3207,7 +3207,7 @@ hevc_nvenc_encoder_select="atsc_a53" hevc_qsv_decoder_select="hevc_mp4toannexb_bsf qsvdec" hevc_qsv_encoder_select="hevcparse qsvenc" hevc_rkmpp_decoder_deps="rkmpp" -hevc_rkmpp_decoder_select="hevc_mp4toannexb_bsf dump_extradata_bsf" +hevc_rkmpp_decoder_select="hevc_mp4toannexb_bsf" hevc_rkmpp_encoder_deps="rkmpp" hevc_vaapi_encoder_deps="VAEncPictureParameterBufferHEVC" hevc_vaapi_encoder_select="atsc_a53 cbs_h265 vaapi_encode" diff --git a/libavcodec/rkmppdec.c b/libavcodec/rkmppdec.c index 35cd219182..73a7b1c3c9 100644 --- a/libavcodec/rkmppdec.c +++ b/libavcodec/rkmppdec.c @@ -1026,10 +1026,10 @@ static void rkmpp_decode_flush(AVCodecContext *avctx) DEFINE_RKMPP_DECODER(h263, H263, NULL) #endif #if CONFIG_H264_RKMPP_DECODER -DEFINE_RKMPP_DECODER(h264, H264, "h264_mp4toannexb,dump_extra") +DEFINE_RKMPP_DECODER(h264, H264, "h264_mp4toannexb") #endif #if CONFIG_HEVC_RKMPP_DECODER -DEFINE_RKMPP_DECODER(hevc, HEVC, "hevc_mp4toannexb,dump_extra") +DEFINE_RKMPP_DECODER(hevc, HEVC, "hevc_mp4toannexb") #endif #if CONFIG_VP8_RKMPP_DECODER DEFINE_RKMPP_DECODER(vp8, VP8, NULL)