commit c151787b4fc0f0e362d7730e1919fe04e400687d
author Andreas Huber <andih@google.com> Fri May 14 16:34:24 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri May 14 16:34:24 2010 -0700
tree da85d0a56615daf324ccce9eeb8544906185f0ea
parent e0ddfe33b9480acf3d8c3941f96bdc262d0abc47
parent ea10bc6158caa9f595c85a3dc3517d88ee989001

am bc30d1d8: am 5d75a181: am a5cd816c: 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.

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");
             }