From c2416f5e9360db0a6a3578fff087392fc7656f38 Mon Sep 17 00:00:00 2001 From: Fraunhofer IIS FDK Date: Tue, 16 Mar 2021 14:51:32 +0100 Subject: Add parameter pointer check to aacEncInfo() encoder API function. Bug: 186777497 Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc Change-Id: I5d758d2708a613382d9ad6d02a9dbe46ae2ef0cf --- libAACenc/include/aacenc_lib.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libAACenc/include/aacenc_lib.h') diff --git a/libAACenc/include/aacenc_lib.h b/libAACenc/include/aacenc_lib.h index 71f7556..f0f23b4 100644 --- a/libAACenc/include/aacenc_lib.h +++ b/libAACenc/include/aacenc_lib.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------------- Software License for The Fraunhofer FDK AAC Codec Library for Android -© Copyright 1995 - 2019 Fraunhofer-Gesellschaft zur Förderung der angewandten +© Copyright 1995 - 2021 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. All rights reserved. 1. INTRODUCTION @@ -1643,7 +1643,7 @@ AACENC_ERROR aacEncEncode(const HANDLE_AACENCODER hAacEncoder, * * \return * - AACENC_OK, on succes. - * - AACENC_INIT_ERROR, on failure. + * - AACENC_INVALID_HANDLE, AACENC_INIT_ERROR, on failure. */ AACENC_ERROR aacEncInfo(const HANDLE_AACENCODER hAacEncoder, AACENC_InfoStruct *pInfo); -- cgit v1.2.3 From 32c697660d9d4d525133322f9d061d42a43e1756 Mon Sep 17 00:00:00 2001 From: Martin Storsjo Date: Fri, 1 Nov 2013 12:06:46 +0200 Subject: Include the encoder library version in the publicly installed header This allows callers to conditionally use new API features without breaking compatibility with the earlier versions of the library. Bug: 261048742 Test: atest android.media.encoder.cts.EncoderTest Change-Id: Icdf18317e120caf8be750a839ae75a6ac8eba142 --- libAACenc/include/aacenc_lib.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'libAACenc/include/aacenc_lib.h') diff --git a/libAACenc/include/aacenc_lib.h b/libAACenc/include/aacenc_lib.h index f0f23b4..22c07c0 100644 --- a/libAACenc/include/aacenc_lib.h +++ b/libAACenc/include/aacenc_lib.h @@ -1005,6 +1005,10 @@ internally. #include "machine_type.h" #include "FDK_audio.h" +#define AACENCODER_LIB_VL0 3 +#define AACENCODER_LIB_VL1 4 +#define AACENCODER_LIB_VL2 12 + /** * AAC encoder error codes. */ -- 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 'libAACenc/include/aacenc_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 477ac94c2d3f759396c41c0b152370637ef8df1a Mon Sep 17 00:00:00 2001 From: wujianxing1 Date: Mon, 3 Apr 2023 14:43:20 +0800 Subject: Correct comment spelling error. Change-Id: I2b0451986e70d0fbb7fefa5bbb95b1ca98e4f7ac Signed-off-by: wujianxing1 --- libAACenc/include/aacenc_lib.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libAACenc/include/aacenc_lib.h') diff --git a/libAACenc/include/aacenc_lib.h b/libAACenc/include/aacenc_lib.h index f0f23b4..cb59287 100644 --- a/libAACenc/include/aacenc_lib.h +++ b/libAACenc/include/aacenc_lib.h @@ -1086,7 +1086,7 @@ typedef struct { write edit lists for gapless playback. The decoder may not know how much delay is introdcued by SBR, since it may not know if SBR is active at all (implicit signaling), - therefore the deocder must take into account any delay + therefore the decoder must take into account any delay caused by the SBR module. */ UCHAR confBuf[64]; /*!< Configuration buffer in binary format as an -- cgit v1.2.3