From 09cf32a6c7f5f0a3d9be6b8b0018211a86d9a57a Mon Sep 17 00:00:00 2001 From: Fraunhofer IIS FDK Date: Tue, 16 Mar 2021 14:52:07 +0100 Subject: Refine aacDecoder_DecodeFrame() output buffer parameter type description. Bug: 186777497 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: I83a460d03c7cde3e4f74011a7c3556c4cfd08cdd --- libAACdec/include/aacdecoder_lib.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libAACdec/include/aacdecoder_lib.h') diff --git a/libAACdec/include/aacdecoder_lib.h b/libAACdec/include/aacdecoder_lib.h index 56f4ec1..d7928c0 100644 --- a/libAACdec/include/aacdecoder_lib.h +++ b/libAACdec/include/aacdecoder_lib.h @@ -1032,7 +1032,7 @@ LINKSPEC_H AAC_DECODER_ERROR aacDecoder_Fill(HANDLE_AACDECODER self, * \param self AAC decoder handle. * \param pTimeData Pointer to external output buffer where the decoded PCM * samples will be stored into. - * \param timeDataSize Size of external output buffer. + * \param timeDataSize Size of external output buffer in PCM samples. * \param flags Bit field with flags for the decoder: \n * (flags & AACDEC_CONCEAL) == 1: Do concealment. \n * (flags & AACDEC_FLUSH) == 2: Discard input data. Flush -- cgit v1.2.3 From 7cb7d8c181837f437152a8edcfd3c0f9c6e3f68c Mon Sep 17 00:00:00 2001 From: Martin Storsjo Date: Tue, 17 Nov 2020 12:41:48 +0200 Subject: Update the version numbers in the public installed headers Bug: 261048742 Test: atest android.media.encoder.cts.EncoderTest Change-Id: I44537c067e6ef34e77a67d02d8e9a8e9dfffab92 --- libAACdec/include/aacdecoder_lib.h | 4 ++++ libAACenc/include/aacenc_lib.h | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'libAACdec/include/aacdecoder_lib.h') diff --git a/libAACdec/include/aacdecoder_lib.h b/libAACdec/include/aacdecoder_lib.h index d7928c0..02596b2 100644 --- a/libAACdec/include/aacdecoder_lib.h +++ b/libAACdec/include/aacdecoder_lib.h @@ -431,6 +431,10 @@ Where N equals to CStreamInfo::frameSize . #include "machine_type.h" #include "FDK_audio.h" +#define AACDECODER_LIB_VL0 3 +#define AACDECODER_LIB_VL1 2 +#define AACDECODER_LIB_VL2 0 + #include "genericStds.h" /** * \brief AAC decoder error codes. diff --git a/libAACenc/include/aacenc_lib.h b/libAACenc/include/aacenc_lib.h index 22c07c0..faf9bb1 100644 --- a/libAACenc/include/aacenc_lib.h +++ b/libAACenc/include/aacenc_lib.h @@ -1005,9 +1005,9 @@ internally. #include "machine_type.h" #include "FDK_audio.h" -#define AACENCODER_LIB_VL0 3 -#define AACENCODER_LIB_VL1 4 -#define AACENCODER_LIB_VL2 12 +#define AACENCODER_LIB_VL0 4 +#define AACENCODER_LIB_VL1 0 +#define AACENCODER_LIB_VL2 1 /** * AAC encoder error codes. -- cgit v1.2.3 From ecb781c5af9e925806050d6852a52cbdbeeb81d0 Mon Sep 17 00:00:00 2001 From: Martin Storsjo Date: Fri, 6 Oct 2023 16:16:43 +0300 Subject: Remove duplicate AACDECODER_LIB_VL* This was applied upstream in 7cb7d8c181837f437152a8edcfd3c0f9c6e3f68c. --- libAACdec/include/aacdecoder_lib.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'libAACdec/include/aacdecoder_lib.h') diff --git a/libAACdec/include/aacdecoder_lib.h b/libAACdec/include/aacdecoder_lib.h index a009ba0..02596b2 100644 --- a/libAACdec/include/aacdecoder_lib.h +++ b/libAACdec/include/aacdecoder_lib.h @@ -436,11 +436,6 @@ Where N equals to CStreamInfo::frameSize . #define AACDECODER_LIB_VL2 0 #include "genericStds.h" - -#define AACDECODER_LIB_VL0 3 -#define AACDECODER_LIB_VL1 2 -#define AACDECODER_LIB_VL2 0 - /** * \brief AAC decoder error codes. */ -- cgit v1.2.3