am eb9128f9: Fix sampleTable instantiation, this makes sure that the sample table refers to the custom datasource that caches the metadata to prevent needless seeking.

Merge commit 'eb9128f9b0ee660504621381fd96f82d5bf8a3fd' into froyo-plus-aosp

* commit 'eb9128f9b0ee660504621381fd96f82d5bf8a3fd':
  Fix sampleTable instantiation, this makes sure that the sample table refers to the custom datasource that caches the metadata to prevent needless seeking.

1 files changed, 2 insertions, 1 deletions

diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index 323f145..a41b2f4 100644
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -499,6 +499,8 @@ status_t MPEG4Extractor::parseChunk(off_t *offset, int depth) {
                         mDataSource = cachedSource;
                     }
                 }
+
+                mLastTrack->sampleTable = new SampleTable(mDataSource);
             }
 
             bool isTrack = false;
@@ -518,7 +520,6 @@ status_t MPEG4Extractor::parseChunk(off_t *offset, int depth) {
                 track->includes_expensive_metadata = false;
                 track->skipTrack = false;
                 track->timescale = 0;
-                track->sampleTable = new SampleTable(mDataSource);
                 track->meta->setCString(kKeyMIMEType, "application/octet-stream");
             }