From patchwork Sun Jun 16 08:54:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lynne X-Patchwork-Id: 49941 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9196:0:b0:460:55fa:d5ed with SMTP id s22csp1304407vqg; Sun, 16 Jun 2024 01:55:21 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXsog5dA3zDnq8cma0mACksoaJe2qxFdjUksQtMpCCpScxo4g5hkWwZHFnWEhhYecypqSxCZfCPhxRSSA/0qic0qcV2OCZJmISYcw== X-Google-Smtp-Source: AGHT+IEYPFzaD8eYrQTQKu6TPf34gvCKNkipD6ZvNRF0LMIRcRyhhReSjuRIT0rCtY0kuI923axt X-Received: by 2002:a17:907:9721:b0:a67:a2e0:9dd9 with SMTP id a640c23a62f3a-a6f60cf5034mr507424666b.2.1718528120871; Sun, 16 Jun 2024 01:55:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718528120; cv=none; d=google.com; s=arc-20160816; b=mjYuUYm92BQKhJ90rM3YIy03z2cvykW2sC6VHExHSXIBsDAOvJxeh7RtwDEtCKDxGS koi09Fv3BrXDG402hdUeTbtCWOF/6Zgg2vYHMV63pZvqC2UjNRykjdgMkeFiURa5ek11 JCRjaZDbbERwM0hpW7GPeQQkVUmv0BmGEgdPzfT0uv7eL2B+WGf3A94lf3U3kyFYeWSg O+AuzuuIpyO/cdtzT9nj9Wdni2U2KsjWl96Swsc8l0JHQY7JCDTgdUKUWgsrWt+uFU7Y DAn+BCVUD8MW4ZTloo9BQ7FZmDkVjRO+XgZYpNFuyUZFbTFyYYqPHjz0gXJR3XR5J7PL FbsA== 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=BOUuqFMorDyNGWvcuaTsZMCu+POxclf5FgwemYssbfg=; fh=nenT92/WZoU6unXd3J6UhGUdod4piddKfVtctNBOh6k=; b=kcPQRVQOPF+MzTncQFMdovDD5FwKWhrzSMqzbI4xWHUQDwXRuYlvSq7JgZjWz5h6Kf gyz1OYCAronR912v9fl23pwO/LFNXzbO1YYAo3iFE7FFzuamXN8aL+s0hjSZ1wzGnbjd /rSVDoXR1ZziZSYDaH5Wx+yWN+2TqyDN/Yx9kzDfpwSaZrd56Oyn2Ydfg88WWtZaeakq 6jJUB+XB81hgkKejqgm6IKXTk7AJbdJAKyXXn22Y3trNXyeSypumB51zrYtC2sjv7ZN3 fWqtF/kIFQR9jgvXBVLU9PtQZRfUx8C+xCYVWDVf2SMhXI/EgUtb/ba8OfqTrTZou8l1 nl5A==; 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-a6f62d3f745si261227566b.716.2024.06.16.01.55.20; Sun, 16 Jun 2024 01:55:20 -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 9E81968D6C1; Sun, 16 Jun 2024 11:55:07 +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 855CE68D6A1 for ; Sun, 16 Jun 2024 11:55:00 +0300 (EEST) To: ffmpeg-devel@ffmpeg.org Date: Sun, 16 Jun 2024 10:54:44 +0200 Message-ID: <20240616085454.2560973-2-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 2/6] aac: expose ff_aac_sample_rate_idx() in aac.h 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: iKn+tfqhRkrO The rate index is a value important to both encoders and decoders. USAC needs it as well, so put it into the shared main header. --- libavcodec/aac.h | 16 ++++++++++++++++ libavcodec/aac/aacdec.c | 18 +----------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/libavcodec/aac.h b/libavcodec/aac.h index fc6d1361b2..78026a5887 100644 --- a/libavcodec/aac.h +++ b/libavcodec/aac.h @@ -103,4 +103,20 @@ typedef struct Pulse { int amp[4]; } Pulse; +static inline int ff_aac_sample_rate_idx(int rate) +{ + if (92017 <= rate) return 0; + else if (75132 <= rate) return 1; + else if (55426 <= rate) return 2; + else if (46009 <= rate) return 3; + else if (37566 <= rate) return 4; + else if (27713 <= rate) return 5; + else if (23004 <= rate) return 6; + else if (18783 <= rate) return 7; + else if (13856 <= rate) return 8; + else if (11502 <= rate) return 9; + else if (9391 <= rate) return 10; + else return 11; +} + #endif /* AVCODEC_AAC_H */ diff --git a/libavcodec/aac/aacdec.c b/libavcodec/aac/aacdec.c index eecb6d8f3d..ea2ba84a80 100644 --- a/libavcodec/aac/aacdec.c +++ b/libavcodec/aac/aacdec.c @@ -1095,22 +1095,6 @@ static int decode_audio_specific_config(AACDecContext *ac, sync_extension); } -static int sample_rate_idx (int rate) -{ - if (92017 <= rate) return 0; - else if (75132 <= rate) return 1; - else if (55426 <= rate) return 2; - else if (46009 <= rate) return 3; - else if (37566 <= rate) return 4; - else if (27713 <= rate) return 5; - else if (23004 <= rate) return 6; - else if (18783 <= rate) return 7; - else if (13856 <= rate) return 8; - else if (11502 <= rate) return 9; - else if (9391 <= rate) return 10; - else return 11; -} - static av_cold int decode_close(AVCodecContext *avctx) { AACDecContext *ac = avctx->priv_data; @@ -1211,7 +1195,7 @@ av_cold int ff_aac_decode_init(AVCodecContext *avctx) uint8_t layout_map[MAX_ELEM_ID*4][3]; int layout_map_tags; - sr = sample_rate_idx(avctx->sample_rate); + sr = ff_aac_sample_rate_idx(avctx->sample_rate); ac->oc[1].m4ac.sampling_index = sr; ac->oc[1].m4ac.channels = avctx->ch_layout.nb_channels; ac->oc[1].m4ac.sbr = -1;