commit 06a2b7240fca5b4f9f6d2668b4fd0b9d11d0cfdb
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Feb 26 19:10:06 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 26 19:10:06 2019 +0000
tree 6ca0e681250366874d246f995c82d59eef20cb97
parent 229e087f918f8459f5bffce6f8214d62455ede38
parent 495d7b1986720f3716bd47cfd838a20f820a08c5

Merge "Fix EAC3 bsid parsing"

media/extractors/mp4/MPEG4Extractor.cpp

diff --git a/media/extractors/mp4/MPEG4Extractor.cpp b/media/extractors/mp4/MPEG4Extractor.cpp
index 4b4d767..c776c51 100755
--- a/media/extractors/mp4/MPEG4Extractor.cpp
+++ b/media/extractors/mp4/MPEG4Extractor.cpp
@@ -3021,8 +3021,10 @@
         }
 
         unsigned bsid = br.getBits(5);
-        if (bsid < 8) {
-            ALOGW("Incorrect bsid in EAC3 header. Possibly AC-3?");
+        if (bsid == 9 || bsid == 10) {
+            ALOGW("EAC3 stream (bsid=%d) may be silenced by the decoder", bsid);
+        } else if (bsid > 16) {
+            ALOGE("EAC3 stream (bsid=%d) is not compatible with ETSI TS 102 366 v1.4.1", bsid);
             delete[] chunk;
             return ERROR_MALFORMED;
         }