From patchwork Mon Feb 13 05:23:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Converse X-Patchwork-Id: 2532 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp749597vsb; Sun, 12 Feb 2017 21:29:36 -0800 (PST) X-Received: by 10.28.17.20 with SMTP id 20mr37822613wmr.106.1486963776886; Sun, 12 Feb 2017 21:29:36 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id t141si4101724wme.100.2017.02.12.21.29.36; Sun, 12 Feb 2017 21:29:36 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EABC3689DA5; Mon, 13 Feb 2017 07:29:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f66.google.com (mail-pg0-f66.google.com [74.125.83.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 049F0689A37 for ; Mon, 13 Feb 2017 07:29:21 +0200 (EET) Received: by mail-pg0-f66.google.com with SMTP id v184so8849484pgv.1 for ; Sun, 12 Feb 2017 21:29:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=jj4LD+Wzt/Nzqp3lnm1c03lKwAyzxdcVQlW2xo9xhjg=; b=kSmcnEc8XBm8EX0J/9R8D4mhCewfujDQfRzNicpnK2NbuaCIpZGc6Z1YE49gNVXAlU IojtQolZ1MlNIhcgvNoFaeSyhtda3IHFPAinPg4el4CcKLfhJJddlfuXWh2sdQ7ezlGG oLK526n7xQU1HMyQypYv0NAyni3qBReaeGor4Smevysrfbuc28JsNFfAO4XyBnTBnzJQ 2phGDrguYWj0njj/QhLJqMxf+3kBM5k9tZqW6t5tqZsV/R6RLNbLMsc7KmnvHPg7mn6y 1OZHNS3FDnP3kfZhddS+C4Sjpuer5lyoDHTHIK5JtAkp+eetwsechASG6ambFzBM/M44 rGpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=jj4LD+Wzt/Nzqp3lnm1c03lKwAyzxdcVQlW2xo9xhjg=; b=uciQvfoFN9QETXixU+fsbid3CComiVpI8XWRU6aATywWgHC4spihi7Ne6Fm4OtgKAJ +xjf+2qWNGsn12Ip1D9a/HnutMBVQIXOyvmVFis+tuiX168dkErVW/Hj0UmW0D0WlWoB CbTcbidOJvGnkyQgq+aXJuN8Ix1Ckpl59oQsl1FliL4MTQZk46cuZyzwDcBIkBl2tcfA FaD0aImLKZLFSZ/CC2UzbjcX0GhnVH+nA3OVEv+HFihyjIYz0ZNkzGFMvRpwWuDdqB2L pK6KWUui4fg5YcDFdEafGzPH1Z3NsD+6r12droWSo+PpjHovV61sePopkxnx1jSErdWz i8PA== X-Gm-Message-State: AMke39lRlzBYpeJ+c0WtgREw5K4hTrV9q7Rnq0yA29zKoshNQjMgCrXgrUz2Jcv0zsnOQA== X-Received: by 10.98.73.130 with SMTP id r2mr23840193pfi.182.1486963395090; Sun, 12 Feb 2017 21:23:15 -0800 (PST) Received: from terok.mtv.corp.google.com ([172.22.116.121]) by smtp.gmail.com with ESMTPSA id r16sm17772774pfg.76.2017.02.12.21.23.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 12 Feb 2017 21:23:14 -0800 (PST) From: Alex Converse To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Feb 2017 21:23:06 -0800 Message-Id: <20170213052306.7160-1-alex.converse@gmail.com> X-Mailer: git-send-email 2.11.0.483.g087da7b7c-goog In-Reply-To: <20170209174039.8218-3-alex.converse@gmail.com> References: <20170209174039.8218-3-alex.converse@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 3/4] aacsbr: Associate SBR data with AAC elements on init 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 Cc: Alex Converse MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Quiets some log spam on pure upsampling mode. Fixes ticket 5163. --- libavcodec/aacdec_template.c | 2 +- libavcodec/aacsbr.h | 2 +- libavcodec/aacsbr_template.c | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c index e230c87733..d980ae0e22 100644 --- a/libavcodec/aacdec_template.c +++ b/libavcodec/aacdec_template.c @@ -134,7 +134,7 @@ static av_cold int che_configure(AACContext *ac, if (!ac->che[type][id]) { if (!(ac->che[type][id] = av_mallocz(sizeof(ChannelElement)))) return AVERROR(ENOMEM); - AAC_RENAME(ff_aac_sbr_ctx_init)(ac, &ac->che[type][id]->sbr); + AAC_RENAME(ff_aac_sbr_ctx_init)(ac, &ac->che[type][id]->sbr, type); } if (type != TYPE_CCE) { if (*channels >= MAX_CHANNELS - (type == TYPE_CPE || (type == TYPE_SCE && ac->oc[1].m4ac.ps == 1))) { diff --git a/libavcodec/aacsbr.h b/libavcodec/aacsbr.h index 88c4d8a916..dd8b66c7bb 100644 --- a/libavcodec/aacsbr.h +++ b/libavcodec/aacsbr.h @@ -81,7 +81,7 @@ static const int8_t vlc_sbr_lav[10] = /** Initialize SBR. */ void AAC_RENAME(ff_aac_sbr_init)(void); /** Initialize one SBR context. */ -void AAC_RENAME(ff_aac_sbr_ctx_init)(AACContext *ac, SpectralBandReplication *sbr); +void AAC_RENAME(ff_aac_sbr_ctx_init)(AACContext *ac, SpectralBandReplication *sbr, int id_aac); /** Close one SBR context. */ void AAC_RENAME(ff_aac_sbr_ctx_close)(SpectralBandReplication *sbr); /** Decode one SBR element. */ diff --git a/libavcodec/aacsbr_template.c b/libavcodec/aacsbr_template.c index 511054276a..f8aa4854df 100644 --- a/libavcodec/aacsbr_template.c +++ b/libavcodec/aacsbr_template.c @@ -81,11 +81,12 @@ static void sbr_turnoff(SpectralBandReplication *sbr) { memset(&sbr->spectrum_params, -1, sizeof(SpectrumParameters)); } -av_cold void AAC_RENAME(ff_aac_sbr_ctx_init)(AACContext *ac, SpectralBandReplication *sbr) +av_cold void AAC_RENAME(ff_aac_sbr_ctx_init)(AACContext *ac, SpectralBandReplication *sbr, int id_aac) { if(sbr->mdct.mdct_bits) return; sbr->kx[0] = sbr->kx[1]; + sbr->id_aac = id_aac; sbr_turnoff(sbr); sbr->data[0].synthesis_filterbank_samples_offset = SBR_SYNTHESIS_BUF_SIZE - (1280 - 128); sbr->data[1].synthesis_filterbank_samples_offset = SBR_SYNTHESIS_BUF_SIZE - (1280 - 128);