From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 2E5354B442 for ; Wed, 5 Jun 2024 16:15:13 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2CBCC68D5AF; Wed, 5 Jun 2024 19:15:11 +0300 (EEST) Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EDEF868C371 for ; Wed, 5 Jun 2024 19:15:04 +0300 (EEST) Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-1f62a628b4cso197665ad.1 for ; Wed, 05 Jun 2024 09:15:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717604101; x=1718208901; darn=ffmpeg.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id:from :to:cc:subject:date:message-id:reply-to; bh=k43ezE3RvNYMx2/9c/EizfoxfN0g6aeS+USrEiw3NAo=; b=OeNXyPw6fIKaaw4f075cpVkqB8g0VBTCp7iQTuvbjmB1FLUAvt6yz6wCKPlBDfxGX6 w42+5k3F5bxgDC0U5VUX6e+CXF4tvb6+QsUSjRxtyzotFFgr9qVBRgO5mb0xzg9ep0/e dGb44p+aKUUK2RdXQa4pHGBmyr6OQWkQ4TUgGO4pXG7OoKIfQ3ORTTnJk9ATX6hZMhBw ReV2IlHz72o0Nhd0LpoLoFg+tNyRxUHAKg4QcblbUqdBJ0rxYlLJIwMS89tdjrzSCHjC FhkLsQAkRvl+1TOArl5oTQ9ipJSCt7qqUnwK5wVqauYOReJzwa9f50S0INmLX6f3Wo2H 4Slw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717604101; x=1718208901; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=k43ezE3RvNYMx2/9c/EizfoxfN0g6aeS+USrEiw3NAo=; b=YOJYcOexxgyok0HjlJOupTOk/Hji9OUYgR7vLzEznQXwPWsMOrI+2nndMw4S8LmDl4 WuB7WM99uhymrN5+efAbLrIlaiDfVC7IkAnNrhC/uCSvyNMR/Rh7eChg4mSomZB8GJNQ SrrGuXcNXnb22oQrsFy/iDeOO54OzdlaYSVlNrxm/0pX4b3epmObzQu9V9jj27aCYTYE CZkUFzfpx35yxhKrmbb1auG3nnp9J4aflO4zGxUybSYRp8YOtwiqhviyXYUD0jMIJpZS PUuuEqrDhFvgmGkB+bpVdjxpnVNx72mbZfqlnRc8EO+IV0FvC3swst+VhQYYaCgQWHXX trBg== X-Gm-Message-State: AOJu0Yzw4i2R9yGgnQmHpaxYsjZv1BaV+zFfkkYoAh8CEtlJcFPbtIIr OLefDq9aOdoFLvQQlI35sdFJye753U6G+rPG9kUDLs3aThg/UhLmCGmW4g== X-Google-Smtp-Source: AGHT+IGHmXpzNLIdK1BUnYKs+A2xweciweWk51g7URoFpy2jkgO4m/LUaFzSMaBWMXDJwLXmt1e07g== X-Received: by 2002:a17:902:ce8e:b0:1f4:75e8:2ea0 with SMTP id d9443c01a7336-1f6a59043dbmr36434405ad.6.1717604101268; Wed, 05 Jun 2024 09:15:01 -0700 (PDT) Received: from [192.168.0.16] ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f63232e104sm104194525ad.59.2024.06.05.09.14.59 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 05 Jun 2024 09:15:00 -0700 (PDT) Message-ID: <866197c9-00e2-46b6-ba9b-d8e3972d8ac9@gmail.com> Date: Wed, 5 Jun 2024 13:15:11 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: <20240605030843.2807174-1-dev@lynne.ee> Content-Language: en-US From: James Almer In-Reply-To: <20240605030843.2807174-1-dev@lynne.ee> Subject: Re: [FFmpeg-devel] [PATCH 1/4] mpeg4audio: rename AOT_USAC_NOSBR to AOT_USAC 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: , Reply-To: FFmpeg development discussions and patches Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 6/5/2024 12:08 AM, Lynne via ffmpeg-devel wrote: > The issue is that AOT 45 isn't defined anywhere, and looking at the git > blame, it seems to have sprung up through a reordering of the enum, > and adding a hole. > > The spec does not define an explicit AOT for SBR and no SBR, and only > uses AOT 42 (previously AOT_USAC_NOSBR), so just rename AOT_USAC to > it and replace its use everywhere. > --- > libavcodec/aac/aacdec.c | 7 ++----- > libavcodec/mpeg4audio.h | 3 +-- > 2 files changed, 3 insertions(+), 7 deletions(-) > > diff --git a/libavcodec/aac/aacdec.c b/libavcodec/aac/aacdec.c > index 2b8322fc68..24d2bdde4c 100644 > --- a/libavcodec/aac/aacdec.c > +++ b/libavcodec/aac/aacdec.c > @@ -1046,7 +1046,6 @@ static int decode_audio_specific_config_gb(AACDecContext *ac, > return ret; > break; > #if CONFIG_AAC_DECODER > - case AOT_USAC_NOSBR: /* fallthrough */ > case AOT_USAC: > if ((ret = ff_aac_usac_config_decode(ac, avctx, gb, > oc, m4ac->chan_config)) < 0) > @@ -1571,8 +1570,7 @@ int ff_aac_decode_tns(AACDecContext *ac, TemporalNoiseShaping *tns, > GetBitContext *gb, const IndividualChannelStream *ics) > { > int tns_max_order = INT32_MAX; > - const int is_usac = ac->oc[1].m4ac.object_type == AOT_USAC || > - ac->oc[1].m4ac.object_type == AOT_USAC_NOSBR; > + const int is_usac = ac->oc[1].m4ac.object_type == AOT_USAC; > int w, filt, i, coef_len, coef_res, coef_compress; > const int is8 = ics->window_sequence[0] == EIGHT_SHORT_SEQUENCE; > > @@ -2421,8 +2419,7 @@ static int aac_decode_frame_int(AVCodecContext *avctx, AVFrame *frame, > > ac->tags_mapped = 0; > > - if ((ac->oc[1].m4ac.object_type == AOT_USAC) || > - (ac->oc[1].m4ac.object_type == AOT_USAC_NOSBR)) { > + if (ac->oc[1].m4ac.object_type == AOT_USAC) { > if (ac->is_fixed) { > avpriv_report_missing_feature(ac->avctx, > "AAC USAC fixed-point decoding"); > diff --git a/libavcodec/mpeg4audio.h b/libavcodec/mpeg4audio.h > index 56615ef321..5daba7824b 100644 > --- a/libavcodec/mpeg4audio.h > +++ b/libavcodec/mpeg4audio.h > @@ -108,10 +108,9 @@ enum AudioObjectType { > AOT_ER_AAC_ELD, ///< N Error Resilient Enhanced Low Delay > AOT_SMR_SIMPLE, ///< N Symbolic Music Representation Simple > AOT_SMR_MAIN, ///< N Symbolic Music Representation Main > - AOT_USAC_NOSBR, ///< N Unified Speech and Audio Coding (no SBR) > + AOT_USAC, ///< Y Unified Speech and Audio Coding > AOT_SAOC, ///< N Spatial Audio Object Coding > AOT_LD_SURROUND, ///< N Low Delay MPEG Surround > - AOT_USAC, ///< N Unified Speech and Audio Coding > }; > > #define MAX_PCE_SIZE 320 ///