commit 5d50097e73cf043666065da7bd50d659fcfc526b
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Apr 26 16:33:15 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 26 16:33:15 2019 +0000
tree 06bb354174836bd0f1960082a6f1382f72e15af7
parent 50e5d0ab91c5d8002fa4f931c3965b42a6a50e35
parent ab2274707383170bc0f8be8a0ecb6901cfcf7561

Merge "Support mkv whose hevc configurationVersion is not 1" into qt-dev

media/libstagefright/Utils.cpp

diff --git a/media/libstagefright/Utils.cpp b/media/libstagefright/Utils.cpp
index 537e4c0..3de934f 100644
--- a/media/libstagefright/Utils.cpp
+++ b/media/libstagefright/Utils.cpp
@@ -1101,7 +1101,9 @@
     } else if (meta->findData(kKeyHVCC, &type, &data, &size)) {
         const uint8_t *ptr = (const uint8_t *)data;
 
-        if (size < 23 || ptr[0] != 1) {  // configurationVersion == 1
+        if (size < 23 || (ptr[0] != 1 && ptr[0] != 0)) {
+            // configurationVersion == 1 or 0
+            // 1 is what the standard dictates, but some old muxers may have used 0.
             ALOGE("b/23680780");
             return BAD_VALUE;
         }