From patchwork Thu Feb 9 17:40:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Converse X-Patchwork-Id: 2465 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp99078vsb; Thu, 9 Feb 2017 09:41:25 -0800 (PST) X-Received: by 10.28.127.13 with SMTP id a13mr3938805wmd.96.1486662085180; Thu, 09 Feb 2017 09:41:25 -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 j133si6921048wma.62.2017.02.09.09.41.22; Thu, 09 Feb 2017 09:41:25 -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 CF314689D6A; Thu, 9 Feb 2017 19:41:16 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f196.google.com (mail-pf0-f196.google.com [209.85.192.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 01D7A689D06 for ; Thu, 9 Feb 2017 19:41:09 +0200 (EET) Received: by mail-pf0-f196.google.com with SMTP id f144so628994pfa.2 for ; Thu, 09 Feb 2017 09:41:13 -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=SslPlrmC2zUL9jEzfg4nZuKty4TuWScnRvf9gCeATE4=; b=Q72n5ID3NRpqPP3ifV2UUXdSUuLjRpEzbi9mNam/ehwbjTdTWhAQBIYXImeAFxMbM5 6GNS31gAeob7p7HXVdR6d2ZFG70CaGEgf1wrpLd1E96oKKoKJQXI2eZXXNT02FTSxLw9 pDTD99z+43zb2iBR4+WXuINyed7IiTbKXonsx2i6Xc51N0VRAFAmuVoNrLP6IaUYyZjv ZpABAHOq1e3+6Vf6MSiKJzZ/dDiTJlCHEc8ZwD9qBQvqpIf++hXAr7NKyqvlrPKA0O55 h5+QlwZGrAiz61ETi5guhFXisbcIPR8o0DzixWEnZmRsu3QsYw8vhDTEfV0xXGjEygQE g0nQ== 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=SslPlrmC2zUL9jEzfg4nZuKty4TuWScnRvf9gCeATE4=; b=NzkLmMZE/f9L0/dZuwQqNsg8y1sxFXRgasyFEwdnF5g+jnPDC65edUkitdMzTWLW3B +m2sKKFnuNh9zIlLjD/VYml82CHEWyNBwp76FHRmT3ufgO5cqvVJJoFMB+fBsM0eFPl6 i2aYem1JMMGc7GzOBGGwMMKCjCksEu4a6uErnMXIvvYe1b/aptBpTdtJsdibIBlUUKWf yl29q9zcE3jnUKuLAG53XuKD6V5h4KJmezkdhFq1LLtjiN6Qyz9dED6ivv8zxTA4xthw JqLGcuUWSZxdy99Hqcc+iUIAmNBVwJsjswmxSC5ZtZt638trSTMUIfmXs178z4WflMMC tZsQ== X-Gm-Message-State: AMke39m3NrCVgWRuzUK8SliYs/jv/nulsaCEgyKcXw5GtbC/2fBP2KIKuXZAXNol5Eur/w== X-Received: by 10.98.139.22 with SMTP id j22mr4974019pfe.115.1486662072136; Thu, 09 Feb 2017 09:41:12 -0800 (PST) Received: from terok.mtv.corp.google.com ([172.22.116.121]) by smtp.gmail.com with ESMTPSA id g70sm30488524pfb.50.2017.02.09.09.41.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 09 Feb 2017 09:41:11 -0800 (PST) From: Alex Converse To: ffmpeg-devel@ffmpeg.org Date: Thu, 9 Feb 2017 09:40:38 -0800 Message-Id: <20170209174039.8218-3-alex.converse@gmail.com> X-Mailer: git-send-email 2.11.0.483.g087da7b7c-goog In-Reply-To: <20170209174039.8218-1-alex.converse@gmail.com> References: <20170209174039.8218-1-alex.converse@gmail.com> Subject: [FFmpeg-devel] [PATCH 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. --- 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 2a06f82efe..6654416e69 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);