commit 08470ab61d437289bee05257ef1edd8987ccf1dd
author Marco Nelissen <marcone@google.com> Wed Dec 12 10:00:30 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 12 10:00:30 2012 -0800
tree e73246d5d16654d9d0dcbb36dc0ef3cf74df1bfc
parent efc0cfb61e34c3bc688a7cbcc1ccef23922251c1
parent 86355f5b1ef6c6434d8717c71428e3165b0fe7b5

Merge "Fix timestamps after seek"

media/libstagefright/mp4/FragmentedMP4Parser.cpp

diff --git a/media/libstagefright/mp4/FragmentedMP4Parser.cpp b/media/libstagefright/mp4/FragmentedMP4Parser.cpp
index 54c3d63..7aa5be9 100644
--- a/media/libstagefright/mp4/FragmentedMP4Parser.cpp
+++ b/media/libstagefright/mp4/FragmentedMP4Parser.cpp
@@ -319,8 +319,7 @@
         off_t totalOffset = mFirstMoofOffset;
         for (int i = 0; i < numSidxEntries; i++) {
             const SidxEntry *se = &info->mSidx[i];
-            totalTime += se->mDurationUs;
-            if (totalTime > position) {
+            if (totalTime + se->mDurationUs > position) {
                 mBuffer->setRange(0,0);
                 mBufferPos = totalOffset;
                 if (mFinalResult == ERROR_END_OF_STREAM) {
@@ -329,9 +328,10 @@
                     resumeIfNecessary();
                 }
                 info->mFragments.clear();
-                info->mDecodingTime = position * info->mMediaTimeScale / 1000000ll;
+                info->mDecodingTime = totalTime * info->mMediaTimeScale / 1000000ll;
                 return OK;
             }
+            totalTime += se->mDurationUs;
             totalOffset += se->mSize;
         }
     }