From patchwork Thu May 30 02:37:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lynne X-Patchwork-Id: 49385 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:5c1:0:b0:460:55fa:d5ed with SMTP id 184csp31907vqf; Wed, 29 May 2024 19:40:24 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV2ZyF9nZkgp6ttiUZGolrgNjdy7m11gQHsZkoF7cxF31Rl5MzVj2THJ4b+4/PQi3bc14sR+pWwUgW/1blF8BgVz00wbFsIzAwuLw== X-Google-Smtp-Source: AGHT+IFLM9ulsuvH/mE3Clec8cn40dYSlbiO+6MuvFN8KjF5Dn/Adjx0mm/FrjKb7fQeSjadXI2T X-Received: by 2002:a17:906:5946:b0:a59:c9f3:837d with SMTP id a640c23a62f3a-a65f0bd78e2mr44073366b.30.1717036824382; Wed, 29 May 2024 19:40:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1717036824; cv=none; d=google.com; s=arc-20160816; b=KNdw4d30pNGPSDazODPCtmAUIcH41sWTdl7pGO+ND4XctSACm6KWtUMOCrXJDylQlQ f6dXCAwwxyiTZQviuJfxMFZ5jF67UBIMjKmVbNZZ1CODNYBHftOs9rnKg30CP6pr2C8M r2CKJfKa9KYzi7hmn5LM9Am4TMBoEV1kkWBgiPm/T6bl3uZ9ZRcLyk+pdy3GqiCigOea M7c/YVPzI1EDRo0H6PsbaYtjpQf0r7cTLFB/ALQ9egi3RHjSDHDRgeNs3Z1CqfBP2cSk ETQ+vuREGVz6J65CCOgffDJQ52FLl2df3D4OoTo6RgSoXjOqcOpLFpn9++MRwSt43eDB tFOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to:from :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:delivered-to; bh=QQmAHsnoLLCgLCZry+Qec3AOWyLdHaVMlZrQ1YVa51k=; fh=nenT92/WZoU6unXd3J6UhGUdod4piddKfVtctNBOh6k=; b=T7nsaO4cu2rKMD9zAoux5eDXb4KaXcBfYxjW7BT/P9OPH1FaiYpCzuslIqqybd5rP9 wvFLvFi1Vw037ueqcbUZypTJSuYmcF+SBXQrLGOCSdWY47oS/RZInvO/oN+3r3pe0AKL z+Lk1IfJmnTcd3Zp9fI+hLM6SUxjfXNn9t9xUwD31m0Vya0a1Ypf/0YSlFlznnLRkJsF 92ivhkv4sdq0OLZCdzyFI0ZBn95bfr/k1D9AoaI6GeSafFAw32mId6bTE3K3EYT6HQBl 5KcYD65js3RE/C8HHErRHkf5chFdT5SlFOLFo0cEUCVdVSboXRFGDBwkJc/7/fdp8QMs nx7A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a62f56e8941si425785966b.566.2024.05.29.19.40.24; Wed, 29 May 2024 19:40:24 -0700 (PDT) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9A19368D590; Thu, 30 May 2024 05:39:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vidala.lynne.ee (vidala.pars.ee [116.203.72.101]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C8C2F68D536 for ; Thu, 30 May 2024 05:39:42 +0300 (EEST) To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 May 2024 04:37:12 +0200 Message-ID: <20240530023927.1205442-5-dev@lynne.ee> X-Mailer: git-send-email 2.43.0.381.gb435a96ce8 In-Reply-To: <20240530023927.1205442-1-dev@lynne.ee> References: <20240530023927.1205442-1-dev@lynne.ee> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 04/10] aacdec: expose decode_tns X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Lynne via ffmpeg-devel From: Lynne Reply-To: FFmpeg development discussions and patches Cc: Lynne Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: /W/wqdgxR7yD USAC has the same syntax, with one minor change we can check for. --- libavcodec/aac/aacdec.c | 6 +++--- libavcodec/aac/aacdec.h | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libavcodec/aac/aacdec.c b/libavcodec/aac/aacdec.c index 40554ff9e4..a7e5b2a369 100644 --- a/libavcodec/aac/aacdec.c +++ b/libavcodec/aac/aacdec.c @@ -1542,7 +1542,7 @@ static int decode_pulses(Pulse *pulse, GetBitContext *gb, * * @return Returns error status. 0 - OK, !0 - error */ -static int decode_tns(AACDecContext *ac, TemporalNoiseShaping *tns, +int ff_aac_decode_tns(AACDecContext *ac, TemporalNoiseShaping *tns, GetBitContext *gb, const IndividualChannelStream *ics) { int w, filt, i, coef_len, coef_res, coef_compress; @@ -1690,7 +1690,7 @@ int ff_aac_decode_ics(AACDecContext *ac, SingleChannelElement *sce, } tns->present = get_bits1(gb); if (tns->present && !er_syntax) { - ret = decode_tns(ac, tns, gb, ics); + ret = ff_aac_decode_tns(ac, tns, gb, ics); if (ret < 0) goto fail; } @@ -1704,7 +1704,7 @@ int ff_aac_decode_ics(AACDecContext *ac, SingleChannelElement *sce, // I see no textual basis in the spec for this occurring after SSR gain // control, but this is what both reference and real implmentations do if (tns->present && er_syntax) { - ret = decode_tns(ac, tns, gb, ics); + ret = ff_aac_decode_tns(ac, tns, gb, ics); if (ret < 0) goto fail; } diff --git a/libavcodec/aac/aacdec.h b/libavcodec/aac/aacdec.h index bea0578e92..499bd8eefc 100644 --- a/libavcodec/aac/aacdec.h +++ b/libavcodec/aac/aacdec.h @@ -351,6 +351,9 @@ int ff_aac_decode_init_fixed(AVCodecContext *avctx); int ff_aac_decode_ics(AACDecContext *ac, SingleChannelElement *sce, GetBitContext *gb, int common_window, int scale_flag); +int ff_aac_decode_tns(AACDecContext *ac, TemporalNoiseShaping *tns, + GetBitContext *gb, const IndividualChannelStream *ics); + int ff_aac_set_default_channel_config(AACDecContext *ac, AVCodecContext *avctx, uint8_t (*layout_map)[3], int *tags,