commit 22fd463e1464552624597a338d2449dd4d670751
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jun 28 00:41:47 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 28 00:41:48 2017 +0000
tree 9cae4f29e9a87f9ffa5772bd421ddf78a07a6e7b
parent 66feec9ff333bbf0b2590f1b321fbf880e1405a4
parent a9292fe1c19e8a9b43398ba3d69284c215d7589f

Merge "MPEG4Writer: initialize track start time" into oc-dr1-dev

media/libstagefright/MPEG4Writer.cpp

diff --git a/media/libstagefright/MPEG4Writer.cpp b/media/libstagefright/MPEG4Writer.cpp
index 52e1626..7e0c164 100644
--- a/media/libstagefright/MPEG4Writer.cpp
+++ b/media/libstagefright/MPEG4Writer.cpp
@@ -1630,6 +1630,7 @@
       mCodecSpecificDataSize(0),
       mGotAllCodecSpecificData(false),
       mReachedEOS(false),
+      mStartTimestampUs(-1),
       mRotation(0) {
     getCodecSpecificDataFromInputFormatIfPossible();
 
@@ -3650,7 +3651,7 @@
 int64_t MPEG4Writer::Track::getStartTimeOffsetScaledTimeUs() const {
     int64_t trackStartTimeOffsetUs = 0;
     int64_t moovStartTimeUs = mOwner->getStartTimestampUs();
-    if (mStartTimestampUs != moovStartTimeUs) {
+    if (mStartTimestampUs != -1 && mStartTimestampUs != moovStartTimeUs) {
         CHECK_GT(mStartTimestampUs, moovStartTimeUs);
         trackStartTimeOffsetUs = mStartTimestampUs - moovStartTimeUs;
     }