diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2013-08-27 15:57:28 -0700 |
|---|---|---|
| committer | Jean-Michel Trivi <jmtrivi@google.com> | 2013-08-27 15:57:28 -0700 |
| commit | 3a0a695565d1d360f9a82173469c8ef858bc08a0 (patch) | |
| tree | 11ca521b5ca3b674f02a605d0fc08d11624b205f /libSBRdec | |
| parent | 16c472c201c197d3660334df5952eb4084897f9f (diff) | |
| download | fdk-aac-3a0a695565d1d360f9a82173469c8ef858bc08a0.tar.gz fdk-aac-3a0a695565d1d360f9a82173469c8ef858bc08a0.tar.bz2 fdk-aac-3a0a695565d1d360f9a82173469c8ef858bc08a0.zip | |
FDK update for downsampled SBR
Add missing support for downsampled SBR in libFDK
Bug 9428126
Change-Id: Idb732f8d31a115d36dd4b22916599db7fab98cae
Diffstat (limited to 'libSBRdec')
| -rw-r--r-- | libSBRdec/src/sbr_dec.cpp | 4 | ||||
| -rw-r--r-- | libSBRdec/src/sbrdecoder.cpp | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/libSBRdec/src/sbr_dec.cpp b/libSBRdec/src/sbr_dec.cpp index e5922f1..1282338 100644 --- a/libSBRdec/src/sbr_dec.cpp +++ b/libSBRdec/src/sbr_dec.cpp @@ -760,6 +760,8 @@ createSbrDec (SBR_CHANNEL * hSbrChannel, */ { int qmfErr; + /* Adapted QMF analysis post-twiddles for down-sampled HQ SBR */ + const UINT downSampledFlag = (downsampleFac==2) ? QMF_FLAG_DOWNSAMPLED : 0; qmfErr = qmfInitAnalysisFilterBank ( &hs->AnalysiscQMF, @@ -768,7 +770,7 @@ createSbrDec (SBR_CHANNEL * hSbrChannel, hHeaderData->freqBandData.lowSubband, hHeaderData->freqBandData.highSubband, hHeaderData->numberOfAnalysisBands, - qmfFlags & (~QMF_FLAG_KEEP_STATES) + (qmfFlags & (~QMF_FLAG_KEEP_STATES)) | downSampledFlag ); if (qmfErr != 0) { return SBRDEC_UNSUPPORTED_CONFIG; diff --git a/libSBRdec/src/sbrdecoder.cpp b/libSBRdec/src/sbrdecoder.cpp index 830fd1e..a0668bd 100644 --- a/libSBRdec/src/sbrdecoder.cpp +++ b/libSBRdec/src/sbrdecoder.cpp @@ -137,7 +137,7 @@ amm-info@iis.fraunhofer.de /* Decoder library info */ #define SBRDECODER_LIB_VL0 2 #define SBRDECODER_LIB_VL1 2 -#define SBRDECODER_LIB_VL2 0 +#define SBRDECODER_LIB_VL2 1 #define SBRDECODER_LIB_TITLE "SBR Decoder" #define SBRDECODER_LIB_BUILD_DATE __DATE__ #define SBRDECODER_LIB_BUILD_TIME __TIME__ |