From patchwork Sun Jun 16 08:54:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lynne X-Patchwork-Id: 49944 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9196:0:b0:460:55fa:d5ed with SMTP id s22csp1304534vqg; Sun, 16 Jun 2024 01:55:48 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU28or36whniu2Pl2FEqgHq2TZ56FQ02x8q5PsafaFxucY8m/Dg6oxKD6XvmDqaCrP84eTGB4n3JiFcN1r7z2wR3TRT0oQ6UIPTuw== X-Google-Smtp-Source: AGHT+IHUACpk32PfuZ+OwJNMV58Y7rSDim7vL9KUn8OWWE9FbsWUrqi/ICuLG6UGfy+IjCTGrNMb X-Received: by 2002:a05:6402:516:b0:57c:5c50:2ef9 with SMTP id 4fb4d7f45d1cf-57cb4b9965fmr6184419a12.3.1718528148110; Sun, 16 Jun 2024 01:55:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718528148; cv=none; d=google.com; s=arc-20160816; b=0y1L07hkTOr5GCu+InLcrLg7sc9Km6W3EaxezXBFANUV4ITnCWC8bLl+u2Br9jpLcu KwNatF9m1YyEuKB0ZhgLEJrixmCGIUkfb4S9qYy+pJZgdZ3ayTjF+vKPV5X+OieRPmpD GLFYakx6tHINtjlzQsEFCZuG/5g8/R3Mny8cSsub6NCl03omdi4BfyeDhF5i31VMdpX8 oEKl3N2TdNOqtXavvuTXvshY/QJ9P6yzmOX/AWaZBuxijAXI3rXlLINhn0+pX6JOoGEw ju+4Bu4vzI+NirlhJsjG9LawfxVzT0TeAW8B3Sejnr7g6czidHkno3EHYMXNehjha43x v1pw== 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=m1AmNcn/psF1MF6uCxPz+/7amrTIINs/uxqgPfleSso=; fh=nenT92/WZoU6unXd3J6UhGUdod4piddKfVtctNBOh6k=; b=lPgynDaDdNMPU36ZhbPsMNpkMk0M2e47nRU1VG+wjq89oebLGG+YwJ9lpMrEJ2LSq7 EwMrIaELTYPjbHePph+/adg/9qy2WVbeOoVMUqfy3emenHjp/LRFXUOsrBNfzyU4mCP2 ZXoJCEsU8XJwyrwpEceiu+ZHEEXKDLwBwbTQVEJGmz0Pcm5jYBH91z7cA3mEaQl7R8Cj 3NLiyUDql0TqVhh7ll0hgbrb7ExhiivBbIGPEoMywPXa59z5Fwg44liLepT1RKerFy+z 5cXz9AjzokU4ubTFkSiSHKobv/djzUhxZdMsg7t3xDnAvPxQPCsS57S2v2pO4qfEJwDP aQJA==; 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 4fb4d7f45d1cf-57cb7462b3bsi3615628a12.617.2024.06.16.01.55.47; Sun, 16 Jun 2024 01:55:48 -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 5742268D6EF; Sun, 16 Jun 2024 11:55:13 +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 3A27668D6EE for ; Sun, 16 Jun 2024 11:55:06 +0300 (EEST) To: ffmpeg-devel@ffmpeg.org Date: Sun, 16 Jun 2024 10:54:47 +0200 Message-ID: <20240616085454.2560973-5-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 5/6] aacdec_usac: remove custom rate_idx and use standard variable for it 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: gErDX0Ly1DjC m4ac.sampling_index is what aacdec.c uses. --- libavcodec/aac/aacdec.h | 1 - libavcodec/aac/aacdec_usac.c | 35 ++++++++++++++--------------------- 2 files changed, 14 insertions(+), 22 deletions(-) diff --git a/libavcodec/aac/aacdec.h b/libavcodec/aac/aacdec.h index d1a80e9ac1..e5a79a7139 100644 --- a/libavcodec/aac/aacdec.h +++ b/libavcodec/aac/aacdec.h @@ -350,7 +350,6 @@ typedef struct AACUsacElemConfig { typedef struct AACUSACConfig { uint8_t core_sbr_frame_len_idx; /* coreSbrFrameLengthIndex */ - uint8_t rate_idx; uint16_t core_frame_len; uint16_t stream_identifier; diff --git a/libavcodec/aac/aacdec_usac.c b/libavcodec/aac/aacdec_usac.c index eb0e7d3659..e5504117d0 100644 --- a/libavcodec/aac/aacdec_usac.c +++ b/libavcodec/aac/aacdec_usac.c @@ -316,7 +316,7 @@ int ff_aac_usac_config_decode(AACDecContext *ac, AVCodecContext *avctx, GetBitContext *gb, OutputConfiguration *oc, int channel_config) { - int ret, idx; + int ret; uint8_t freq_idx; uint8_t channel_config_idx; int nb_channels = 0; @@ -334,20 +334,10 @@ int ff_aac_usac_config_decode(AACDecContext *ac, AVCodecContext *avctx, freq_idx = get_bits(gb, 5); /* usacSamplingFrequencyIndex */ if (freq_idx == 0x1f) { samplerate = get_bits(gb, 24); /* usacSamplingFrequency */ - - /* Try to match up an index for the custom sample rate. - * TODO: not sure if correct */ - for (idx = 0; idx < /* FF_ARRAY_ELEMS(ff_aac_usac_samplerate) */ 32; idx++) { - if (ff_aac_usac_samplerate[idx] >= samplerate) - break; - } - idx = FFMIN(idx, /* FF_ARRAY_ELEMS(ff_aac_usac_samplerate) */ 32 - 1); - usac->rate_idx = idx; } else { samplerate = ff_aac_usac_samplerate[freq_idx]; if (samplerate < 0) return AVERROR(EINVAL); - usac->rate_idx = freq_idx; } m4ac->sample_rate = avctx->sample_rate = samplerate; @@ -364,6 +354,8 @@ int ff_aac_usac_config_decode(AACDecContext *ac, AVCodecContext *avctx, usac->core_sbr_frame_len_idx == 4 ? 1 : 0; + m4ac->sampling_index = ff_aac_sample_rate_idx(m4ac->sample_rate); + channel_config_idx = get_bits(gb, 5); /* channelConfigurationIndex */ if (!channel_config_idx) { /* UsacChannelConfig() */ @@ -751,18 +743,19 @@ static int setup_sce(AACDecContext *ac, SingleChannelElement *sce, { AACUsacElemData *ue = &sce->ue; IndividualChannelStream *ics = &sce->ics; + const int sampling_index = ac->oc[1].m4ac.sampling_index; /* Setup window parameters */ ics->prev_num_window_groups = FFMAX(ics->num_window_groups, 1); if (ics->window_sequence[0] == EIGHT_SHORT_SEQUENCE) { if (usac->core_frame_len == 768) { - ics->swb_offset = ff_swb_offset_96[usac->rate_idx]; - ics->num_swb = ff_aac_num_swb_96[usac->rate_idx]; + ics->swb_offset = ff_swb_offset_96[sampling_index]; + ics->num_swb = ff_aac_num_swb_96[sampling_index]; } else { - ics->swb_offset = ff_swb_offset_128[usac->rate_idx]; - ics->num_swb = ff_aac_num_swb_128[usac->rate_idx]; + ics->swb_offset = ff_swb_offset_128[sampling_index]; + ics->num_swb = ff_aac_num_swb_128[sampling_index]; } - ics->tns_max_bands = ff_tns_max_bands_usac_128[usac->rate_idx]; + ics->tns_max_bands = ff_tns_max_bands_usac_128[sampling_index]; /* Setup scalefactor grouping. 7 bit mask. */ ics->num_window_groups = 0; @@ -779,13 +772,13 @@ static int setup_sce(AACDecContext *ac, SingleChannelElement *sce, ics->num_windows = 8; } else { if (usac->core_frame_len == 768) { - ics->swb_offset = ff_swb_offset_768[usac->rate_idx]; - ics->num_swb = ff_aac_num_swb_768[usac->rate_idx]; + ics->swb_offset = ff_swb_offset_768[sampling_index]; + ics->num_swb = ff_aac_num_swb_768[sampling_index]; } else { - ics->swb_offset = ff_swb_offset_1024[usac->rate_idx]; - ics->num_swb = ff_aac_num_swb_1024[usac->rate_idx]; + ics->swb_offset = ff_swb_offset_1024[sampling_index]; + ics->num_swb = ff_aac_num_swb_1024[sampling_index]; } - ics->tns_max_bands = ff_tns_max_bands_usac_1024[usac->rate_idx]; + ics->tns_max_bands = ff_tns_max_bands_usac_1024[sampling_index]; ics->group_len[0] = 1; ics->num_window_groups = 1;