diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2016-04-05 17:43:33 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-05 17:43:33 +0000 |
| commit | 65750eae6583754ea9d84fed41dc12d1fc3d73d0 (patch) | |
| tree | a8dc54ef8dba931c72627e7bbebf1844b81a31f7 /libSBRdec/src/sbrdecoder.cpp | |
| parent | 0713b4acff1a489e7d49725dc7c5e3dad370b5c8 (diff) | |
| parent | e1c78ed73faa51f2c7fcb0c4a17a92be9cc747f5 (diff) | |
| download | fdk-aac-65750eae6583754ea9d84fed41dc12d1fc3d73d0.tar.gz fdk-aac-65750eae6583754ea9d84fed41dc12d1fc3d73d0.tar.bz2 fdk-aac-65750eae6583754ea9d84fed41dc12d1fc3d73d0.zip | |
SBR/AAC encoder updates, code clean up
am: e1c78ed
* commit 'e1c78ed73faa51f2c7fcb0c4a17a92be9cc747f5':
SBR/AAC encoder updates, code clean up
Change-Id: I908adc47823de593c3e258c67f360da9321780f5
Diffstat (limited to 'libSBRdec/src/sbrdecoder.cpp')
| -rw-r--r-- | libSBRdec/src/sbrdecoder.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libSBRdec/src/sbrdecoder.cpp b/libSBRdec/src/sbrdecoder.cpp index 619e4fd..e15145a 100644 --- a/libSBRdec/src/sbrdecoder.cpp +++ b/libSBRdec/src/sbrdecoder.cpp @@ -2,7 +2,7 @@ /* ----------------------------------------------------------------------------------------------------------- Software License for The Fraunhofer FDK AAC Codec Library for Android -© Copyright 1995 - 2013 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. +© Copyright 1995 - 2015 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. All rights reserved. 1. INTRODUCTION @@ -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 6 +#define SBRDECODER_LIB_VL2 7 #define SBRDECODER_LIB_TITLE "SBR Decoder" #ifdef __ANDROID__ #define SBRDECODER_LIB_BUILD_DATE "" @@ -318,7 +318,6 @@ SBR_ERROR sbrDecoder_ResetElement ( case AOT_PS: case AOT_ER_AAC_SCAL: case AOT_DRM_AAC: - case AOT_DRM_SURROUND: if (CreatePsDec ( &self->hParametricStereoDec, samplesPerFrame )) { sbrError = SBRDEC_CREATE_ERROR; goto bail; @@ -503,7 +502,6 @@ SBR_ERROR sbrDecoder_InitElement ( case AOT_PS: case AOT_ER_AAC_SCAL: case AOT_DRM_AAC: - case AOT_DRM_SURROUND: elChannels = 2; break; default: |