fenix
/
fdk-aac
mirror of https://github.com/mstorsjo/fdk-aac.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

am 9f42dfb7: am b3c5a4bb: Fix crash on invalid channel config 

* commit '9f42dfb7990a107da23454669459bb5e28d90726':
  Fix crash on invalid channel config
This commit is contained in:
Marco Nelissen 2015-09-15 02:12:36 +00:00 committed by Android Git Automerger
parent 8e8d920708 9f42dfb799
commit 106fb85b42
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libPCMutils/src/pcmutils_lib.cpp
View File

@ -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"
@ -2073,7 +2073,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) {