commit 1edbcb2bb9988cc7cb54a865aaea4613bdd53a9d
author Andreas Huber <andih@google.com> Fri May 14 15:28:51 2010 -0700
committer Andreas Huber <andih@google.com> Fri May 14 15:32:21 2010 -0700
tree 962de13061feaa0d428f33f8c94ced16c8bcf343
parent a945bfd91aa291fba4d9201ffcb38fce40eab7fe

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

Change-Id: I576178144ffd753b809e1c4ae269ffc3aa34b511
related-to-bug: 2686604
QA-Impact: well, ..., everything related to streaming mpeg4/aac content over http

media/libstagefright/MPEG4Extractor.cpp

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 @@
                         mDataSource = cachedSource;
                     }
                 }
+
+                mLastTrack->sampleTable = new SampleTable(mDataSource);
             }
 
             bool isTrack = false;
@@ -518,7 +520,6 @@
                 track->includes_expensive_metadata = false;
                 track->skipTrack = false;
                 track->timescale = 0;
-                track->sampleTable = new SampleTable(mDataSource);
                 track->meta->setCString(kKeyMIMEType, "application/octet-stream");
             }