September 2024 - ffmpeg-cvslog

lavc: Check codec_whitelist early in avcodec_open2()
by Dale Curtis 01 Sep '24

01 Sep '24

ffmpeg | branch: master | Dale Curtis <dalecurtis(a)chromium.org> | Tue Jul 30 23:12:21 2024 +0000| [7753a9d62725d5bd8313e2d249acbe1c8af79ab1] | committer: Anton Khirnov lavc: Check codec_whitelist early in avcodec_open2() This ensures that if a codec isn't on codec_whitelist, trying to open it will not trigger ff_codec_close(), which could invalidate useful information still present in the context. Signed-off-by: Dale Curtis <dalecurtis(a)chromium.org> Signed-off-by: Anton Khirnov <anton(a)khirnov.net> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7753a9d62725d5bd8… --- libavcodec/avcodec.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libavcodec/avcodec.c b/libavcodec/avcodec.c index 6065f1b689..765328660b 100644 --- a/libavcodec/avcodec.c +++ b/libavcodec/avcodec.c @@ -174,6 +174,14 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code if (avctx->extradata_size < 0 || avctx->extradata_size >= FF_MAX_EXTRADATA_SIZE) return AVERROR(EINVAL); + if ((ret = av_opt_set_dict(avctx, options)) < 0) + return ret; + + if (avctx->codec_whitelist && av_match_list(codec->name, avctx->codec_whitelist, ',') <= 0) { + av_log(avctx, AV_LOG_ERROR, "Codec (%s) not on whitelist \'%s\'\n", codec->name, avctx->codec_whitelist); + return AVERROR(EINVAL); + } + avci = av_codec_is_decoder(codec) ? ff_decode_internal_alloc() : ff_encode_internal_alloc(); @@ -207,14 +215,6 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code } else { avctx->priv_data = NULL; } - if ((ret = av_opt_set_dict(avctx, options)) < 0) - goto free_and_end; - - if (avctx->codec_whitelist && av_match_list(codec->name, avctx->codec_whitelist, ',') <= 0) { - av_log(avctx, AV_LOG_ERROR, "Codec (%s) not on whitelist \'%s\'\n", codec->name, avctx->codec_whitelist); - ret = AVERROR(EINVAL); - goto free_and_end; - } // only call ff_set_dimensions() for non H.264/VP6F/DXV codecs so as not to overwrite previously setup dimensions if (!(avctx->coded_width && avctx->coded_height && avctx->width && avctx->height &&

1 0

avcodec: add Mediacodec audio decoders support
by Matthieu Bouron 01 Sep '24

01 Sep '24

