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 CBB7F4A772 for ; Wed, 5 Jun 2024 05:33:55 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1865068D6DB; Wed, 5 Jun 2024 08:33:53 +0300 (EEST) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04olkn2083.outbound.protection.outlook.com [40.92.74.83]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E9CE868D6D2 for ; Wed, 5 Jun 2024 08:33:45 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iDX586AQGrHErOzEBqgrAHhDwLb5W9FABVFGSNZi0xQ6hJaH5glJ1PNVx0um4RVuHkZVy7iWPFeWyxc6wCFYmzlsinif9xGQZh1WJiSpvDeI6qu+pS5EfUSIjHWs8IUUcgsaPnaKFogkSdo6bNCkqDi97znrG8jogc+3GkSBKuy1RmWIXuixNNZkyUq8oxhJ5wyehOxQrRl9K2qxxX8YHwNOA0VpfBazXPUtnv9TvGzy5RpNBZRKB9y3LUROWWIk4H3UPKkSeftSxC9J8xuIBKxA2IBAvPaD0LuAWjnt87Dq91R7NSq2awD6TCA32f4XUptzyo1zDHP42SM6jjHVVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=S02LGVH/5+Pptl1MhJeRQNc/r33oElI6wn8ilPs97Dk=; b=kl9ga+YrugSggy/sGINgjmRgh+60YZ6SXkHQLnDruEhbcV9XjxeVC/uaq2P8C+VhJvdoO3s/qVJnDhzeOLYNd056EPLLuN/NKUAf2pH6xF3Vxdp5qbfXAzHSpBBwXLh+4+xBHtf22+k5t5d7My9vSyyMiDkvkxfp49d/lzS0GuTflszVHivJk0/js9GUCxeprW6IIgqpzzyPz+M1tOdrKoiYNR5Ta72Rx3hMarN3QYtSjRAt9dHPaJD8DD164wMfYAtjhiCp3WUjJiWDvDHZttcTrjrOyq4I2LoR6IGCJH/J3CA1IGP/OfdLYuHb7kaorD0Qb/czkekhAC42yR8Uzg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=S02LGVH/5+Pptl1MhJeRQNc/r33oElI6wn8ilPs97Dk=; b=XhBAlF/W6vmseEpYael9JFrmpSe29g8AaOVciGicsUYogT1N81mJLh/Qm0kQ3OUKQpk9BsJQw3BiBYRL/nOSlb6kUHK0rp9hWM8HodzZbC4g5/aHXTgtzVwoX4WOzG7+/+InWFbpdrw2cfU/QCe5c/wMVfEz58j2CNC4c19OE57ULEtELhb2zvfcSZiXYRXC+8XnS2eSrNvmJX3cNv2J7ZS15jWwZKdrEIDNLRIpVBjEiL6y1UgLR+S13YoURgnjjyaFf9ugx9JU57suDBZL/BkoC25fBBmp0uAO3HVeJyLR6l+cZYWySmBNZwYgr4fg9NapNKJrrzeGYx17mHUdDg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0008.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:35b::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.26; Wed, 5 Jun 2024 05:33:43 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%4]) with mapi id 15.20.7633.021; Wed, 5 Jun 2024 05:33:43 +0000 Message-ID: Date: Wed, 5 Jun 2024 07:33:38 +0200 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: Andreas Rheinhardt In-Reply-To: <20240605030843.2807174-3-dev@lynne.ee> X-TMN: [XF5UlXz6oHYWwGi1iMIcl353KUq+8dm1h9MjJqlSG+4=] X-ClientProxiedBy: FR3P281CA0135.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:94::19) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <6ea2fcb6-f99a-4f2e-89c4-33c2dcb092cd@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0008:EE_ X-MS-Office365-Filtering-Correlation-Id: aa7c9d94-5fbf-4223-58f2-08dc85211045 X-Microsoft-Antispam: BCL:0;ARA:14566002|461199019|3412199016|440099019; X-Microsoft-Antispam-Message-Info: vjVU3He9LvVBUs8UQ5tU1kvu0hFZbK+YOfwSZMAri2vkweccczTP3owsGiKAn5vZ+SsoN9kPP6Dua5+I2EbzV1gHdXGibgQNDCsiFSAxkrH3ZB3/cgsqP1KsW/OojpGD1ecDfRl9k2zzDIvGE4zAeZqkmZMHQ6h1GEdesigc4IdE39MZrywph9keZgD02Xj+dE+y4cfzkhoPd+DXEbwboUjQXWUNn9XRSujT5puovT5eBRAcX5TU/uF/7v+VokamFC8CX3w0gqSyDdVMzC8egHhNGXvPStZxlRgcbPUqVyUnlKAwCEQDWdrgdojsquB+y6f8JlkPDX4KvhjH7BZabqJ278Sfi9hfwP9Z0zn9vkaCVZokl66tWDNyjREZDV83gE8tlJ917L2tIdsXtGVnR9sXUwwnE30xdUP+mQAl9EwkJQGwin0MYmNdJWO82W63QwrKLiB23vf38cWSDKMsPb115KPRjVIwpI0sqROryo+3wX7x5CRHs9vleVkurw9dtCwaK1gqu5x4bGgk/cJRvBOssceqx4aIw786yHqTmpm5QJBMVjpZfNBrWxTelYvt X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?THNSdExibWhXemcrNGdFb0JnWTd0WDVtOE1XT25vcEgzWExLMm8yUUI5L0Uw?= =?utf-8?B?UTZxaHBZRTZwMUxDZS93ZU5uV2dscnFaS1ZWejJPaVRCWGFUSXFzN3JoUVcy?= =?utf-8?B?dU9ZbUJsY1oremdoMDRraFIrR1Y4NC9kVCs1YmRXbE1qSzdXa2p6RXNiK0ZJ?= =?utf-8?B?amRwV0ptWmNBakNlUDh4UHFwU1d5blM4QURYYWZIVUo3RlFMV0xDQ3JYbHNt?= =?utf-8?B?Mmdlc2VBek1pdnVxM2I4SGJhdDMwNUtSWHQ2SVNib1NVcHBFd2VocGoxbFM5?= =?utf-8?B?SE9hTDY1MUJpbEhNRXhuSmU3YWQ2Uko2VW5MVm1MNitYNUpxME9rNE5nMVVQ?= =?utf-8?B?R2g2UzVBZXhEMjlad200UjJoaHFkdVpNejZUdTZsdHVkT01kMHV0dkwxQks3?= =?utf-8?B?OUsvRTFrOHdTa082WVJRKytWVWF3U0lUWGR5TUNvT3RqKzdTSlZpR1hhdjlE?= =?utf-8?B?aTFRdEZxT1FBdGRPTkVMdEswWTRVNEZDL0FhVVllOElnbW9jK0Z5c3lUOStI?= =?utf-8?B?a1kxaVhTS3BUQ2RHdncvSnZWbU9oR0VIUGxiOFkyeWIvaDNzWEVjVEVzaHc5?= =?utf-8?B?L0xoYk1lQ0lvQVlZZVN5dHJISEFldTdEczVicjJKbTl5SUk2RThwZHpZK0Qr?= =?utf-8?B?Z3dHb3JwNHArZTRDK2I2aWs4dWNzNEM5bGdPdHprSHlpSkdVUU9waWNsUjN4?= =?utf-8?B?Mkl4OVUrR3BSallWQjdueWtyYUpnc204M3FxUldpVERsWVp5VnpPMHFqM01R?= =?utf-8?B?cHJOM1ZtdWxwZkl4ZWhlSUZkWFB5RlJNb1Q2Qm9zRTU4R2RQZ0IvQmxCN3VY?= =?utf-8?B?ZFlJdzV2anZZcU01UEpLQkNQa1MwejlhUWVWdnFpSTFBd1VMNWpJNnRpdG5M?= =?utf-8?B?SDFZeVBGeFZ1TUdZMGVoQ2xvK3ZWbk1qSEhPbWd2dFlsS0hqTVppQWdlbU9I?= =?utf-8?B?eTlTUjh0R3JQNjVhWU1XMS9iTk5ZZU0rM3A1NVAwTnd3bGk0dGU1SGtrR3gx?= =?utf-8?B?NFFIS3RnbkFyUlJaYjFEWjZ0MXNXQXZXYVA5aVRMU1BmUzBGMEtGZEZtNUJL?= =?utf-8?B?RWZvR0VyTFhhQk5oOWtndExVcFZCaW5BejQ3SThpOHpBTVFHakFVcmg4T1Ev?= =?utf-8?B?akkxTHJSTkVGRzUwY2N3MENBcm9LcE5Nd1hzYktkVkJmaGtoNmtTWHpmVThi?= =?utf-8?B?cFpkQ010QjdrWGpmR3N0MzJoSUJrWjg3UzlEZ2xIWituZmIvNi80NlBqVXlr?= =?utf-8?B?bEhJR3UzamJkazl0ZENkUTFqVWRjVWhpcGZPM0RqcXJDbnRxVGYrc3k4V2l4?= =?utf-8?B?Z1EzbGkwdG12TmFTc29TTFBCbk1OUEhiNUFmTWROWjI2dXdMd0x4VG1aVnpw?= =?utf-8?B?bzd6U1pYeE5vbFNiOUdIdW5TZFRpYTRpdE1qTW8wdXZza083aDVwS3p2R0Rq?= =?utf-8?B?TVdJS3puSUtWRFJVRHd0cmJYUjVlR2I3L2RSV2NJemdtd3JPTTRnMERRa0tU?= =?utf-8?B?UFRPY3RhQTN1elhtcmFURktMZnF4SkduUmpGa2JzY1RnOVl5b0k2MHVDMXFK?= =?utf-8?B?czVURVdpTWxuWk9wa3hQZzhoa0RtdGtnMGZBTHJldmplMEN4VEd4ZEZsZi85?= =?utf-8?B?WXF1UzA1NFJ0TmVua2VreVdJR0psc2pEUUUrSXdPdGhha1N0VWkwSnBXb0Za?= =?utf-8?B?ZXpDL1U0VE9kd0lzci9YVDZ5WnRPLzZPV3UxVkhNSjk0K2dWdXRKZnJnPT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: aa7c9d94-5fbf-4223-58f2-08dc85211045 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2024 05:33:43.6367 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8P250MB0008 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-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Lynne via ffmpeg-devel: > 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 Don't add new deprecated defines. > #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)\ > _______________________________________________ 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".