From patchwork Sun Jun 16 08:54:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lynne X-Patchwork-Id: 49943 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9196:0:b0:460:55fa:d5ed with SMTP id s22csp1304488vqg; Sun, 16 Jun 2024 01:55:39 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXY8EhtVB5zGmGwZwd5wquQR3Awj6588PHEB+oIIhup+F17Kr5qXvs7xGYoJn4rFkr5u4Y1nLESGlARToflFcAcv/32kjHluesxXw== X-Google-Smtp-Source: AGHT+IHnXEvuTDqRAd+NuL/cJZgJ/F8kXZSNiXuFFcksaMh+PVysf7Y3DUeFu/pSY4j/bpZHlPVb X-Received: by 2002:a05:6512:1056:b0:52c:ba7d:f032 with SMTP id 2adb3069b0e04-52cba7df104mr1289061e87.16.1718528138837; Sun, 16 Jun 2024 01:55:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718528138; cv=none; d=google.com; s=arc-20160816; b=Vs3USw81EB5WiNH/rUDxCKiWwe4BMHypE744HK+LskMSNE9pPXyDYW2DkHsUNK85h8 aJUIavp5NtX2TJRS0j8zGkSY5OdpqG2gx168YUCJEiTpmPBPlT3Z5fixFAOJRpyfMJJ4 rfOD8tUg9s0KeTkOJMPgRkpw8eDTBmtAuT8UTzWwfLlEBe1+C49VcB8Zw85KryX7zRbl LSXCWN3NTes/aBQiqs7Q1y7duixsPNshjltx1BShCxnveQb8o+rtN5E1/wqtqQGZEAIT gAtaIOwZvGmjoHOot6tweIifjDOd6U1idqvtZOsuWhXYyzbZB/Pb4h7cb0f97jBLQZeo +gWA== 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=9tUOLG3PMv8oROBMs5Lk8KzIsbmK11ddRZgM1VSnwYQ=; fh=nenT92/WZoU6unXd3J6UhGUdod4piddKfVtctNBOh6k=; b=1AyPl5S70tM5/gz7aDuPrPM5GTi71Je9DphP1EVwSmUznyEmtn4fFhH9e4hLOnd1os ALvadBAioQXS1X+mN6SKJ/fqtbR34kve0FmkwRRJbBLxJDg39EUCK2K4+5ZuM+pS3zbK TDTyt6Lc4snVTnAE3P/GGAon1DPuEftPpbVXzms3ynCGr63SC9HnHcG6GHHTXZFu7iWW DDkG/1AhQfJlmoX84OzsYWBe0HgkXExrdSRBu80lAx1hfwp/zcRqB2gCMXQkvJuxm5tF /3YtnPfX0fvNOw1Cwlh/xOzHXsQs9UbSC6LGbptPk88bp/JDDmNgWLsokxmYdK+GGVGV QMxA==; 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-a6f56dd685esi352464866b.432.2024.06.16.01.55.38; Sun, 16 Jun 2024 01:55:38 -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 D3C9F68D6C5; Sun, 16 Jun 2024 11:55:10 +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 DB7DA68D65F for ; Sun, 16 Jun 2024 11:55:02 +0300 (EEST) To: ffmpeg-devel@ffmpeg.org Date: Sun, 16 Jun 2024 10:54:46 +0200 Message-ID: <20240616085454.2560973-4-dev@lynne.ee> X-Mailer: git-send-email 2.45.1.288.g0e0cd299f1 In-Reply-To: <20240616085454.2560973-1-dev@lynne.ee> References: <20240616085454.2560973-1-dev@lynne.ee> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/6] aacdec_usac: rename noise_scale to noise_bands 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: 0MxtWvC04shJ This was a typo. --- libavcodec/aac/aacdec.h | 2 +- libavcodec/aac/aacdec_usac.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/aac/aacdec.h b/libavcodec/aac/aacdec.h index 86faf6454a..d1a80e9ac1 100644 --- a/libavcodec/aac/aacdec.h +++ b/libavcodec/aac/aacdec.h @@ -315,7 +315,7 @@ typedef struct AACUsacElemConfig { uint8_t freq_scale; /* dflt_freq_scale */ uint8_t alter_scale : 1; /* dflt_alter_scale */ - uint8_t noise_scale; /* dflt_noise_scale */ + uint8_t noise_bands; /* dflt_noise_bands */ uint8_t limiter_bands; /* dflt_limiter_bands */ uint8_t limiter_gains; /* dflt_limiter_gains */ diff --git a/libavcodec/aac/aacdec_usac.c b/libavcodec/aac/aacdec_usac.c index 065bc869d9..eb0e7d3659 100644 --- a/libavcodec/aac/aacdec_usac.c +++ b/libavcodec/aac/aacdec_usac.c @@ -162,11 +162,11 @@ static void decode_usac_sbr_data(AACUsacElemConfig *e, GetBitContext *gb) e->sbr.dflt.freq_scale = 2; e->sbr.dflt.alter_scale = 1; - e->sbr.dflt.noise_scale = 2; + e->sbr.dflt.noise_bands = 2; if (header_extra1) { e->sbr.dflt.freq_scale = get_bits(gb, 2); /* dflt_freq_scale */ e->sbr.dflt.alter_scale = get_bits1(gb); /* dflt_alter_scale */ - e->sbr.dflt.noise_scale = get_bits(gb, 2); /* dflt_noise_scale */ + e->sbr.dflt.noise_bands = get_bits(gb, 2); /* dflt_noise_bands */ } e->sbr.dflt.limiter_bands = 2;