From patchwork Sat Sep 21 23:27:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 15221 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 AA9514479A0 for ; Sun, 22 Sep 2019 02:28:00 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9411768AAE6; Sun, 22 Sep 2019 02:28:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f194.google.com (mail-qt1-f194.google.com [209.85.160.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5ACDE68AAC2 for ; Sun, 22 Sep 2019 02:27:52 +0300 (EEST) Received: by mail-qt1-f194.google.com with SMTP id o12so13007723qtf.3 for ; Sat, 21 Sep 2019 16:27:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=6pT0+Mfu+gc5O+2bhH29aw9wup2zMdYxUGoVf9DHXPA=; b=KnwHfG6gMX7/FeqZsNy8Q+tuf/RpNAmTWF5o2vjL4NhtOn4fvlY+Xnb9jpAnHRc3rH kTIZCRl2yyoS1IpRDY6YLZCH74gQFw7kMev91gLxExYjmZN0BlCYc+AjlDB601Ro2CJv AcAkPsXRMPTpIbPt/yiAaE6u8Nfbf3brfH/2dEzF7uAv1b47Hqa7nCNy/m+6/ilI40Zd kepBUx0m20D7xsqY/mml2eJKg7eZ2P/gpwWIfVhZL3ARNVKk29Y8i8Ej7AjTFVhTRUL1 UFVFtm7F9j3h+MAdiK6sNO1ogk+kKaD+5nqMjrjCwnOdKcmRSpQGKXmFTxI1ewJia9Vr j/wg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=6pT0+Mfu+gc5O+2bhH29aw9wup2zMdYxUGoVf9DHXPA=; b=CqwarXCzhzKi717cXMxv3YSYeN6TW2wGPFThZP+yMFNeBCyMbnbRpSY5i7M8pYTLuC ltPtufdYQqGQgoFc4J34OtaCcOM4ivwpKfNxwJ03Pui9sY/pU/kTasthPJofvBvhLNkv OEkNIw1SG1XMjvE+9QKKV8D9oYRvwa9yu0Shf6L0lL9i98BYHOnMsPq6LmKPIojcimC4 Aph0Tu1fGuImlkB/Z0c7SDsoFQ6s3crtN471OWHSGXsEDy9q8CRmp8GfktrTv2fTqQ/A 4DFWV5ikA6FzeigL5j0yEkO8mPfFMC69Bo6+X6Kz8fYmKQpqNJNr1fk1pqZ/EKPBzQoJ lx/g== X-Gm-Message-State: APjAAAWvvTCQNORJZkVj5QvyVmZMscJlZaft0qhR2siFqUHXWuIXB5Km FwVS2lIkg8bFZP+8Pi/VgLQtLCBD X-Google-Smtp-Source: APXvYqzB77IDYdGgCWc4aQi7Ybj3bCP/1+/CWmKVxqfJdTS5EYSJkUqpF7m/0nlMn1FiQ+ys1qM9kQ== X-Received: by 2002:ac8:710b:: with SMTP id z11mr10654760qto.372.1569108471176; Sat, 21 Sep 2019 16:27:51 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.38]) by smtp.gmail.com with ESMTPSA id y26sm3265537qtk.22.2019.09.21.16.27.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Sep 2019 16:27:50 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 21 Sep 2019 20:27:12 -0300 Message-Id: <20190921232712.1345-3-jamrial@gmail.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190921232712.1345-1-jamrial@gmail.com> References: <20190921232712.1345-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] avformat: use avpriv_mpeg4audio_get_config2() 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" Signed-off-by: James Almer --- libavformat/adtsenc.c | 2 +- libavformat/isom.c | 4 ++-- libavformat/latmenc.c | 2 +- libavformat/matroskaenc.c | 3 +-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/libavformat/adtsenc.c b/libavformat/adtsenc.c index 3c2840c6ab..d937e2bea9 100644 --- a/libavformat/adtsenc.c +++ b/libavformat/adtsenc.c @@ -53,7 +53,7 @@ static int adts_decode_extradata(AVFormatContext *s, ADTSContext *adts, const ui int off; init_get_bits(&gb, buf, size * 8); - off = avpriv_mpeg4audio_get_config(&m4ac, buf, size * 8, 1); + off = avpriv_mpeg4audio_get_config2(&m4ac, buf, size, 1, s); if (off < 0) return off; skip_bits_long(&gb, off); diff --git a/libavformat/isom.c b/libavformat/isom.c index fa2e318099..edd0d81063 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -547,8 +547,8 @@ FF_ENABLE_DEPRECATION_WARNINGS return ret; if (st->codecpar->codec_id == AV_CODEC_ID_AAC) { MPEG4AudioConfig cfg = {0}; - ret = avpriv_mpeg4audio_get_config(&cfg, st->codecpar->extradata, - st->codecpar->extradata_size * 8, 1); + ret = avpriv_mpeg4audio_get_config2(&cfg, st->codecpar->extradata, + st->codecpar->extradata_size, 1, fc); if (ret < 0) return ret; st->codecpar->channels = cfg.channels; diff --git a/libavformat/latmenc.c b/libavformat/latmenc.c index 1b16d752b6..db867ebf1a 100644 --- a/libavformat/latmenc.c +++ b/libavformat/latmenc.c @@ -62,7 +62,7 @@ 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; } - ctx->off = avpriv_mpeg4audio_get_config(&m4ac, buf, size * 8, 1); + ctx->off = avpriv_mpeg4audio_get_config2(&m4ac, buf, size, 1, s); if (ctx->off < 0) return ctx->off; diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index cef504fa05..a64ffdb690 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -717,8 +717,7 @@ static int get_aac_sample_rates(AVFormatContext *s, uint8_t *extradata, int extr MPEG4AudioConfig mp4ac; int ret; - ret = avpriv_mpeg4audio_get_config(&mp4ac, extradata, - extradata_size * 8, 1); + ret = avpriv_mpeg4audio_get_config2(&mp4ac, extradata, extradata_size, 1, s); /* 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.