ffmpeg | branch: master | Matthieu Bouron <matthieu.bouron(a)gmail.com> | Wed Jun 12 15:42:10 2024 +0200| [0a780d3076fe44fe6d641e84e291b567fca29999] | committer: Matthieu Bouron avcodec: add Mediacodec audio decoders support Signed-off-by: Matthieu Bouron <matthieu.bouron(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0a780d3076fe44fe6… --- Changelog | 1 + configure | 8 + libavcodec/Makefile | 4 + libavcodec/allcodecs.c | 4 + libavcodec/mediacodecdec.c | 102 +++++++++++- libavcodec/mediacodecdec_common.c | 333 ++++++++++++++++++++++++++++++++++---- 6 files changed, 421 insertions(+), 31 deletions(-) diff --git a/Changelog b/Changelog index 571b27ad98..583de26f1b 100644 --- a/Changelog +++ b/Changelog @@ -18,6 +18,7 @@ version <next>: - D3D12VA HEVC encoder - Cropping metadata parsing and writing in Matroska and MP4/MOV de/muxers - Intel QSV-accelerated VVC decoding +- MediaCodec AAC/AMR-NB/AMR-WB/MP3 decoding version 7.0: diff --git a/configure b/configure index 63f0429b02..44cfaebf21 100755 --- a/configure +++ b/configure @@ -3324,8 +3324,14 @@ amf_deps_any="libdl LoadLibrary" nvenc_deps="ffnvcodec" nvenc_deps_any="libdl LoadLibrary" +aac_mediacodec_decoder_deps="mediacodec" +aac_mediacodec_decoder_select="aac_adtstoasc_bsf aac_parser" aac_mf_encoder_deps="mediafoundation" ac3_mf_encoder_deps="mediafoundation" +amrnb_mediacodec_decoder_deps="mediacodec" +amrnb_mediacodec_decoder_select="amr_parser" +amrwb_mediacodec_decoder_deps="mediacodec" +amrwb_mediacodec_decoder_select="amr_parser" av1_amf_encoder_deps="amf" av1_cuvid_decoder_deps="cuvid CUVIDAV1PICPARAMS" av1_mediacodec_decoder_deps="mediacodec" @@ -3387,6 +3393,8 @@ mjpeg_qsv_encoder_select="qsvenc" mjpeg_vaapi_encoder_deps="VAEncPictureParameterBufferJPEG" mjpeg_vaapi_encoder_select="cbs_jpeg jpegtables vaapi_encode" mp3_mf_encoder_deps="mediafoundation" +mp3_mediacodec_decoder_deps="mediacodec" +mp3_mediacodec_decoder_select="mpegaudioheader" mpeg1_cuvid_decoder_deps="cuvid" mpeg1_v4l2m2m_decoder_deps="v4l2_m2m mpeg1_v4l2_m2m" mpeg2_cuvid_decoder_deps="cuvid" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 3b4b8681f5..c60c31b270 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -197,6 +197,7 @@ OBJS-$(CONFIG_AAC_ENCODER) += aacenc.o aaccoder.o aacenctab.o \ aacenc_pred.o \ psymodel.o kbdwin.o \ mpeg4audio_sample_rates.o +OBJS-$(CONFIG_AAC_MEDIACODEC_DECODER) += mediacodecdec.o OBJS-$(CONFIG_AAC_MF_ENCODER) += mfenc.o mf_utils.o OBJS-$(CONFIG_AASC_DECODER) += aasc.o msrledec.o OBJS-$(CONFIG_AC3_DECODER) += ac3dec_float.o ac3dec_data.o ac3.o \ @@ -223,6 +224,8 @@ OBJS-$(CONFIG_AMRWB_DECODER) += amrwbdec.o celp_filters.o \ celp_math.o acelp_filters.o \ acelp_vectors.o \ acelp_pitch_delay.o +OBJS-$(CONFIG_AMRNB_MEDIACODEC_DECODER) += mediacodecdec.o +OBJS-$(CONFIG_AMRWB_MEDIACODEC_DECODER) += mediacodecdec.o OBJS-$(CONFIG_AMV_ENCODER) += mjpegenc.o mjpegenc_common.o OBJS-$(CONFIG_ANM_DECODER) += anm.o OBJS-$(CONFIG_ANULL_DECODER) += null.o @@ -521,6 +524,7 @@ OBJS-$(CONFIG_MP2FIXED_ENCODER) += mpegaudioenc_fixed.o mpegaudio.o \ mpegaudiotabs.o OBJS-$(CONFIG_MP2FLOAT_DECODER) += mpegaudiodec_float.o OBJS-$(CONFIG_MP3_DECODER) += mpegaudiodec_fixed.o +OBJS-$(CONFIG_MP3_MEDIACODEC_DECODER) += mediacodecdec.o OBJS-$(CONFIG_MP3_MF_ENCODER) += mfenc.o mf_utils.o OBJS-$(CONFIG_MP3ADU_DECODER) += mpegaudiodec_fixed.o OBJS-$(CONFIG_MP3ADUFLOAT_DECODER) += mpegaudiodec_float.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 09385be4ee..563afde355 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -822,8 +822,11 @@ extern const FFCodec ff_idf_decoder; /* external libraries, that shouldn't be used by default if one of the * above is available */ +extern const FFCodec ff_aac_mediacodec_decoder; extern const FFCodec ff_aac_mf_encoder; extern const FFCodec ff_ac3_mf_encoder; +extern const FFCodec ff_amrnb_mediacodec_decoder; +extern const FFCodec ff_amrwb_mediacodec_decoder; extern const FFCodec ff_h263_v4l2m2m_encoder; extern const FFCodec ff_libaom_av1_decoder; /* hwaccel hooks only, so prefer external decoders */ @@ -863,6 +866,7 @@ extern const FFCodec ff_mjpeg_cuvid_decoder; extern const FFCodec ff_mjpeg_qsv_encoder; extern const FFCodec ff_mjpeg_qsv_decoder; extern const FFCodec ff_mjpeg_vaapi_encoder; +extern const FFCodec ff_mp3_mediacodec_decoder; extern const FFCodec ff_mp3_mf_encoder; extern const FFCodec ff_mpeg1_cuvid_decoder; extern const FFCodec ff_mpeg2_cuvid_decoder; diff --git a/libavcodec/mediacodecdec.c b/libavcodec/mediacodecdec.c index 0da5fe6729..cc55b306bd 100644 --- a/libavcodec/mediacodecdec.c +++ b/libavcodec/mediacodecdec.c @@ -291,7 +291,11 @@ done: CONFIG_MPEG4_MEDIACODEC_DECODER || \ CONFIG_VP8_MEDIACODEC_DECODER || \ CONFIG_VP9_MEDIACODEC_DECODER || \ - CONFIG_AV1_MEDIACODEC_DECODER + CONFIG_AV1_MEDIACODEC_DECODER || \ + CONFIG_AAC_MEDIACODEC_DECODER || \ + CONFIG_AMRNB_MEDIACODEC_DECODER || \ + CONFIG_AMRWB_MEDIACODEC_DECODER || \ + CONFIG_MP3_MEDIACODEC_DECODER static int common_set_extradata(AVCodecContext *avctx, FFAMediaFormat *format) { int ret = 0; @@ -388,13 +392,55 @@ static av_cold int mediacodec_decode_init(AVCodecContext *avctx) goto done; break; #endif +#if CONFIG_AAC_MEDIACODEC_DECODER + case AV_CODEC_ID_AAC: + codec_mime = "audio/mp4a-latm"; + + ret = common_set_extradata(avctx, format); + if (ret < 0) + goto done; + break; +#endif +#if CONFIG_AMRNB_MEDIACODEC_DECODER + case AV_CODEC_ID_AMR_NB: + codec_mime = "audio/3gpp"; + + ret = common_set_extradata(avctx, format); + if (ret < 0) + goto done; + break; +#endif +#if CONFIG_AMRWB_MEDIACODEC_DECODER + case AV_CODEC_ID_AMR_WB: + codec_mime = "audio/amr-wb"; + + ret = common_set_extradata(avctx, format); + if (ret < 0) + goto done; + break; +#endif +#if CONFIG_MP3_MEDIACODEC_DECODER + case AV_CODEC_ID_MP3: + codec_mime = "audio/mpeg"; + + ret = common_set_extradata(avctx, format); + if (ret < 0) + goto done; + break; +#endif default: av_assert0(0); } ff_AMediaFormat_setString(format, "mime", codec_mime); - ff_AMediaFormat_setInt32(format, "width", avctx->width); - ff_AMediaFormat_setInt32(format, "height", avctx->height); + + if (avctx->codec_type == AVMEDIA_TYPE_VIDEO) { + ff_AMediaFormat_setInt32(format, "width", avctx->width); + ff_AMediaFormat_setInt32(format, "height", avctx->height); + } else { + ff_AMediaFormat_setInt32(format, "channel-count", avctx->ch_layout.nb_channels); + ff_AMediaFormat_setInt32(format, "sample-rate", avctx->sample_rate); + } s->ctx = av_mallocz(sizeof(*s->ctx)); if (!s->ctx) { @@ -611,3 +657,53 @@ DECLARE_MEDIACODEC_VDEC(vp9, "VP9", AV_CODEC_ID_VP9, NULL) #if CONFIG_AV1_MEDIACODEC_DECODER DECLARE_MEDIACODEC_VDEC(av1, "AV1", AV_CODEC_ID_AV1, NULL) #endif + +#define AD AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_DECODING_PARAM +static const AVOption ff_mediacodec_adec_options[] = { + { "ndk_codec", "Use MediaCodec from NDK", + OFFSET(use_ndk_codec), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, AD }, + { NULL } +}; + +#define DECLARE_MEDIACODEC_ACLASS(short_name) \ +static const AVClass ff_##short_name##_mediacodec_dec_class = { \ + .class_name = #short_name "_mediacodec", \ + .item_name = av_default_item_name, \ + .option = ff_mediacodec_adec_options, \ + .version = LIBAVUTIL_VERSION_INT, \ +}; + +#define DECLARE_MEDIACODEC_ADEC(short_name, full_name, codec_id, bsf) \ +DECLARE_MEDIACODEC_VCLASS(short_name) \ +const FFCodec ff_ ## short_name ## _mediacodec_decoder = { \ + .p.name = #short_name "_mediacodec", \ + CODEC_LONG_NAME(full_name " Android MediaCodec decoder"), \ + .p.type = AVMEDIA_TYPE_AUDIO, \ + .p.id = codec_id, \ + .p.priv_class = &ff_##short_name##_mediacodec_dec_class, \ + .priv_data_size = sizeof(MediaCodecH264DecContext), \ + .init = mediacodec_decode_init, \ + FF_CODEC_RECEIVE_FRAME_CB(mediacodec_receive_frame), \ + .flush = mediacodec_decode_flush, \ + .close = mediacodec_decode_close, \ + .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HARDWARE, \ + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE, \ + .bsfs = bsf, \ + .p.wrapper_name = "mediacodec", \ +}; \ + +#if CONFIG_AAC_MEDIACODEC_DECODER +DECLARE_MEDIACODEC_ADEC(aac, "AAC", AV_CODEC_ID_AAC, "aac_adtstoasc") +#endif + +#if CONFIG_AMRNB_MEDIACODEC_DECODER +DECLARE_MEDIACODEC_ADEC(amrnb, "AMR-NB", AV_CODEC_ID_AMR_NB, NULL) +#endif + +#if CONFIG_AMRWB_MEDIACODEC_DECODER +DECLARE_MEDIACODEC_ADEC(amrwb, "AMR-WB", AV_CODEC_ID_AMR_WB, NULL) +#endif + +#if CONFIG_MP3_MEDIACODEC_DECODER +DECLARE_MEDIACODEC_ADEC(mp3, "MP3", AV_CODEC_ID_MP3, NULL) +#endif diff --git a/libavcodec/mediacodecdec_common.c b/libavcodec/mediacodecdec_common.c index c888dea8cf..b1ee8b609a 100644 --- a/libavcodec/mediacodecdec_common.c +++ b/libavcodec/mediacodecdec_common.c @@ -23,6 +23,7 @@ #include <string.h> #include <sys/types.h> +#include "libavutil/avassert.h" #include "libavutil/common.h" #include "libavutil/hwcontext_mediacodec.h" #include "libavutil/mem.h" @@ -30,6 +31,7 @@ #include "libavutil/pixfmt.h" #include "libavutil/time.h" #include "libavutil/timestamp.h" +#include "libavutil/channel_layout.h" #include "avcodec.h" #include "decode.h" @@ -85,6 +87,107 @@ #define OUTPUT_DEQUEUE_TIMEOUT_US 8000 #define OUTPUT_DEQUEUE_BLOCK_TIMEOUT_US 1000000 +enum { + ENCODING_PCM_16BIT = 0x00000002, + ENCODING_PCM_8BIT = 0x00000003, + ENCODING_PCM_FLOAT = 0x00000004, + ENCODING_PCM_24BIT_PACKED = 0x00000015, + ENCODING_PCM_32BIT = 0x00000016, +}; + +static const struct { + + int pcm_format; + enum AVSampleFormat sample_format; + +} sample_formats[] = { + + { ENCODING_PCM_16BIT, AV_SAMPLE_FMT_S16 }, + { ENCODING_PCM_8BIT, AV_SAMPLE_FMT_U8 }, + { ENCODING_PCM_FLOAT, AV_SAMPLE_FMT_FLT }, + { ENCODING_PCM_32BIT, AV_SAMPLE_FMT_S32 }, + { 0 } +}; + +static enum AVSampleFormat mcdec_map_pcm_format(AVCodecContext *avctx, + MediaCodecDecContext *s, + int pcm_format) +{ + enum AVSampleFormat ret = AV_SAMPLE_FMT_NONE; + + for (int i = 0; i < FF_ARRAY_ELEMS(sample_formats); i++) { + if (sample_formats[i].pcm_format == pcm_format) { + return sample_formats[i].sample_format; + } + } + + av_log(avctx, AV_LOG_ERROR, "Output sample format 0x%x (value=%d) is not supported\n", + pcm_format, pcm_format); + + return ret; +} + +enum +{ + CHANNEL_OUT_FRONT_LEFT = 0x4, + CHANNEL_OUT_FRONT_RIGHT = 0x8, + CHANNEL_OUT_FRONT_CENTER = 0x10, + CHANNEL_OUT_LOW_FREQUENCY = 0x20, + CHANNEL_OUT_BACK_LEFT = 0x40, + CHANNEL_OUT_BACK_RIGHT = 0x80, + CHANNEL_OUT_FRONT_LEFT_OF_CENTER = 0x100, + CHANNEL_OUT_FRONT_RIGHT_OF_CENTER = 0x200, + CHANNEL_OUT_BACK_CENTER = 0x400, + CHANNEL_OUT_SIDE_LEFT = 0x800, + CHANNEL_OUT_SIDE_RIGHT = 0x1000, + CHANNEL_OUT_TOP_CENTER = 0x2000, + CHANNEL_OUT_TOP_FRONT_LEFT = 0x4000, + CHANNEL_OUT_TOP_FRONT_CENTER = 0x8000, + CHANNEL_OUT_TOP_FRONT_RIGHT = 0x10000, + CHANNEL_OUT_TOP_BACK_LEFT = 0x20000, + CHANNEL_OUT_TOP_BACK_CENTER = 0x40000, + CHANNEL_OUT_TOP_BACK_RIGHT = 0x80000, +}; + +static const struct { + + int mask; + uint64_t layout; + +} channel_masks[] = { + { CHANNEL_OUT_FRONT_LEFT, AV_CH_FRONT_LEFT }, + { CHANNEL_OUT_FRONT_RIGHT, AV_CH_FRONT_RIGHT }, + { CHANNEL_OUT_FRONT_CENTER, AV_CH_FRONT_CENTER }, + { CHANNEL_OUT_LOW_FREQUENCY, AV_CH_LOW_FREQUENCY }, + { CHANNEL_OUT_BACK_LEFT, AV_CH_BACK_LEFT }, + { CHANNEL_OUT_BACK_RIGHT, AV_CH_BACK_RIGHT }, + { CHANNEL_OUT_FRONT_LEFT_OF_CENTER, AV_CH_FRONT_LEFT_OF_CENTER }, + { CHANNEL_OUT_FRONT_RIGHT_OF_CENTER, AV_CH_FRONT_RIGHT_OF_CENTER }, + { CHANNEL_OUT_BACK_CENTER, AV_CH_BACK_CENTER }, + { CHANNEL_OUT_SIDE_LEFT, AV_CH_SIDE_LEFT }, + { CHANNEL_OUT_SIDE_RIGHT, AV_CH_SIDE_RIGHT }, + { CHANNEL_OUT_TOP_CENTER, AV_CH_TOP_CENTER }, + { CHANNEL_OUT_TOP_FRONT_LEFT, AV_CH_TOP_FRONT_LEFT }, + { CHANNEL_OUT_TOP_FRONT_CENTER, AV_CH_TOP_FRONT_CENTER }, + { CHANNEL_OUT_TOP_FRONT_RIGHT, AV_CH_TOP_FRONT_RIGHT }, + { CHANNEL_OUT_TOP_BACK_LEFT, AV_CH_TOP_BACK_LEFT }, + { CHANNEL_OUT_TOP_BACK_CENTER, AV_CH_TOP_BACK_CENTER }, + { CHANNEL_OUT_TOP_BACK_RIGHT, AV_CH_TOP_BACK_RIGHT }, +}; + +static uint64_t mcdec_map_channel_mask(AVCodecContext *avctx, + int channel_mask) +{ + uint64_t channel_layout = 0; + + for (int i = 0; i < FF_ARRAY_ELEMS(channel_masks); i++) { + if (channel_mask & channel_masks[i].mask) + channel_layout |= channel_masks[i].layout; + } + + return channel_layout; +} + enum { COLOR_FormatYUV420Planar = 0x13, COLOR_FormatYUV420SemiPlanar = 0x15, @@ -265,13 +368,79 @@ fail: return ret; } -static int mediacodec_wrap_sw_buffer(AVCodecContext *avctx, - MediaCodecDecContext *s, - uint8_t *data, - size_t size, - ssize_t index, - FFAMediaCodecBufferInfo *info, - AVFrame *frame) +static int mediacodec_wrap_sw_audio_buffer(AVCodecContext *avctx, + MediaCodecDecContext *s, + uint8_t *data, + size_t size, + ssize_t index, + FFAMediaCodecBufferInfo *info, + AVFrame *frame) +{ + int ret = 0; + int status = 0; + const int sample_size = av_get_bytes_per_sample(avctx->sample_fmt); + if (!sample_size) { + av_log(avctx, AV_LOG_ERROR, "Could not get bytes per sample\n"); + ret = AVERROR(ENOSYS); + goto done; + } + + frame->format = avctx->sample_fmt; + frame->sample_rate = avctx->sample_rate; + frame->nb_samples = info->size / (sample_size * avctx->ch_layout.nb_channels); + + ret = av_channel_layout_copy(&frame->ch_layout, &avctx->ch_layout); + if (ret < 0) { + av_log(avctx, AV_LOG_ERROR, "Could not copy channel layout\n"); + goto done; + } + + /* MediaCodec buffers needs to be copied to our own refcounted buffers + * because the flush command invalidates all input and output buffers. + */ + ret = ff_get_buffer(avctx, frame, 0); + if (ret < 0) { + av_log(avctx, AV_LOG_ERROR, "Could not allocate buffer\n"); + goto done; + } + + /* Override frame->pts as ff_get_buffer will override its value based + * on the last avpacket received which is not in sync with the frame: + * * N avpackets can be pushed before 1 frame is actually returned + * * 0-sized avpackets are pushed to flush remaining frames at EOS */ + if (avctx->pkt_timebase.num && avctx->pkt_timebase.den) { + frame->pts = av_rescale_q(info->presentationTimeUs, + AV_TIME_BASE_Q, + avctx->pkt_timebase); + } else { + frame->pts = info->presentationTimeUs; + } + frame->pkt_dts = AV_NOPTS_VALUE; + + av_log(avctx, AV_LOG_TRACE, + "Frame: format=%d channels=%d sample_rate=%d nb_samples=%d", + avctx->sample_fmt, avctx->ch_layout.nb_channels, avctx->sample_rate, frame->nb_samples); + + memcpy(frame->data[0], data, info->size); + + ret = 0; +done: + status = ff_AMediaCodec_releaseOutputBuffer(s->codec, index, 0); + if (status < 0) { + av_log(avctx, AV_LOG_ERROR, "Failed to release output buffer\n"); + ret = AVERROR_EXTERNAL; + } + + return ret; +} + +static int mediacodec_wrap_sw_video_buffer(AVCodecContext *avctx, + MediaCodecDecContext *s, + uint8_t *data, + size_t size, + ssize_t index, + FFAMediaCodecBufferInfo *info, + AVFrame *frame) { int ret = 0; int status = 0; @@ -343,6 +512,22 @@ done: return ret; } +static int mediacodec_wrap_sw_buffer(AVCodecContext *avctx, + MediaCodecDecContext *s, + uint8_t *data, + size_t size, + ssize_t index, + FFAMediaCodecBufferInfo *info, + AVFrame *frame) +{ + if (avctx->codec_type == AVMEDIA_TYPE_AUDIO) + return mediacodec_wrap_sw_audio_buffer(avctx, s, data, size, index, info, frame); + else if (avctx->codec_type == AVMEDIA_TYPE_VIDEO) + return mediacodec_wrap_sw_video_buffer(avctx, s, data, size, index, info, frame); + else + av_assert0(0); +} + #define AMEDIAFORMAT_GET_INT32(name, key, mandatory) do { \ int32_t value = 0; \ if (ff_AMediaFormat_getInt32(s->format, key, &value)) { \ @@ -354,7 +539,7 @@ done: } \ } while (0) \ -static int mediacodec_dec_parse_format(AVCodecContext *avctx, MediaCodecDecContext *s) +static int mediacodec_dec_parse_video_format(AVCodecContext *avctx, MediaCodecDecContext *s) { int ret = 0; int width = 0; @@ -463,6 +648,63 @@ fail: return ret; } +static int mediacodec_dec_parse_audio_format(AVCodecContext *avctx, MediaCodecDecContext *s) +{ + int ret = 0; + int sample_rate = 0; + int channel_count = 0; + int channel_mask = 0; + int pcm_encoding = 0; + char *format = NULL; + + if (!s->format) { + av_log(avctx, AV_LOG_ERROR, "Output MediaFormat is not set\n"); + return AVERROR(EINVAL); + } + + format = ff_AMediaFormat_toString(s->format); + if (!format) { + return AVERROR_EXTERNAL; + } + av_log(avctx, AV_LOG_DEBUG, "Parsing MediaFormat %s\n", format); + + /* Mandatory fields */ + AMEDIAFORMAT_GET_INT32(channel_count, "channel-count", 1); + AMEDIAFORMAT_GET_INT32(sample_rate, "sample-rate", 1); + + AMEDIAFORMAT_GET_INT32(pcm_encoding, "pcm-encoding", 0); + if (pcm_encoding) + avctx->sample_fmt = mcdec_map_pcm_format(avctx, s, pcm_encoding); + else + avctx->sample_fmt = AV_SAMPLE_FMT_S16; + + avctx->sample_rate = sample_rate; + + AMEDIAFORMAT_GET_INT32(channel_mask, "channel-mask", 0); + if (channel_mask) + av_channel_layout_from_mask(&avctx->ch_layout, mcdec_map_channel_mask(avctx, channel_mask)); + else + av_channel_layout_default(&avctx->ch_layout, channel_count); + + av_log(avctx, AV_LOG_INFO, + "Output parameters channel-count=%d channel-layout=%x sample-rate=%d\n", + channel_count, channel_mask, sample_rate); + +fail: + av_freep(&format); + return ret; +} + +static int mediacodec_dec_parse_format(AVCodecContext *avctx, MediaCodecDecContext *s) +{ + if (avctx->codec_type == AVMEDIA_TYPE_AUDIO) + return mediacodec_dec_parse_audio_format(avctx, s); + else if (avctx->codec_type == AVMEDIA_TYPE_VIDEO) + return mediacodec_dec_parse_video_format(avctx, s); + else + av_assert0(0); +} + static int mediacodec_dec_flush_codec(AVCodecContext *avctx, MediaCodecDecContext *s) { FFAMediaCodec *codec = s->codec; @@ -486,11 +728,9 @@ static int mediacodec_dec_flush_codec(AVCodecContext *avctx, MediaCodecDecContex return 0; } -int ff_mediacodec_dec_init(AVCodecContext *avctx, MediaCodecDecContext *s, - const char *mime, FFAMediaFormat *format) +static int mediacodec_dec_get_video_codec(AVCodecContext *avctx, MediaCodecDecContext *s, + const char *mime, FFAMediaFormat *format) { - int ret = 0; - int status; int profile; enum AVPixelFormat pix_fmt; @@ -499,12 +739,6 @@ int ff_mediacodec_dec_init(AVCodecContext *avctx, MediaCodecDecContext *s, AV_PIX_FMT_NONE, }; - s->avctx = avctx; - atomic_init(&s->refcount, 1); - atomic_init(&s->hw_buffer_count, 0); - atomic_init(&s->serial, 1); - s->current_input_buffer = -1; - pix_fmt = ff_get_format(avctx, pix_fmts); if (pix_fmt == AV_PIX_FMT_MEDIACODEC) { AVMediaCodecContext *user_ctx = avctx->hwaccel_context; @@ -536,8 +770,7 @@ int ff_mediacodec_dec_init(AVCodecContext *avctx, MediaCodecDecContext *s, // getCodecNameByType() can fail due to missing JVM, while NDK // mediacodec can be used without JVM. if (!s->use_ndk_codec) { - ret = AVERROR_EXTERNAL; - goto fail; + return AVERROR_EXTERNAL; } av_log(avctx, AV_LOG_INFO, "Failed to getCodecNameByType\n"); } else { @@ -556,10 +789,52 @@ int ff_mediacodec_dec_init(AVCodecContext *avctx, MediaCodecDecContext *s, } if (!s->codec) { av_log(avctx, AV_LOG_ERROR, "Failed to create media decoder for type %s and name %s\n", mime, s->codec_name); - ret = AVERROR_EXTERNAL; - goto fail; + return AVERROR_EXTERNAL; + } + + return 0; +} + +static int mediacodec_dec_get_audio_codec(AVCodecContext *avctx, MediaCodecDecContext *s, + const char *mime, FFAMediaFormat *format) +{ + s->codec = ff_AMediaCodec_createDecoderByType(mime, s->use_ndk_codec); + if (!s->codec) { + av_log(avctx, AV_LOG_ERROR, "Failed to create media decoder for mime %s\n", mime); + return AVERROR_EXTERNAL; + } + + s->codec_name = ff_AMediaCodec_getName(s->codec); + if (!s->codec_name) { + s->codec_name = av_strdup(mime); + if (!s->codec_name) + return AVERROR(ENOMEM); } + return 0; +} + +int ff_mediacodec_dec_init(AVCodecContext *avctx, MediaCodecDecContext *s, + const char *mime, FFAMediaFormat *format) +{ + int ret; + int status; + + s->avctx = avctx; + atomic_init(&s->refcount, 1); + atomic_init(&s->hw_buffer_count, 0); + atomic_init(&s->serial, 1); + s->current_input_buffer = -1; + + if (avctx->codec_type == AVMEDIA_TYPE_AUDIO) + ret = mediacodec_dec_get_audio_codec(avctx, s, mime, format); + else if (avctx->codec_type == AVMEDIA_TYPE_VIDEO) + ret = mediacodec_dec_get_video_codec(avctx, s, mime, format); + else + av_assert0(0); + if (ret < 0) + goto fail; + status = ff_AMediaCodec_configure(s->codec, format, s->surface, NULL, 0); if (status < 0) { char *desc = ff_AMediaFormat_toString(format); @@ -583,12 +858,14 @@ int ff_mediacodec_dec_init(AVCodecContext *avctx, MediaCodecDecContext *s, goto fail; } - s->format = ff_AMediaCodec_getOutputFormat(s->codec); - if (s->format) { - if ((ret = mediacodec_dec_parse_format(avctx, s)) < 0) { - av_log(avctx, AV_LOG_ERROR, - "Failed to configure context\n"); - goto fail; + if (avctx->codec_type == AVMEDIA_TYPE_VIDEO) { + s->format = ff_AMediaCodec_getOutputFormat(s->codec); + if (s->format) { + if ((ret = mediacodec_dec_parse_format(avctx, s)) < 0) { + av_log(avctx, AV_LOG_ERROR, + "Failed to configure context\n"); + goto fail; + } } }

1 0

lavc/h264dsp: R-V V loop_filter_chroma
by Rémi Denis-Courmont 01 Sep '24

01 Sep '24

ffmpeg | branch: master | Rémi Denis-Courmont <remi(a)remlab.net> | Tue Aug 20 21:59:00 2024 +0300| [7d1dda4892d9e3007c70f36bfb369d70413dfbdb] | committer: Rémi Denis-Courmont lavc/h264dsp: R-V V loop_filter_chroma T-Head C908: h264_v_loop_filter_chroma_8bpp_c: 137.4 h264_v_loop_filter_chroma_8bpp_rvv_i32: 54.2 > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7d1dda4892d9e3007… --- libavcodec/riscv/h264dsp_init.c | 15 +++++++ libavcodec/riscv/h264dsp_rvv.S | 99 ++++++++++++++++++++++++++++++++++------- 2 files changed, 99 insertions(+), 15 deletions(-) diff --git a/libavcodec/riscv/h264dsp_init.c b/libavcodec/riscv/h264dsp_init.c index b99c0124ee..9ffc9b0333 100644 --- a/libavcodec/riscv/h264dsp_init.c +++ b/libavcodec/riscv/h264dsp_init.c @@ -40,6 +40,13 @@ void ff_h264_h_loop_filter_luma_8_rvv(uint8_t *pix, ptrdiff_t stride, int alpha, int beta, int8_t *tc0); void ff_h264_h_loop_filter_luma_mbaff_8_rvv(uint8_t *pix, ptrdiff_t stride, int alpha, int beta, int8_t *tc0); +void ff_h264_v_loop_filter_chroma_8_rvv(uint8_t *pix, ptrdiff_t stride, + int alpha, int beta, int8_t *tc0); +void ff_h264_h_loop_filter_chroma_8_rvv(uint8_t *pix, ptrdiff_t stride, + int alpha, int beta, int8_t *tc0); +void ff_h264_h_loop_filter_chroma_mbaff_8_rvv(uint8_t *pix, ptrdiff_t stride, + int alpha, int beta, + int8_t *tc0); #define IDCT_DEPTH(depth) \ void ff_h264_idct_add_##depth##_rvv(uint8_t *d, int16_t *s, int stride); \ @@ -101,6 +108,14 @@ av_cold void ff_h264dsp_init_riscv(H264DSPContext *dsp, const int bit_depth, dsp->h264_h_loop_filter_luma = ff_h264_h_loop_filter_luma_8_rvv; dsp->h264_h_loop_filter_luma_mbaff = ff_h264_h_loop_filter_luma_mbaff_8_rvv; + dsp->h264_v_loop_filter_chroma = + ff_h264_v_loop_filter_chroma_8_rvv; + if (chroma_format_idc <= 1) { + dsp->h264_h_loop_filter_chroma = + ff_h264_h_loop_filter_chroma_8_rvv; + dsp->h264_h_loop_filter_chroma_mbaff = + ff_h264_h_loop_filter_chroma_mbaff_8_rvv; + } dsp->h264_idct_add = ff_h264_idct_add_8_rvv; dsp->h264_idct8_add = ff_h264_idct8_add_8_rvv; diff --git a/libavcodec/riscv/h264dsp_rvv.S b/libavcodec/riscv/h264dsp_rvv.S index 2149c4217f..422ac02222 100644 --- a/libavcodec/riscv/h264dsp_rvv.S +++ b/libavcodec/riscv/h264dsp_rvv.S @@ -191,61 +191,85 @@ const ff_h264_weight_funcs_8_rvv .endr endconst - .variant_cc ff_h264_loop_filter_luma_8_rvv -func ff_h264_loop_filter_luma_8_rvv, zve32x +.macro loop_filter type, inners, e8mul, e16mul + .variant_cc ff_h264_loop_filter_\type\()_8_rvv +func ff_h264_loop_filter_\type\()_8_rvv, zve32x # p2: v8, p1: v9, p0: v10, q0: v11, q1: v12, q2: v13 # alpha: a2, beta: a3, tc_orig: v6 csrwi vxrm, 0 +.ifc \type, luma vaaddu.vv v14, v10, v11 # (p0 + q0 + 1) / 2 +.endif vwsubu.vv v16, v9, v12 +.ifc \type, luma vwaddu.vv v18, v8, v14 vwaddu.vv v20, v13, v14 +.endif vnsra.wi v24, v16, 2 # (p1 - q1) / 4 +.ifc \type, luma vnsrl.wi v14, v18, 1 vnsrl.wi v15, v20, 1 vneg.v v5, v6 # -tc_orig +.endif vwsubu.vv v22, v11, v10 # q0 - p0 +.ifc \type, luma vwsubu.vv v18, v14, v9 vwsubu.vv v20, v15, v12 +.endif vwadd.wv v16, v22, v24 vmsge.vi v7, v6, 0 # tc_orig >= 0 +.ifc \type, luma vnclip.wi v14, v18, 0 vnclip.wi v15, v20, 0 +.endif vnclip.wi v16, v16, 1 # clip8((q0 - p0 + (p1 - q1) / 4 + 1) >> 1) +.ifc \type, luma vmin.vv v14, v14, v6 vmin.vv v15, v15, v6 vmax.vv v14, v14, v5 # clip(p2 + ... - p1, +/-tc_orig) vmax.vv v15, v15, v5 # clip(q2 + ... - q1, +/-tc_orig) +.endif vwsubu.vv v20, v10, v11 vwsubu.vv v24, v9, v10 vwsubu.vv v26, v10, v9 vwsubu.vv v28, v12, v11 vwsubu.vv v30, v11, v12 +.ifc \type, luma vwsubu.vv v0, v8, v10 vwsubu.vv v2, v10, v8 vwsubu.vv v4, v13, v11 vwsubu.vv v18, v11, v13 - vsetvli zero, zero, e16, m2, ta, ma +.endif + vsetvli zero, zero, e16, \e16mul, ta, ma vmax.vv v20, v20, v22 # abs(p0 - q0) vmax.vv v24, v24, v26 # abs(p1 - p0) vmax.vv v28, v28, v30 # abs(q1 - q0) +.ifc \type, luma vmax.vv v22, v0, v2 # abs(p2 - p0) vmax.vv v26, v4, v18 # abs(q2 - q0) +.endif vmslt.vx v1, v20, a2 vmslt.vx v2, v24, a3 vmand.mm v7, v7, v1 vmslt.vx v3, v28, a3 vmand.mm v7, v7, v2 +.ifc \type, luma vmslt.vx v0, v22, a3 vmand.mm v7, v7, v3 # whether to update p0 and q0 vmslt.vx v1, v26, a3 vmand.mm v0, v0, v7 - vsetvli zero, zero, e8, m1, ta, mu +.else + vmand.mm v0, v7, v3 # whether to update p0 and q0 +.endif + vsetvli zero, zero, e8, \e8mul, ta, mu +.ifc \type, luma vadd.vi v6, v6, 1, v0.t # tc++ vadd.vv v9, v9, v14, v0.t # p1' vmand.mm v0, v1, v7 vadd.vi v6, v6, 1, v0.t # tc++ vadd.vv v12, v12, v15, v0.t # q1' + vmmv.m v0, v7 +.endif vneg.v v5, v6 # -tc vmin.vv v16, v16, v6 vwcvtu.x.x.v v18, v10 @@ -253,43 +277,59 @@ func ff_h264_loop_filter_luma_8_rvv, zve32x vwcvtu.x.x.v v20, v11 vwadd.wv v18, v18, v16 vwsub.wv v20, v20, v16 - vmmv.m v0, v7 - vsetvli zero, zero, e16, m2, ta, ma + vsetvli zero, zero, e16, \e16mul, ta, ma vmax.vx v18, v18, zero vmax.vx v20, v20, zero - vsetvli zero, zero, e8, m1, ta, mu + vsetvli zero, zero, e8, \e8mul, ta, mu vnclipu.wi v10, v18, 0, v0.t # p0' vnclipu.wi v11, v20, 0, v0.t # q0' jr t0 endfunc -func ff_h264_v_loop_filter_luma_8_rvv, zve32x +func ff_h264_v_loop_filter_\type\()_8_rvv, zve32x lpad 0 +.ifc \type, luma vsetivli zero, 4, e32, m1, ta, ma vle8.v v4, (a4) li t0, 0x01010101 vzext.vf4 v6, v4 +.else + vsetivli zero, 4, e16, mf2, ta, ma + vle8.v v4, (a4) + li t0, 0x0101 + vzext.vf2 v6, v4 +.endif sub t3, a0, a1 vmul.vx v6, v6, t0 - vsetivli zero, 16, e8, m1, ta, ma + vsetivli zero, 4 * \inners, e8, \e8mul, ta, ma vle8.v v11, (a0) sub t2, t3, a1 vid.v v0 vle8.v v10, (t3) - sub t1, t2, a1 - vle8.v v9, (t2) add t5, a0, a1 - vle8.v v8, (t1) - add t6, t5, a1 + vle8.v v9, (t2) +.ifc \type, luma + sub t1, t2, a1 +.endif vle8.v v12, (t5) +.ifc \type, luma + add t6, t5, a1 + vle8.v v8, (t1) vle8.v v13, (t6) - jal t0, ff_h264_loop_filter_luma_8_rvv +.endif + jal t0, ff_h264_loop_filter_\type\()_8_rvv +.ifc \type, luma vse8.v v9, (t2) + vse8.v v12, (t5) +.endif vse8.v v10, (t3) vse8.v v11, (a0) - vse8.v v12, (t5) ret endfunc +.endm + +loop_filter luma, 4, m1, m2 +loop_filter chroma, 2, mf2, m1 func ff_h264_h_loop_filter_luma_8_rvv, zve32x lpad 0 @@ -322,3 +362,32 @@ func ff_h264_h_loop_filter_luma_mbaff_8_rvv, zve32x vssseg4e8.v v9, (a0), a1 ret endfunc + +func ff_h264_h_loop_filter_chroma_8_rvv, zve32x + lpad 0 + vsetivli zero, 4, e16, mf2, ta, ma + vle8.v v4, (a4) + li t0, 0x0101 + vzext.vf2 v6, v4 + addi a0, a0, -2 + vmul.vx v6, v6, t0 + vsetivli zero, 8, e8, mf2, ta, ma + vlsseg4e8.v v9, (a0), a1 + addi a0, a0, 1 + jal t0, ff_h264_loop_filter_chroma_8_rvv + vssseg2e8.v v10, (a0), a1 + ret +endfunc + +func ff_h264_h_loop_filter_chroma_mbaff_8_rvv, zve32x + lpad 0 + vsetivli zero, 4, e8, mf4, ta, ma + vle8.v v6, (a4) + addi a0, a0, -2 + vsetivli zero, 4, e8, mf2, ta, ma + vlsseg4e8.v v9, (a0), a1 + addi a0, a0, 1 + jal t0, ff_h264_loop_filter_chroma_8_rvv + vssseg2e8.v v10, (a0), a1 + ret +endfunc

1 0

lavc/h264dsp: do not write back unmodified rows in R-V V loop filter
by Rémi Denis-Courmont 01 Sep '24

01 Sep '24

ffmpeg | branch: master | Rémi Denis-Courmont <remi(a)remlab.net> | Wed Aug 21 22:55:07 2024 +0300| [3a5365683799ded2df974671928b545a153650ca] | committer: Rémi Denis-Courmont lavc/h264dsp: do not write back unmodified rows in R-V V loop filter > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3a5365683799ded2d… --- libavcodec/riscv/h264dsp_rvv.S | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/riscv/h264dsp_rvv.S b/libavcodec/riscv/h264dsp_rvv.S index 0d641008cb..2149c4217f 100644 --- a/libavcodec/riscv/h264dsp_rvv.S +++ b/libavcodec/riscv/h264dsp_rvv.S @@ -301,8 +301,9 @@ func ff_h264_h_loop_filter_luma_8_rvv, zve32x vmul.vx v6, v6, t0 vsetivli zero, 16, e8, m1, ta, ma vlsseg6e8.v v8, (a0), a1 + addi a0, a0, 1 jal t0, ff_h264_loop_filter_luma_8_rvv - vssseg6e8.v v8, (a0), a1 + vssseg4e8.v v9, (a0), a1 ret endfunc @@ -316,7 +317,8 @@ func ff_h264_h_loop_filter_luma_mbaff_8_rvv, zve32x vmul.vx v6, v6, t0 # tc_orig vsetivli zero, 8, e8, m1, ta, ma vlsseg6e8.v v8, (a0), a1 + addi a0, a0, 1 jal t0, ff_h264_loop_filter_luma_8_rvv - vssseg6e8.v v8, (a0), a1 + vssseg4e8.v v9, (a0), a1 ret endfunc

1 0

avfilter/formats: correct error message
by Gyan Doshi 01 Sep '24

01 Sep '24

ffmpeg | branch: master | Gyan Doshi <ffmpeg(a)gyani.pro> | Wed Aug 28 16:09:45 2024 +0530| [b5daaa1503fd149a8e6c4964266ceb93fd7d09cd] | committer: Gyan Doshi avfilter/formats: correct error message The check is for color space, not range. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b5daaa1503fd149a8… --- libavfilter/formats.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/formats.c b/libavfilter/formats.c index eabc3ec946..2b570b466e 100644 --- a/libavfilter/formats.c +++ b/libavfilter/formats.c @@ -977,7 +977,7 @@ int ff_formats_check_color_spaces(void *log, const AVFilterFormats *fmts) { for (int i = 0; fmts && i < fmts->nb_formats; i++) { if (fmts->formats[i] == AVCOL_SPC_RESERVED) { - av_log(log, AV_LOG_ERROR, "Invalid color range\n"); + av_log(log, AV_LOG_ERROR, "Invalid color space\n"); return AVERROR(EINVAL); } }

1 0

avformat/iamf_parser: use ffio_read_size() where useful
by James Almer 01 Sep '24

01 Sep '24

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Sat Aug 31 23:44:13 2024 -0300| [a4228a0ac151695b1763bc613b025cddd3e43488] | committer: James Almer avformat/iamf_parser: use ffio_read_size() where useful Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a4228a0ac151695b1… --- libavformat/iamf_parse.c | 40 ++++++++++++++++------------------------ 1 file changed, 16 insertions(+), 24 deletions(-) diff --git a/libavformat/iamf_parse.c b/libavformat/iamf_parse.c index 23170f504e..e0a138a07d 100644 --- a/libavformat/iamf_parse.c +++ b/libavformat/iamf_parse.c @@ -36,7 +36,7 @@ static int opus_decoder_config(IAMFCodecConfig *codec_config, AVIOContext *pb, int len) { - int left = len - avio_tell(pb); + int ret, left = len - avio_tell(pb); if (left < 11 || codec_config->audio_roll_distance >= 0) return AVERROR_INVALIDDATA; @@ -47,11 +47,11 @@ static int opus_decoder_config(IAMFCodecConfig *codec_config, AV_WB32A(codec_config->extradata, MKBETAG('O','p','u','s')); AV_WB32A(codec_config->extradata + 4, MKBETAG('H','e','a','d')); - codec_config->extradata_size = avio_read(pb, codec_config->extradata + 8, left); - if (codec_config->extradata_size < left) - return AVERROR_INVALIDDATA; + ret = ffio_read_size(pb, codec_config->extradata + 8, left); + if (ret < 0) + return ret; - codec_config->extradata_size += 8; + codec_config->extradata_size = left + 8; codec_config->sample_rate = 48000; return 0; @@ -117,7 +117,7 @@ static int aac_decoder_config(IAMFCodecConfig *codec_config, static int flac_decoder_config(IAMFCodecConfig *codec_config, AVIOContext *pb, int len) { - int left; + int ret, left; if (codec_config->audio_roll_distance) return AVERROR_INVALIDDATA; @@ -132,10 +132,11 @@ static int flac_decoder_config(IAMFCodecConfig *codec_config, if (!codec_config->extradata) return AVERROR(ENOMEM); - codec_config->extradata_size = avio_read(pb, codec_config->extradata, left); - if (codec_config->extradata_size < left) - return AVERROR_INVALIDDATA; + ret = ffio_read_size(pb, codec_config->extradata, left); + if (ret < 0) + return ret; + codec_config->extradata_size = left; codec_config->sample_rate = AV_RB24(codec_config->extradata + 10) >> 4; return 0; @@ -177,12 +178,9 @@ static int codec_config_obu(void *s, IAMFContext *c, AVIOContext *pb, int len) if (!buf) return AVERROR(ENOMEM); - ret = avio_read(pb, buf, len); - if (ret != len) { - if (ret >= 0) - ret = AVERROR_INVALIDDATA; + ret = ffio_read_size(pb, buf, len); + if (ret < 0) goto fail; - } ffio_init_context(&b, buf, len, 0, NULL, NULL, NULL, NULL); pbc = &b.pub; @@ -614,12 +612,9 @@ static int audio_element_obu(void *s, IAMFContext *c, AVIOContext *pb, int len) if (!buf) return AVERROR(ENOMEM); - ret = avio_read(pb, buf, len); - if (ret != len) { - if (ret >= 0) - ret = AVERROR_INVALIDDATA; + ret = ffio_read_size(pb, buf, len); + if (ret < 0) goto fail; - } ffio_init_context(&b, buf, len, 0, NULL, NULL, NULL, NULL); pbc = &b.pub; @@ -803,12 +798,9 @@ static int mix_presentation_obu(void *s, IAMFContext *c, AVIOContext *pb, int le if (!buf) return AVERROR(ENOMEM); - ret = avio_read(pb, buf, len); - if (ret != len) { - if (ret >= 0) - ret = AVERROR_INVALIDDATA; + ret = ffio_read_size(pb, buf, len); + if (ret < 0) goto fail; - } ffio_init_context(&b, buf, len, 0, NULL, NULL, NULL, NULL); pbc = &b.pub;

1 0

avformat/iamf_parse: Fix return of uninitialized value
by Marvin Scholz 01 Sep '24

01 Sep '24

ffmpeg | branch: release/7.0 | Marvin Scholz <epirat07(a)gmail.com> | Sat Aug 31 22:45:31 2024 +0200| [47844f58691feae90e3df7444c00631a94a65bba] | committer: James Almer avformat/iamf_parse: Fix return of uninitialized value The ret value here is not yet intialized so the return would return uninitialized data. What was probably meant to be checked here was the return value of ffio_read_size, which can return an error. Introduced in 38bcb3ba7b3424abd772c72f8bdf445d75285e88 Fixes: CID1618758 Signed-off-by: James Almer <jamrial(a)gmail.com> (cherry picked from commit b6a0eab528695c39a0c52889db0c1ce5dd6d99f3) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=47844f58691feae90… --- libavformat/iamf_parse.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/iamf_parse.c b/libavformat/iamf_parse.c index 7d635402cf..c8b58921b4 100644 --- a/libavformat/iamf_parse.c +++ b/libavformat/iamf_parse.c @@ -97,9 +97,10 @@ static int aac_decoder_config(IAMFCodecConfig *codec_config, if (!codec_config->extradata) return AVERROR(ENOMEM); - codec_config->extradata_size = ffio_read_size(pb, codec_config->extradata, left); + ret = ffio_read_size(pb, codec_config->extradata, left); if (ret < 0) return ret; + codec_config->extradata_size = left; memset(codec_config->extradata + codec_config->extradata_size, 0, AV_INPUT_BUFFER_PADDING_SIZE);

1 0

avformat/iamf_parse: Fix return of uninitialized value
by Marvin Scholz 01 Sep '24

01 Sep '24

ffmpeg | branch: master | Marvin Scholz <epirat07(a)gmail.com> | Sat Aug 31 22:45:31 2024 +0200| [b6a0eab528695c39a0c52889db0c1ce5dd6d99f3] | committer: James Almer avformat/iamf_parse: Fix return of uninitialized value The ret value here is not yet intialized so the return would return uninitialized data. What was probably meant to be checked here was the return value of ffio_read_size, which can return an error. Introduced in 38bcb3ba7b3424abd772c72f8bdf445d75285e88 Fixes: CID1618758 Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b6a0eab528695c39a… --- libavformat/iamf_parse.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/iamf_parse.c b/libavformat/iamf_parse.c index f13e76b147..23170f504e 100644 --- a/libavformat/iamf_parse.c +++ b/libavformat/iamf_parse.c @@ -97,9 +97,10 @@ static int aac_decoder_config(IAMFCodecConfig *codec_config, if (!codec_config->extradata) return AVERROR(ENOMEM); - codec_config->extradata_size = ffio_read_size(pb, codec_config->extradata, left); + ret = ffio_read_size(pb, codec_config->extradata, left); if (ret < 0) return ret; + codec_config->extradata_size = left; memset(codec_config->extradata + codec_config->extradata_size, 0, AV_INPUT_BUFFER_PADDING_SIZE);

1 0