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

Merge remote-tracking branch 'aosp/master'

This commit is contained in:
Martin Storsjo 2015-03-03 10:52:42 +02:00
parent 97b382cd3f 2b6bf8dc09
commit d7fca408b4
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Android.mk
View File

@ -39,7 +39,6 @@ LOCAL_SRC_FILES := \
$(sbrdec_sources:%=libSBRdec/src/%) \ $(sbrdec_sources:%=libSBRdec/src/%) \
$(sbrenc_sources:%=libSBRenc/src/%) $(sbrenc_sources:%=libSBRenc/src/%)
LOCAL_CFLAGS := -DANDROID
LOCAL_CFLAGS += -Wno-sequence-point -Wno-extra LOCAL_CFLAGS += -Wno-sequence-point -Wno-extra
LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES := \
@ -53,10 +52,8 @@ LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/libSBRdec/include \ $(LOCAL_PATH)/libSBRdec/include \
$(LOCAL_PATH)/libSBRenc/include $(LOCAL_PATH)/libSBRenc/include
# In tpdec_asc.cpp: address of array 'pPce->FrontElementIsCpe'
# will always evaluate to 'true'. LOCAL_CPPFLAGS += -std=c++98
LOCAL_CLANG_CPPFLAGS += \
-Wno-pointer-bool-conversion
LOCAL_MODULE:= libFraunhoferAAC LOCAL_MODULE:= libFraunhoferAAC

6
libMpegTPDec/src/tpdec_asc.cpp
View File

@ -449,13 +449,13 @@ void CProgramConfig_GetDefault( CProgramConfig *pPce,
int el, elTagSce = 0, elTagCpe = 0; int el, elTagSce = 0, elTagCpe = 0;
for (el = 0; el < pPce->NumFrontChannelElements; el += 1) { for (el = 0; el < pPce->NumFrontChannelElements; el += 1) {
pPce->FrontElementTagSelect[el] = (pPce->FrontElementIsCpe) ? elTagCpe++ : elTagSce++; pPce->FrontElementTagSelect[el] = (pPce->FrontElementIsCpe[el]) ? elTagCpe++ : elTagSce++;
} }
for (el = 0; el < pPce->NumSideChannelElements; el += 1) { for (el = 0; el < pPce->NumSideChannelElements; el += 1) {
pPce->SideElementTagSelect[el] = (pPce->SideElementIsCpe) ? elTagCpe++ : elTagSce++; pPce->SideElementTagSelect[el] = (pPce->SideElementIsCpe[el]) ? elTagCpe++ : elTagSce++;
} }
for (el = 0; el < pPce->NumBackChannelElements; el += 1) { for (el = 0; el < pPce->NumBackChannelElements; el += 1) {
pPce->BackElementTagSelect[el] = (pPce->BackElementIsCpe) ? elTagCpe++ : elTagSce++; pPce->BackElementTagSelect[el] = (pPce->BackElementIsCpe[el]) ? elTagCpe++ : elTagSce++;
} }
elTagSce = 0; elTagSce = 0;
for (el = 0; el < pPce->NumLfeChannelElements; el += 1) { for (el = 0; el < pPce->NumLfeChannelElements; el += 1) {

2
libSYS/src/genericStds.cpp
View File

@ -116,7 +116,7 @@ amm-info@iis.fraunhofer.de
/* Include OS/System specific implementations. */ /* Include OS/System specific implementations. */
#if defined(__linux__) /* cppp replaced: elif */ #if defined(__linux__) && !defined(__ANDROID__) /* cppp replaced: elif */
#include "linux/genericStds_linux.cpp" #include "linux/genericStds_linux.cpp"
#endif #endif