diff options
| author | Timothy Gu <timothygu99@gmail.com> | 2016-01-26 11:57:49 -0800 |
|---|---|---|
| committer | Timothy Gu <timothygu99@gmail.com> | 2016-01-26 11:57:49 -0800 |
| commit | c8ad7a2ef919a54e2549df097bcf37838e6381b1 (patch) | |
| tree | 735fe06eedc3ffa43956f9adad4765c3b244e002 /libPCMutils/src/pcmutils_lib.cpp | |
| parent | 047376af8c47d45c78204112a7d1b873c93822bc (diff) | |
| parent | ca249e444bd59c5b2c3a094108f6c489f8ce80e1 (diff) | |
| download | fdk-aac-c8ad7a2ef919a54e2549df097bcf37838e6381b1.tar.gz fdk-aac-c8ad7a2ef919a54e2549df097bcf37838e6381b1.tar.bz2 fdk-aac-c8ad7a2ef919a54e2549df097bcf37838e6381b1.zip | |
Merge remote-tracking branch 'aosp/master' into update
Diffstat (limited to 'libPCMutils/src/pcmutils_lib.cpp')
| -rw-r--r-- | libPCMutils/src/pcmutils_lib.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/libPCMutils/src/pcmutils_lib.cpp b/libPCMutils/src/pcmutils_lib.cpp index 32d8437..e6ac3ff 100644 --- a/libPCMutils/src/pcmutils_lib.cpp +++ b/libPCMutils/src/pcmutils_lib.cpp @@ -88,7 +88,7 @@ amm-info@iis.fraunhofer.de expansion in the PCM time domain. *******************************************************************************/ - +#include <log/log.h> #include "pcmutils_lib.h" #include "genericStds.h" @@ -150,8 +150,13 @@ amm-info@iis.fraunhofer.de #define PCMDMX_LIB_VL1 4 #define PCMDMX_LIB_VL2 2 #define PCMDMX_LIB_TITLE "PCM Downmix Lib" +#ifdef __ANDROID__ +#define PCMDMX_LIB_BUILD_DATE "" +#define PCMDMX_LIB_BUILD_TIME "" +#else #define PCMDMX_LIB_BUILD_DATE __DATE__ #define PCMDMX_LIB_BUILD_TIME __TIME__ +#endif /* Fixed and unique channel group indices. @@ -2073,7 +2078,10 @@ PCMDMX_ERROR pcmDmx_ApplyFrame ( map[ch++] = inCh; } } - FDK_ASSERT(ch == numInChannels); + if (ch != numInChannels) { + ALOGE("b/23876444"); + return PCMDMX_INVALID_ARGUMENT; + } /* Remove unused cols from factor matrix */ for (inCh=0; inCh < numInChannels; inCh+=1) { |