diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2014-12-01 19:31:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-12-01 19:31:58 +0000 |
| commit | 66091e46d7aae1b45ed96f5f39274954a296db71 (patch) | |
| tree | 802bd070d3c7633ee8994874259e0838e00db285 | |
| parent | 84851b23d6f65ce03da4fa8ef2348b4f46c0ed0f (diff) | |
| parent | bb1e78a118cab7358b4f5e0cd5c8c21d95576936 (diff) | |
| download | android_external_aac-66091e46d7aae1b45ed96f5f39274954a296db71.tar.gz android_external_aac-66091e46d7aae1b45ed96f5f39274954a296db71.tar.bz2 android_external_aac-66091e46d7aae1b45ed96f5f39274954a296db71.zip | |
Merge "Fix checks for {Front,Side,Back}ElementIsCpe"android-wear-5.0.0_r1
| -rw-r--r-- | Android.mk | 4 | ||||
| -rw-r--r-- | libMpegTPDec/src/tpdec_asc.cpp | 6 |
2 files changed, 3 insertions, 7 deletions
@@ -52,10 +52,6 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/libSBRdec/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 diff --git a/libMpegTPDec/src/tpdec_asc.cpp b/libMpegTPDec/src/tpdec_asc.cpp index 82adec1..bae271e 100644 --- a/libMpegTPDec/src/tpdec_asc.cpp +++ b/libMpegTPDec/src/tpdec_asc.cpp @@ -449,13 +449,13 @@ void CProgramConfig_GetDefault( CProgramConfig *pPce, int el, elTagSce = 0, elTagCpe = 0; 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) { - pPce->SideElementTagSelect[el] = (pPce->SideElementIsCpe) ? elTagCpe++ : elTagSce++; + pPce->SideElementTagSelect[el] = (pPce->SideElementIsCpe[el]) ? elTagCpe++ : elTagSce++; } 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; for (el = 0; el < pPce->NumLfeChannelElements; el += 1) { |