Merge "Fix EAC3 bsid parsing"

5 years ago · 06a2b7240f
parent 229e087f91 495d7b1986
commit 06a2b7240f
1 changed files with 4 additions and 2 deletions
--- a/media/extractors/mp4/MPEG4Extractor.cpp
+++ b/media/extractors/mp4/MPEG4Extractor.cpp
@ -3021,8 +3021,10 @@ status_t MPEG4Extractor::parseEAC3SpecificBox(off64_t offset) {
        }

        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;
        }