diff options
author | Andreas Huber <andih@google.com> | 2010-05-14 16:30:29 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-14 16:30:29 -0700 |
commit | ea10bc6158caa9f595c85a3dc3517d88ee989001 (patch) | |
tree | 6514ef7d81dc9272abb2c9cc5b05148f391b9f2d | |
parent | a326071ff872d5a197efbf27b9ab6653a90f0734 (diff) | |
parent | c0b42f27a36c96b0ce16ade57c26ff1decb4bb72 (diff) | |
download | frameworks_av-ea10bc6158caa9f595c85a3dc3517d88ee989001.zip frameworks_av-ea10bc6158caa9f595c85a3dc3517d88ee989001.tar.gz frameworks_av-ea10bc6158caa9f595c85a3dc3517d88ee989001.tar.bz2 |
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.
Merge commit 'a5cd816c720ed87b91a33aa5d000a0d308c74453' into kraken
* commit 'a5cd816c720ed87b91a33aa5d000a0d308c74453':
Fix sampleTable instantiation, this makes sure that the sample table refers to the custom datasource that caches the metadata to prevent needless seeking.
-rw-r--r-- | media/libstagefright/MPEG4Extractor.cpp | 3 |
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"); } |