Merge "Remove __DATE__/__TIME__"
am: a73b059815
* commit 'a73b059815fc35ba689e5a8235b567b2353eabad':
Remove __DATE__/__TIME__
diff --git a/libPCMutils/src/pcmutils_lib.cpp b/libPCMutils/src/pcmutils_lib.cpp
index 3bb1cee..e6ac3ff 100644
--- a/libPCMutils/src/pcmutils_lib.cpp
+++ b/libPCMutils/src/pcmutils_lib.cpp
@@ -88,7 +88,7 @@
expansion in the PCM time domain.
*******************************************************************************/
-
+#include <log/log.h>
#include "pcmutils_lib.h"
#include "genericStds.h"
@@ -2078,7 +2078,10 @@
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) {