diff options
| author | Fraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de> | 2018-05-04 17:41:40 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-05-04 17:41:40 -0700 |
| commit | b2ce5c82bd4288b0e55d23f8cbf1d51150d752fc (patch) | |
| tree | 8bf6f33f28355cd7dd6c4f5a01c5324a43ec66bc /libMpegTPDec/src/tpdec_asc.cpp | |
| parent | 2ef3dc81e5bfa012a5b1b7fce573fdd1b73130e8 (diff) | |
| parent | 259a3c5bd5eb9be666f40dfb2978502533dd2b82 (diff) | |
| download | fdk-aac-b2ce5c82bd4288b0e55d23f8cbf1d51150d752fc.tar.gz fdk-aac-b2ce5c82bd4288b0e55d23f8cbf1d51150d752fc.tar.bz2 fdk-aac-b2ce5c82bd4288b0e55d23f8cbf1d51150d752fc.zip | |
FDKv2 additional fixes am: 9ab67882ec
am: 259a3c5bd5
Change-Id: Iac5c03364819ea0ef7a91cccfc0b62af0b19b612
Diffstat (limited to 'libMpegTPDec/src/tpdec_asc.cpp')
| -rw-r--r-- | libMpegTPDec/src/tpdec_asc.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libMpegTPDec/src/tpdec_asc.cpp b/libMpegTPDec/src/tpdec_asc.cpp index abe66e5..74beaa6 100644 --- a/libMpegTPDec/src/tpdec_asc.cpp +++ b/libMpegTPDec/src/tpdec_asc.cpp @@ -2488,7 +2488,7 @@ TRANSPORTDEC_ERROR DrmRawSdcAudioConfig_Parse( switch (audioCoding) { case 0: /* AAC */ - if (coderField >> 2) { + if ((coderField >> 2) && (audioMode != 1)) { self->m_aot = AOT_DRM_SURROUND; /* Set pseudo AOT for Drm Surround */ } else { self->m_aot = AOT_DRM_AAC; /* Set pseudo AOT for Drm AAC */ |