From patchwork Sat Sep 21 23:27:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 15220 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 A48044479A0 for ; Sun, 22 Sep 2019 02:27:58 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 86A8068AAD7; Sun, 22 Sep 2019 02:27:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f193.google.com (mail-qk1-f193.google.com [209.85.222.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 697D36899F2 for ; Sun, 22 Sep 2019 02:27:51 +0300 (EEST) Received: by mail-qk1-f193.google.com with SMTP id w2so11398720qkf.2 for ; Sat, 21 Sep 2019 16:27:51 -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=wes9KMMiuOY6YB9kEl90VuaWboHetr+UPlayz13RzzQ=; b=D4c1+PZcElq31qmpIvCzs9v2dhsODfeRXreL5Ksoj/5/BxnohzuVxoKVbVCUkcQX/j 6x2T1PhNRAbRNLhAdipvy9/Bn6yB+k+FcQgXcnRJXMJzW8BrwAAlSRsuhHJhmbhw6By+ Emz7oFP5aDbIG4lfstA5G52ldTdVA7MOjQQEQSI0unB2odsdOQyj17XrmkwrA2oMuq4I ytvNuThBBdaryhLoVF8WkRreK7Jp8i0F1qW9sAxtpkmaFoB18xnrFHXZQA8vVfu7DVkm RXr1k3sTzj0uSFecJGSWlM8MmczVMg8Htb1hCwU+hKTq3cXl1bixXmJzE1ztANVkeXzH lgZw== 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=wes9KMMiuOY6YB9kEl90VuaWboHetr+UPlayz13RzzQ=; b=R+osw2wAIZziyGnPw0HYOoYpCgap1JNY9o18e2PLzPGEF/F4VS8R7jooxzHGEFadzO aVePahZzwx9Baf70OzIcsD8dS7XZZ9siN5ZchAziqfOOyNPbqvB5fxNoS0GpQRfVjgkI mw4zdn7k582K9O/XimOtdwFNJhOysNdC/xYtTVuTZaz5mDtSQfTqTuk5GhEvCD/SbV4O KR8PgjSMJAUJSwXQ5JQdrIJveWnkx5KmvkUkTj1iZ9FO5ZD4GIpYjplaKTGP3GK3TnrR lR/UHqLrS0hcOnl045nGrOJIw0EnRBqYu9S51Kool2jgFFxO+hnKQjLq2NXEGO+vxE2H u98g== X-Gm-Message-State: APjAAAX+Kb5FHGKc9lbpHKqC7wP41sEi3PYheGJjMVxYSIIJg2vKcQkK dXY9PGiyqKf/x3Ff/ssk7XBtKxRZ X-Google-Smtp-Source: APXvYqwdpKkXYHwQpQHPV0Fb6K93NV0p25LYYL0lX9td8RJUg95IYYkT9OsoQXF4auH7Y15vemLoYw== X-Received: by 2002:ae9:ee17:: with SMTP id i23mr10139004qkg.179.1569108470237; Sat, 21 Sep 2019 16:27:50 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.38]) by smtp.gmail.com with ESMTPSA id y26sm3265537qtk.22.2019.09.21.16.27.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Sep 2019 16:27:49 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 21 Sep 2019 20:27:11 -0300 Message-Id: <20190921232712.1345-2-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 2/3] avcodec: 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 --- libavcodec/aac_adtstoasc_bsf.c | 4 ++-- libavcodec/alsdec.c | 4 ++-- libavcodec/mpegaudiodec_template.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/aac_adtstoasc_bsf.c b/libavcodec/aac_adtstoasc_bsf.c index 6541b1189c..e378296950 100644 --- a/libavcodec/aac_adtstoasc_bsf.c +++ b/libavcodec/aac_adtstoasc_bsf.c @@ -134,8 +134,8 @@ static int aac_adtstoasc_init(AVBSFContext *ctx) /* Validate the extradata if the stream is already MPEG-4 AudioSpecificConfig */ if (ctx->par_in->extradata) { MPEG4AudioConfig mp4ac; - int ret = avpriv_mpeg4audio_get_config(&mp4ac, ctx->par_in->extradata, - ctx->par_in->extradata_size * 8, 1); + int ret = avpriv_mpeg4audio_get_config2(&mp4ac, ctx->par_in->extradata, + ctx->par_in->extradata_size, 1, ctx); if (ret < 0) { av_log(ctx, AV_LOG_ERROR, "Error parsing AudioSpecificConfig extradata!\n"); return ret; diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c index a53c170d18..b91c690005 100644 --- a/libavcodec/alsdec.c +++ b/libavcodec/alsdec.c @@ -302,8 +302,8 @@ static av_cold int read_specific_config(ALSDecContext *ctx) if ((ret = init_get_bits8(&gb, avctx->extradata, avctx->extradata_size)) < 0) return ret; - config_offset = avpriv_mpeg4audio_get_config(&m4ac, avctx->extradata, - avctx->extradata_size * 8, 1); + config_offset = avpriv_mpeg4audio_get_config2(&m4ac, avctx->extradata, + avctx->extradata_size, 1, avctx); if (config_offset < 0) return AVERROR_INVALIDDATA; diff --git a/libavcodec/mpegaudiodec_template.c b/libavcodec/mpegaudiodec_template.c index 9cce88e263..3f1674e827 100644 --- a/libavcodec/mpegaudiodec_template.c +++ b/libavcodec/mpegaudiodec_template.c @@ -1851,8 +1851,8 @@ static av_cold int decode_init_mp3on4(AVCodecContext * avctx) return AVERROR_INVALIDDATA; } - avpriv_mpeg4audio_get_config(&cfg, avctx->extradata, - avctx->extradata_size * 8, 1); + avpriv_mpeg4audio_get_config2(&cfg, avctx->extradata, + avctx->extradata_size, 1, avctx); if (!cfg.chan_config || cfg.chan_config > 7) { av_log(avctx, AV_LOG_ERROR, "Invalid channel config number.\n"); return AVERROR_INVALIDDATA;