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 235A04B440 for ; Wed, 5 Jun 2024 16:18:27 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8790368D6D5; Wed, 5 Jun 2024 19:18:25 +0300 (EEST) Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 817E268D4AF for ; Wed, 5 Jun 2024 19:18:19 +0300 (EEST) Received: by mail-pf1-f175.google.com with SMTP id d2e1a72fcca58-7024cd9dd3dso4194105b3a.3 for ; Wed, 05 Jun 2024 09:18:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717604297; x=1718209097; 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=ult5ItUbiucipu6EL3ErsN09csrY4p9eYsNtmOX4DBc=; b=N/PS8a2ifNdoAOqUPJrn4wZv9Dve6quxW/Y2uDsB3mnc+D7P0AdQ4gwsJMxvhnJAsk oEsFEz3mwy9WYMWR/9GwKMPfEY0a4EAu0H7oYduHVRhHqr7nGoV+J630a49ag27ytn2r c54ySpnSbotGqthZWMnLjXzR4ooNlO6XKoSFcWG5TJMH1ODPIb0XgpOm1WfcKg+0xuXh tLD5qj5/0nIK1Zy0k4jIhKB1GlxXXvUxbgatMpQjmbszZxOOK83kFPe6ke+8DXpt0xrD dDPET2NrvUqLeJgr6a+ImYZK1qUECloIT8KHPfrWDqGCvFTCULrpbU1wBZfIq1otgKsW Ej0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717604297; x=1718209097; 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=ult5ItUbiucipu6EL3ErsN09csrY4p9eYsNtmOX4DBc=; b=WwZApeVCvwniDvKmuL2vR9S0j/ZPMe3DkhSVLZ/hzSkBS3QJ+Fd7Kmm0SFSo8z3HoW g0sk0OGpfrG8c6KDTivcHJuGuHuhcRaGSoi0JEf2pKrcG+cVx0lCLBZqeP5a8UA4NYdv SXk9i57jaANQRxcXxaj0bff/tT4u93EMIuNA51HLw5pj77wXbWkAg1eVYuFHWW6tPu1l seDg3yh8UaRrBE2Z8iMP0WF4H+U4Sg8W6FMoKQsCawkxI1RnZDagxHTMPJEgzWVuY7Xe jPFEB1z5dg3IphyV7f1j39uoLA3KPtdcuYVEUiuhTyJF+9U503sjrXL+k2zBF/FlGAa9 O3/w== X-Gm-Message-State: AOJu0Yx5ss0NJLegb8YjiYFCbs07nVdh42QvpuU0Ticg1rZFfyiL0JBW 4E05BuqWPobR1US6deTbgfR0Ib9DRJYS9UfFGSlVJDTq5wcyZqL7mukvzg== X-Google-Smtp-Source: AGHT+IH+8vj5lfNvj7Vns8jNmtNAwXZgMJorvs4wVp8OzN7PF30NcNn3rHGvOUDhW83KC1IJSFrs6w== X-Received: by 2002:a05:6a20:3d87:b0:1af:e624:b9b2 with SMTP id adf61e73a8af0-1b2b6f3d0e9mr3954610637.19.1717604297058; Wed, 05 Jun 2024 09:18:17 -0700 (PDT) Received: from [192.168.0.16] ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-70242ae89c6sm8813407b3a.100.2024.06.05.09.18.15 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 05 Jun 2024 09:18:16 -0700 (PDT) Message-ID: <5e16313c-ad04-41db-a884-655750f0a09a@gmail.com> Date: Wed, 5 Jun 2024 13:18:27 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: <20240605030843.2807174-1-dev@lynne.ee> <20240605030843.2807174-3-dev@lynne.ee> Content-Language: en-US From: James Almer In-Reply-To: <20240605030843.2807174-3-dev@lynne.ee> Subject: Re: [FFmpeg-devel] [PATCH 3/4] aac: define a new profile for 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: > This allows users to determine whether a stream is USAC or not. > --- > libavcodec/aac/aacdec_usac.c | 4 ++++ > libavcodec/avcodec.h | 1 + > libavcodec/defs.h | 1 + > libavcodec/profiles.c | 1 + > libavcodec/profiles.h | 1 + > 5 files changed, 8 insertions(+) > > diff --git a/libavcodec/aac/aacdec_usac.c b/libavcodec/aac/aacdec_usac.c > index 7b36b49d63..5c3bb8d4ac 100644 > --- a/libavcodec/aac/aacdec_usac.c > +++ b/libavcodec/aac/aacdec_usac.c > @@ -494,6 +494,8 @@ int ff_aac_usac_config_decode(AACDecContext *ac, AVCodecContext *avctx, > } > } > > + ac->avctx->profile = AV_PROFILE_AAC_USAC; > + > ret = ff_aac_usac_reset_state(ac, oc); > if (ret < 0) > return ret; > @@ -1533,6 +1535,8 @@ int ff_aac_usac_decode_frame(AVCodecContext *avctx, AACDecContext *ac, > ff_aac_output_configure(ac, ac->oc[1].layout_map, ac->oc[1].layout_map_tags, > ac->oc[1].status, 0); > > + ac->avctx->profile = AV_PROFILE_AAC_USAC; > + > indep_flag = get_bits1(gb); > > nb_ch_el = 0; > diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h > index 2da63c87ea..257e04fe2d 100644 > --- a/libavcodec/avcodec.h > +++ b/libavcodec/avcodec.h > @@ -1652,6 +1652,7 @@ typedef struct AVCodecContext { > #define FF_PROFILE_AAC_HE_V2 28 > #define FF_PROFILE_AAC_LD 22 > #define FF_PROFILE_AAC_ELD 38 > +#define FF_PROFILE_AAC_USAC 41 > #define FF_PROFILE_MPEG2_AAC_LOW 128 > #define FF_PROFILE_MPEG2_AAC_HE 131 > > diff --git a/libavcodec/defs.h b/libavcodec/defs.h > index 00d840ec19..7ddfdcad0b 100644 > --- a/libavcodec/defs.h > +++ b/libavcodec/defs.h > @@ -73,6 +73,7 @@ > #define AV_PROFILE_AAC_HE_V2 28 > #define AV_PROFILE_AAC_LD 22 > #define AV_PROFILE_AAC_ELD 38 > +#define AV_PROFILE_AAC_USAC 41 > #define AV_PROFILE_MPEG2_AAC_LOW 128 > #define AV_PROFILE_MPEG2_AAC_HE 131 > > diff --git a/libavcodec/profiles.c b/libavcodec/profiles.c > index 052b77926e..44bdf6f85b 100644 > --- a/libavcodec/profiles.c > +++ b/libavcodec/profiles.c > @@ -33,6 +33,7 @@ const AVProfile ff_aac_profiles[] = { > { AV_PROFILE_AAC_MAIN, "Main" }, > { AV_PROFILE_AAC_SSR, "SSR" }, > { AV_PROFILE_AAC_LTP, "LTP" }, > + { AV_PROFILE_AAC_USAC, "xHE-AAC" }, > { AV_PROFILE_UNKNOWN }, > }; > > diff --git a/libavcodec/profiles.h b/libavcodec/profiles.h > index 842201718b..33b7ffc17a 100644 > --- a/libavcodec/profiles.h > +++ b/libavcodec/profiles.h > @@ -35,6 +35,7 @@ > FF_AVCTX_PROFILE_OPTION("aac_he_v2", NULL, AUDIO, AV_PROFILE_AAC_HE_V2)\ > FF_AVCTX_PROFILE_OPTION("aac_ld", NULL, AUDIO, AV_PROFILE_AAC_LD)\ > FF_AVCTX_PROFILE_OPTION("aac_eld", NULL, AUDIO, AV_PROFILE_AAC_ELD)\ > + FF_AVCTX_PROFILE_OPTION("aac_xhe", NULL, AUDIO, AV_PROFILE_AAC_USAC)\ > FF_AVCTX_PROFILE_OPTION("mpeg2_aac_low", NULL, AUDIO, AV_PROFILE_MPEG2_AAC_LOW)\ > FF_AVCTX_PROFILE_OPTION("mpeg2_aac_he", NULL, AUDIO, AV_PROFILE_MPEG2_AAC_HE)\ Should be ok without FF_PROFILE_AAC_USAC. _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".