fenix/fdk-aac
1
0
Fork 0
mirror of https://github.com/mstorsjo/fdk-aac.git synced 2025-02-16 19:30:34 +01:00
Code Issues Projects Releases Wiki Activity

Merge Android U (ab/10368041)

Browse Source 
Bug: 291102124
Merged-In: Icf5305a7da47fb85235f428151f2fed10f4aa2f4
Change-Id: I1d3004de1db114ad88224d8b7d4aaeec0d1fe23d
This commit is contained in:
Xin Li 2023-08-14 15:36:13 -07:00
commit ff7af5c8e6
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libAACdec/include/aacdecoder_lib.h
View File

@ -431,6 +431,10 @@ Where N equals to CStreamInfo::frameSize .
#include "machine_type.h" #include "machine_type.h"
#include "FDK_audio.h" #include "FDK_audio.h"
#define AACDECODER_LIB_VL0 3
#define AACDECODER_LIB_VL1 2
#define AACDECODER_LIB_VL2 0
#include "genericStds.h" #include "genericStds.h"
/** /**
* \brief AAC decoder error codes. * \brief AAC decoder error codes.

4
libAACenc/include/aacenc_lib.h
View File

@ -1005,6 +1005,10 @@ internally.
#include "machine_type.h" #include "machine_type.h"
#include "FDK_audio.h" #include "FDK_audio.h"
#define AACENCODER_LIB_VL0 4
#define AACENCODER_LIB_VL1 0
#define AACENCODER_LIB_VL2 1
/** /**
* AAC encoder error codes. * AAC encoder error codes.
*/ */

4
libSBRdec/src/lpp_tran.h
View File

@ -1,7 +1,7 @@
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Software License for The Fraunhofer FDK AAC Codec Library for Android 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. Forschung e.V. All rights reserved.
1. INTRODUCTION 1. INTRODUCTION
@ -207,7 +207,7 @@ typedef struct {
inverse filtering levels */ inverse filtering levels */
PATCH_PARAM PATCH_PARAM
patchParam[MAX_NUM_PATCHES]; /*!< new parameter set for patching */ patchParam[MAX_NUM_PATCHES + 1]; /*!< new parameter set for patching */
WHITENING_FACTORS WHITENING_FACTORS
whFactors; /*!< the pole moving factors for certain whFactors; /*!< the pole moving factors for certain
whitening levels as indicated in the bitstream whitening levels as indicated in the bitstream