diff options
| author | Xin Li <delphij@google.com> | 2023-10-06 05:38:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-10-06 05:38:52 +0000 |
| commit | 5543791bdc52c6de2f7274b8d5def73996e6d097 (patch) | |
| tree | d5d21ddc6ca4a229ef268083c33d8dd1ced8e92d | |
| parent | 6144fcd3a6d30f4f257928b85df11205dfe44567 (diff) | |
| parent | 7a4a08dbf0b90b5b5a70e9dce975046e9c2b8f24 (diff) | |
| download | fdk-aac-5543791bdc52c6de2f7274b8d5def73996e6d097.tar.gz fdk-aac-5543791bdc52c6de2f7274b8d5def73996e6d097.tar.bz2 fdk-aac-5543791bdc52c6de2f7274b8d5def73996e6d097.zip | |
Merge "Merge Android 14" into main
| -rw-r--r-- | libAACdec/include/aacdecoder_lib.h | 4 | ||||
| -rw-r--r-- | libAACenc/include/aacenc_lib.h | 4 | ||||
| -rw-r--r-- | libSBRdec/src/lpp_tran.h | 4 |
3 files changed, 10 insertions, 2 deletions
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 cb59287..4f8f223 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 4 +#define AACENCODER_LIB_VL1 0 +#define AACENCODER_LIB_VL2 1 + /** * AAC encoder error codes. */ diff --git a/libSBRdec/src/lpp_tran.h b/libSBRdec/src/lpp_tran.h index 51b4395..21c4101 100644 --- a/libSBRdec/src/lpp_tran.h +++ b/libSBRdec/src/lpp_tran.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------------- Software License for The Fraunhofer FDK AAC Codec Library for Android -© Copyright 1995 - 2018 Fraunhofer-Gesellschaft zur Förderung der angewandten +© Copyright 1995 - 2023 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. All rights reserved. 1. INTRODUCTION @@ -207,7 +207,7 @@ typedef struct { inverse filtering levels */ PATCH_PARAM - patchParam[MAX_NUM_PATCHES]; /*!< new parameter set for patching */ + patchParam[MAX_NUM_PATCHES + 1]; /*!< new parameter set for patching */ WHITENING_FACTORS whFactors; /*!< the pole moving factors for certain whitening levels as indicated in the bitstream |