Merge "Merge Android 14" into main

mstorsjo · Oct 6, 2023 · 5543791 · 5543791
2 parents 6144fcd + 7a4a08d
commit 5543791
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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