Skip to content

F
fdk-aac
Commit 66091e46 authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh Committed by Gerrit Code Review
Browse files
Options

Merge "Fix checks for {Front,Side,Back}ElementIsCpe"

parents 84851b23 bb1e78a1
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 7 deletions
Android.mk
View file @ 66091e46
...@@ -52,10 +52,6 @@ LOCAL_C_INCLUDES := \ ...@@ -52,10 +52,6 @@ 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_CLANG_CPPFLAGS += \
-Wno-pointer-bool-conversion
LOCAL_CPPFLAGS += -std=c++98 LOCAL_CPPFLAGS += -std=c++98
......
libMpegTPDec/src/tpdec_asc.cpp
View file @ 66091e46
...@@ -449,13 +449,13 @@ void CProgramConfig_GetDefault( CProgramConfig *pPce, ...@@ -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) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment