From patchwork Sat Sep 21 15:52:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 15210 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 67DF5441B31 for ; Sat, 21 Sep 2019 18:53:20 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 388B868A955; Sat, 21 Sep 2019 18:53:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f195.google.com (mail-qt1-f195.google.com [209.85.160.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7BFDE68A661 for ; Sat, 21 Sep 2019 18:53:13 +0300 (EEST) Received: by mail-qt1-f195.google.com with SMTP id m15so12244074qtq.2 for ; Sat, 21 Sep 2019 08:53:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=4dXdvFxH9a/esXUzlRgAhZnNf4v1IiBuWab7YI5lKFk=; b=MEMZFJO+4ENzC/Of8pTiBi0sDr/NDqu8ovEePYq/Rbw5RKHJygUe1e7pxeImUH0RnZ 5WkwzJL0rhOaHysU8OPeXOtWotFXFh8dj6PGcWOWU0EHeytmhacZ6r9MFyqUlX3KU7pI S5pg9TLqFDZm/KYqISTc5Z3fm5PPCI+LhYruv/edXDIxUpyrDxvKEYHmqxZ2AbPYiZj/ kzVEZibQrDApfQ/LmENzu9cjkSt3uOdlqRD8AxrOr2CH5E0SYufJlAf9k3FSt1e7vjxz ky8aGR8K0oLhQ/iA0z7pmJnd47eFPKvsRh2myB10tn+EtdKqF4qlILn6a2OrTnit1WVO 1TRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=4dXdvFxH9a/esXUzlRgAhZnNf4v1IiBuWab7YI5lKFk=; b=FFKSdJPmirai3mJAaNcXcw6ndmw+oQsuNKFJqj+3Vb3d9cYyq62upSv+drmtC5xQvV aPn74rpfPQ5z7RjKqTh2pWGSG5UODGxw3YTf61hL+pqE3g/KWsTp7t6l6OW4W84gx5pL tiebGl+QFyxoBHiGFjgRSlBSdeW2skzDL7FWnL/SzsisQ7I3jm4WyPfK+fE4RTMqzkpK 1WDlTHl1qiQwcFeJBeYb3n7hN2z/MSWTUMrVcMsrbiWSI2oqZPInhmPk6bdsK6eXs2Tp VasAjEhC8RmVVu3NFmSLhKZtMC3hzxEt4qXfsdwqTTJzxjxdIGhX3/DL8UY6tFZ+0TwH Aiug== X-Gm-Message-State: APjAAAUQmNa5Pwcvs4izxFU5zXqYf+wuoal97C2l9tG2NQIzXzSkzU2Y 3oEitCV48ksK3MRfJzB1M7gS9JC4 X-Google-Smtp-Source: APXvYqzWc1dwtFP5h+lyJHhlMaJ28hDSNFBY2lgFh/1Ky1zNYhEalgbf23QggrAykGvSud6KCS50lA== X-Received: by 2002:a0c:fb07:: with SMTP id c7mr17146734qvp.29.1569081191978; Sat, 21 Sep 2019 08:53:11 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.38]) by smtp.gmail.com with ESMTPSA id 56sm4269650qty.15.2019.09.21.08.53.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Sep 2019 08:53:11 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 21 Sep 2019 12:52:51 -0300 Message-Id: <20190921155253.1004-1-jamrial@gmail.com> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/mpeg4audio: add a logging context parameter to avpriv_mpeg4audio_get_config() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This is an ABI change, so it's scheduled for the next bump. Signed-off-by: James Almer --- libavcodec/aacdec_template.c | 2 +- libavcodec/alsdec.c | 4 ++++ libavcodec/mpeg4audio.c | 11 +++++++++-- libavcodec/mpeg4audio.h | 8 +++++++- libavcodec/mpegaudiodec_template.c | 4 ++++ libavformat/adtsenc.c | 4 ++++ libavformat/isom.c | 4 ++++ libavformat/latmenc.c | 4 ++++ libavformat/matroskaenc.c | 4 ++++ 9 files changed, 41 insertions(+), 4 deletions(-) diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c index 6e086e00df..8726c8b828 100644 --- a/libavcodec/aacdec_template.c +++ b/libavcodec/aacdec_template.c @@ -975,7 +975,7 @@ static int decode_audio_specific_config_gb(AACContext *ac, int i, ret; GetBitContext gbc = *gb; - if ((i = ff_mpeg4audio_get_config_gb(m4ac, &gbc, sync_extension)) < 0) + if ((i = ff_mpeg4audio_get_config_gb(m4ac, &gbc, sync_extension, avctx)) < 0) return AVERROR_INVALIDDATA; if (m4ac->sampling_index > 12) { diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c index a53c170d18..767d1be7d3 100644 --- a/libavcodec/alsdec.c +++ b/libavcodec/alsdec.c @@ -303,7 +303,11 @@ static av_cold int read_specific_config(ALSDecContext *ctx) return ret; config_offset = avpriv_mpeg4audio_get_config(&m4ac, avctx->extradata, +#if LIBAVCODEC_VERSION_MAJOR < 59 avctx->extradata_size * 8, 1); +#else + avctx->extradata_size * 8, 1, avctx); +#endif if (config_offset < 0) return AVERROR_INVALIDDATA; diff --git a/libavcodec/mpeg4audio.c b/libavcodec/mpeg4audio.c index 219714752f..43c19c4188 100644 --- a/libavcodec/mpeg4audio.c +++ b/libavcodec/mpeg4audio.c @@ -84,7 +84,7 @@ static inline int get_sample_rate(GetBitContext *gb, int *index) } int ff_mpeg4audio_get_config_gb(MPEG4AudioConfig *c, GetBitContext *gb, - int sync_extension) + int sync_extension, void *logctx) { int specific_config_bitindex, ret; int start_bit_index = get_bits_count(gb); @@ -152,9 +152,16 @@ int ff_mpeg4audio_get_config_gb(MPEG4AudioConfig *c, GetBitContext *gb, return specific_config_bitindex - start_bit_index; } +#if LIBAVCODEC_VERSION_MAJOR < 59 int avpriv_mpeg4audio_get_config(MPEG4AudioConfig *c, const uint8_t *buf, int bit_size, int sync_extension) { + void *logctx = NULL; +#else +int avpriv_mpeg4audio_get_config(MPEG4AudioConfig *c, const uint8_t *buf, + int bit_size, int sync_extension, void *logctx) +{ +#endif GetBitContext gb; int ret; @@ -165,5 +172,5 @@ int avpriv_mpeg4audio_get_config(MPEG4AudioConfig *c, const uint8_t *buf, if (ret < 0) return ret; - return ff_mpeg4audio_get_config_gb(c, &gb, sync_extension); + return ff_mpeg4audio_get_config_gb(c, &gb, sync_extension, logctx); } diff --git a/libavcodec/mpeg4audio.h b/libavcodec/mpeg4audio.h index b9cea8af17..ee6c8da233 100644 --- a/libavcodec/mpeg4audio.h +++ b/libavcodec/mpeg4audio.h @@ -53,10 +53,11 @@ extern const uint8_t ff_mpeg4audio_channels[8]; * @param[in] c MPEG4AudioConfig structure to fill. * @param[in] gb Extradata from container. * @param[in] sync_extension look for a sync extension after config if true. + * @param[in] logctx opaque struct starting with an AVClass element, used for logging. * @return On error -1 is returned, on success AudioSpecificConfig bit index in extradata. */ int ff_mpeg4audio_get_config_gb(MPEG4AudioConfig *c, GetBitContext *gb, - int sync_extension); + int sync_extension, void *logctx); /** * Parse MPEG-4 systems extradata from a raw buffer to retrieve audio configuration. @@ -64,10 +65,15 @@ int ff_mpeg4audio_get_config_gb(MPEG4AudioConfig *c, GetBitContext *gb, * @param[in] buf Extradata from container. * @param[in] bit_size Extradata size in bits. * @param[in] sync_extension look for a sync extension after config if true. + * @param[in] logctx opaque struct starting with an AVClass element, used for logging. * @return On error -1 is returned, on success AudioSpecificConfig bit index in extradata. */ int avpriv_mpeg4audio_get_config(MPEG4AudioConfig *c, const uint8_t *buf, +#if LIBAVCODEC_VERSION_MAJOR < 59 int bit_size, int sync_extension); +#else + int bit_size, int sync_extension, void *logctx); +#endif enum AudioObjectType { AOT_NULL, diff --git a/libavcodec/mpegaudiodec_template.c b/libavcodec/mpegaudiodec_template.c index 9cce88e263..a89d7e408f 100644 --- a/libavcodec/mpegaudiodec_template.c +++ b/libavcodec/mpegaudiodec_template.c @@ -1852,7 +1852,11 @@ static av_cold int decode_init_mp3on4(AVCodecContext * avctx) } avpriv_mpeg4audio_get_config(&cfg, avctx->extradata, +#if LIBAVCODEC_VERSION_MAJOR < 59 avctx->extradata_size * 8, 1); +#else + avctx->extradata_size * 8, 1, avctx); +#endif if (!cfg.chan_config || cfg.chan_config > 7) { av_log(avctx, AV_LOG_ERROR, "Invalid channel config number.\n"); return AVERROR_INVALIDDATA; diff --git a/libavformat/adtsenc.c b/libavformat/adtsenc.c index 3c2840c6ab..48871efe1a 100644 --- a/libavformat/adtsenc.c +++ b/libavformat/adtsenc.c @@ -53,7 +53,11 @@ static int adts_decode_extradata(AVFormatContext *s, ADTSContext *adts, const ui int off; init_get_bits(&gb, buf, size * 8); +#if LIBAVCODEC_VERSION_MAJOR < 59 off = avpriv_mpeg4audio_get_config(&m4ac, buf, size * 8, 1); +#else + off = avpriv_mpeg4audio_get_config(&m4ac, buf, size * 8, 1, s); +#endif if (off < 0) return off; skip_bits_long(&gb, off); diff --git a/libavformat/isom.c b/libavformat/isom.c index fa2e318099..6d5e9b56d0 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -548,7 +548,11 @@ FF_ENABLE_DEPRECATION_WARNINGS if (st->codecpar->codec_id == AV_CODEC_ID_AAC) { MPEG4AudioConfig cfg = {0}; ret = avpriv_mpeg4audio_get_config(&cfg, st->codecpar->extradata, +#if LIBAVCODEC_VERSION_MAJOR < 59 st->codecpar->extradata_size * 8, 1); +#else + st->codecpar->extradata_size * 8, 1, fc); +#endif if (ret < 0) return ret; st->codecpar->channels = cfg.channels; diff --git a/libavformat/latmenc.c b/libavformat/latmenc.c index 1b16d752b6..d33e39074c 100644 --- a/libavformat/latmenc.c +++ b/libavformat/latmenc.c @@ -62,7 +62,11 @@ static int latm_decode_extradata(AVFormatContext *s, uint8_t *buf, int size) av_log(s, AV_LOG_ERROR, "Extradata is larger than currently supported.\n"); return AVERROR_INVALIDDATA; } +#if LIBAVCODEC_VERSION_MAJOR < 59 ctx->off = avpriv_mpeg4audio_get_config(&m4ac, buf, size * 8, 1); +#else + ctx->off = avpriv_mpeg4audio_get_config(&m4ac, buf, size * 8, 1, s); +#endif if (ctx->off < 0) return ctx->off; diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index cef504fa05..475578c6ba 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -718,7 +718,11 @@ static int get_aac_sample_rates(AVFormatContext *s, uint8_t *extradata, int extr int ret; ret = avpriv_mpeg4audio_get_config(&mp4ac, extradata, +#if LIBAVCODEC_VERSION_MAJOR < 59 extradata_size * 8, 1); +#else + extradata_size * 8, 1, s); +#endif /* Don't abort if the failure is because of missing extradata. Assume in that * case a bitstream filter will provide the muxer with the extradata in the * first packet.