From fd3d7be9c08461b97d984eb59dbae12f035be2ac Mon Sep 17 00:00:00 2001 From: aquilescanta Date: Wed, 24 Aug 2016 09:49:28 -0700 Subject: [PATCH] Fix data_offset not present bug in FragmentedMp4Extractor ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=131183033 --- .../exoplayer2/extractor/mp4/FragmentedMp4Extractor.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java b/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java index 03f165f0d8..152785e654 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java @@ -664,8 +664,9 @@ public final class FragmentedMp4Extractor implements Extractor { DefaultSampleValues defaultSampleValues = fragment.header; fragment.trunLength[index] = trun.readUnsignedIntToInt(); + fragment.trunDataPosition[index] = fragment.dataPosition; if ((atomFlags & 0x01 /* data_offset_present */) != 0) { - fragment.trunDataPosition[index] = fragment.dataPosition + trun.readInt(); + fragment.trunDataPosition[index] += trun.readInt(); } boolean firstSampleFlagsPresent = (atomFlags & 0x04 /* first_sample_flags_present */) != 0;