commit 0cbdc6e62fe08c883562c1bf56bf94203a295e77
author Wei Jia <wjia@google.com> Sat Aug 20 01:15:34 2016 +0000
committer android-build-merger <android-build-merger@google.com> Sat Aug 20 01:15:34 2016 +0000
tree 2607c219311d53b61e1fe4f1238321b3294de463
parent 1c09116464b06c2a69d4be284eb1c6da0478a348
parent 657edb6efbb973fdd85cd3cca74c8e0ce15d050c

MPEG4Extractor: support version 1 for trun box. am: 44a9bf5b01 am: 00fd9ee71f
am: 657edb6efb

Change-Id: I114143ddf23efdfacf3607ea700574faaf0dd77d

media/libstagefright/MPEG4Extractor.cpp

diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index fcd0873..cc2dcd3 100644
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -4212,11 +4212,13 @@
     if (!mDataSource->getUInt32(offset, &flags)) {
         return ERROR_MALFORMED;
     }
-    ALOGV("fragment run flags: %08x", flags);
-
-    if (flags & 0xff000000) {
-        return -EINVAL;
-    }
+    // |version| only affects SampleCompositionTimeOffset field.
+    // If version == 0, SampleCompositionTimeOffset is uint32_t;
+    // Otherwise, SampleCompositionTimeOffset is int32_t.
+    // Sample.compositionOffset is defined as int32_t.
+    uint8_t version = flags >> 24;
+    flags &= 0xffffff;
+    ALOGV("fragment run version: 0x%02x, flags: 0x%06x", version, flags);
 
     if ((flags & kFirstSampleFlagsPresent) && (flags & kSampleFlagsPresent)) {
         // These two shall not be used together.