commit c8ed1e78eb7c6de6be33c2ab65ba1aa31ee2828a
author Robert Shih <robertshih@google.com> Thu Sep 22 16:23:29 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Sep 22 16:23:29 2016 +0000
tree 71d93fee96a46e53d4d7f5b80149e178800c0e17
parent ded7c50d67514ddc85b1f4761003fa8294de2632
parent 14b2e8b50ad25b6929e39296b00ede7b138e2f5d

SampleIterator: clear members on seekTo error am: 03237ce0f9 am: 8468b8980c am: e0d588b892 am: d4ddd555f1 am: f72b9e0011 am: 21beb40cec am: dcaab8eda7 am: a38b5af18b am: 95eb4e7637 am: 4cb3841534
am: 14b2e8b50a

Change-Id: I0635e2b2e5cb31601c64533b6e281bd763d56350

media/libstagefright/SampleIterator.cpp

diff --git a/media/libstagefright/SampleIterator.cpp b/media/libstagefright/SampleIterator.cpp
index ad7b6fd..54c9fa3 100644
--- a/media/libstagefright/SampleIterator.cpp
+++ b/media/libstagefright/SampleIterator.cpp
@@ -94,8 +94,6 @@
         + mFirstChunk;
 
     if (!mInitialized || chunk != mCurrentChunkIndex) {
-        mCurrentChunkIndex = chunk;
-
         status_t err;
         if ((err = getChunkOffset(chunk, &mCurrentChunkOffset)) != OK) {
             ALOGE("getChunkOffset return error");
@@ -106,18 +104,21 @@
 
         uint32_t firstChunkSampleIndex =
             mFirstChunkSampleIndex
-                + mSamplesPerChunk * (mCurrentChunkIndex - mFirstChunk);
+                + mSamplesPerChunk * (chunk - mFirstChunk);
 
         for (uint32_t i = 0; i < mSamplesPerChunk; ++i) {
             size_t sampleSize;
             if ((err = getSampleSizeDirect(
                             firstChunkSampleIndex + i, &sampleSize)) != OK) {
                 ALOGE("getSampleSizeDirect return error");
+                mCurrentChunkSampleSizes.clear();
                 return err;
             }
 
             mCurrentChunkSampleSizes.push(sampleSize);
         }
+
+        mCurrentChunkIndex = chunk;
     }
 
     uint32_t chunkRelativeSampleIndex =