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 E2E394A965 for ; Wed, 5 Jun 2024 16:16:22 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 84ACC68D6C1; Wed, 5 Jun 2024 19:16:21 +0300 (EEST) Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 227D768D544 for ; Wed, 5 Jun 2024 19:16:14 +0300 (EEST) Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-1f612d7b0f5so7932775ad.0 for ; Wed, 05 Jun 2024 09:16:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717604172; x=1718208972; 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=cK5CFW9xCv2uLIUog5d/72R/bkRF/dfrqxGi8Sg96bs=; b=LceSde3ztTiQ/bLsq1vjHEiIrL+6Ttcj6VVvdWNGPQoaXIBAxYeH91hoRpfx9n8aaL G0GDZjA6vrSApHN2bGw5jWxmm+IfQaX3A2UR98QEB8m33dHBaZL2lSs5klB+MczVMOxN GRVzvXhmzo4Aro1VnZiBd9wfbSyZV8kROueEdr7r8iRWyPbWC3ypYZg5k2tG894HPzRX vjHJhc3eHRkPU4EH4An1W0zqueweWRX3nhmiDA2Hfad7sK0IjqfEXvHdvBDinYsvRyRY 3ojgoW6EFGsHDhwzQ4rkioyFQ8XKlXRjXHczVzk1R48VoiYbl40CjL3BCrvvuYkJzI+P 63gA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717604172; x=1718208972; 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=cK5CFW9xCv2uLIUog5d/72R/bkRF/dfrqxGi8Sg96bs=; b=Be7UNlb+/NoH6czTzG9lvClAxMDXzrZYyE2ORbLcwKu+dp6oAUYH9rbiq0PXLqLRwY d8/6eXy7M6tQkXJjMAM7iQ4KilIIAGPop1mZ0c7RfOce4fHOfsAK23F8+ci6gGoYxomS 9rQmUMmGK72nr5W+Ce7pjbttWZ321xU1gnd9PGEpr6tGFuSZKtxOXTO7BIGG5zQ9CMQ7 9HnB4tUwcri/XW/D62Ts3nxeEm6NCmN8y+zbpha+xdkD83Mhj9sqJjakNUHeDY/I0oGs hiSQkdfV70FR9xGI0+l89qPcqKhxLwNp2VU3WFnlUDaqNrck5YTqshTojNr+sb6nwXqZ dBVA== X-Gm-Message-State: AOJu0Yy0keKCQLCifDvjHmacypEfzVUuUS/57wvu7Tj8wpcXNRSYAwSf y/Mh3cFxlAVgDkNhoTUDBeDHJjrLkB/YYQbP/etzGLDPD3oKj16dkZN3fg== X-Google-Smtp-Source: AGHT+IFusTO8J5YI6dgMJ2e+tlyHSbh5Xx24R24wFMmgT5SB5JWpgQdYqneLIwExEE1e6/ojNPSZdQ== X-Received: by 2002:a17:902:e889:b0:1f3:2f9c:bb72 with SMTP id d9443c01a7336-1f6b8c7b4d8mr1692735ad.5.1717604171847; Wed, 05 Jun 2024 09:16:11 -0700 (PDT) Received: from [192.168.0.16] ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f6323e9b12sm103598825ad.197.2024.06.05.09.16.10 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 05 Jun 2024 09:16:11 -0700 (PDT) Message-ID: Date: Wed, 5 Jun 2024 13:16:22 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: <20240605030843.2807174-1-dev@lynne.ee> <20240605030843.2807174-2-dev@lynne.ee> Content-Language: en-US From: James Almer In-Reply-To: <20240605030843.2807174-2-dev@lynne.ee> Subject: Re: [FFmpeg-devel] [PATCH 2/4] mpeg4audio: explicitly define each AOT 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 makes it far easier to figure out which AOT belongs to which > profile. > Also, explicitly highlight the holes. > --- > libavcodec/mpeg4audio.h | 82 +++++++++++++++++++++-------------------- > 1 file changed, 42 insertions(+), 40 deletions(-) > > diff --git a/libavcodec/mpeg4audio.h b/libavcodec/mpeg4audio.h > index 5daba7824b..0819e48a42 100644 > --- a/libavcodec/mpeg4audio.h > +++ b/libavcodec/mpeg4audio.h > @@ -68,49 +68,51 @@ int avpriv_mpeg4audio_get_config2(MPEG4AudioConfig *c, const uint8_t *buf, > int size, int sync_extension, void *logctx); > > enum AudioObjectType { > - AOT_NULL, > + AOT_NULL = 0, > // Support? Name > - AOT_AAC_MAIN, ///< Y Main > - AOT_AAC_LC, ///< Y Low Complexity > - AOT_AAC_SSR, ///< N (code in SoC repo) Scalable Sample Rate > - AOT_AAC_LTP, ///< Y Long Term Prediction > - AOT_SBR, ///< Y Spectral Band Replication > - AOT_AAC_SCALABLE, ///< N Scalable > - AOT_TWINVQ, ///< N Twin Vector Quantizer > - AOT_CELP, ///< N Code Excited Linear Prediction > - AOT_HVXC, ///< N Harmonic Vector eXcitation Coding > + AOT_AAC_MAIN = 1, ///< Y Main > + AOT_AAC_LC = 2, ///< Y Low Complexity > + AOT_AAC_SSR = 3, ///< N (code in SoC repo) Scalable Sample Rate > + AOT_AAC_LTP = 4, ///< Y Long Term Prediction > + AOT_SBR = 5, ///< Y Spectral Band Replication > + AOT_AAC_SCALABLE = 6, ///< N Scalable > + AOT_TWINVQ = 7, ///< N Twin Vector Quantizer > + AOT_CELP = 8, ///< N Code Excited Linear Prediction > + AOT_HVXC = 9, ///< N Harmonic Vector eXcitation Coding > + > AOT_TTSI = 12, ///< N Text-To-Speech Interface > - AOT_MAINSYNTH, ///< N Main Synthesis > - AOT_WAVESYNTH, ///< N Wavetable Synthesis > - AOT_MIDI, ///< N General MIDI > - AOT_SAFX, ///< N Algorithmic Synthesis and Audio Effects > - AOT_ER_AAC_LC, ///< N Error Resilient Low Complexity > + AOT_MAINSYNTH = 13, ///< N Main Synthesis > + AOT_WAVESYNTH = 14, ///< N Wavetable Synthesis > + AOT_MIDI = 15, ///< N General MIDI > + AOT_SAFX = 16, ///< N Algorithmic Synthesis and Audio Effects > + AOT_ER_AAC_LC = 17, ///< N Error Resilient Low Complexity > + > AOT_ER_AAC_LTP = 19, ///< N Error Resilient Long Term Prediction > - AOT_ER_AAC_SCALABLE, ///< N Error Resilient Scalable > - AOT_ER_TWINVQ, ///< N Error Resilient Twin Vector Quantizer > - AOT_ER_BSAC, ///< N Error Resilient Bit-Sliced Arithmetic Coding > - AOT_ER_AAC_LD, ///< N Error Resilient Low Delay > - AOT_ER_CELP, ///< N Error Resilient Code Excited Linear Prediction > - AOT_ER_HVXC, ///< N Error Resilient Harmonic Vector eXcitation Coding > - AOT_ER_HILN, ///< N Error Resilient Harmonic and Individual Lines plus Noise > - AOT_ER_PARAM, ///< N Error Resilient Parametric > - AOT_SSC, ///< N SinuSoidal Coding > - AOT_PS, ///< N Parametric Stereo > - AOT_SURROUND, ///< N MPEG Surround > - AOT_ESCAPE, ///< Y Escape Value > - AOT_L1, ///< Y Layer 1 > - AOT_L2, ///< Y Layer 2 > - AOT_L3, ///< Y Layer 3 > - AOT_DST, ///< N Direct Stream Transfer > - AOT_ALS, ///< Y Audio LosslesS > - AOT_SLS, ///< N Scalable LosslesS > - AOT_SLS_NON_CORE, ///< N Scalable LosslesS (non core) > - 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, ///< Y Unified Speech and Audio Coding > - AOT_SAOC, ///< N Spatial Audio Object Coding > - AOT_LD_SURROUND, ///< N Low Delay MPEG Surround > + AOT_ER_AAC_SCALABLE = 20, ///< N Error Resilient Scalable > + AOT_ER_TWINVQ = 21, ///< N Error Resilient Twin Vector Quantizer > + AOT_ER_BSAC = 22, ///< N Error Resilient Bit-Sliced Arithmetic Coding > + AOT_ER_AAC_LD = 23, ///< N Error Resilient Low Delay > + AOT_ER_CELP = 24, ///< N Error Resilient Code Excited Linear Prediction > + AOT_ER_HVXC = 25, ///< N Error Resilient Harmonic Vector eXcitation Coding > + AOT_ER_HILN = 26, ///< N Error Resilient Harmonic and Individual Lines plus Noise > + AOT_ER_PARAM = 27, ///< N Error Resilient Parametric > + AOT_SSC = 28, ///< N SinuSoidal Coding > + AOT_PS = 29, ///< N Parametric Stereo > + AOT_SURROUND = 30, ///< N MPEG Surround > + AOT_ESCAPE = 31, ///< Y Escape Value > + AOT_L1 = 32, ///< Y Layer 1 > + AOT_L2 = 33, ///< Y Layer 2 > + AOT_L3 = 34, ///< Y Layer 3 > + AOT_DST = 35, ///< N Direct Stream Transfer > + AOT_ALS = 36, ///< Y Audio LosslesS > + AOT_SLS = 37, ///< N Scalable LosslesS > + AOT_SLS_NON_CORE = 38, ///< N Scalable LosslesS (non core) > + AOT_ER_AAC_ELD = 39, ///< N Error Resilient Enhanced Low Delay > + AOT_SMR_SIMPLE = 40, ///< N Symbolic Music Representation Simple > + AOT_SMR_MAIN = 41, ///< N Symbolic Music Representation Main > + AOT_USAC = 42, ///< Y Unified Speech and Audio Coding > + AOT_SAOC = 43, ///< N Spatial Audio Object Coding > + AOT_LD_SURROUND = 44, ///< N Low Delay MPEG Surround > }; > > #define MAX_PCE_SIZE 320 ///