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.
This commit is contained in:
Andreas Huber
2010-05-14 16:30:29 -07:00
committed by Android Git Automerger

View File

@@ -499,6 +499,8 @@ status_t MPEG4Extractor::parseChunk(off_t *offset, int depth) {
mDataSource = cachedSource; mDataSource = cachedSource;
} }
} }
mLastTrack->sampleTable = new SampleTable(mDataSource);
} }
bool isTrack = false; bool isTrack = false;
@@ -518,7 +520,6 @@ status_t MPEG4Extractor::parseChunk(off_t *offset, int depth) {
track->includes_expensive_metadata = false; track->includes_expensive_metadata = false;
track->skipTrack = false; track->skipTrack = false;
track->timescale = 0; track->timescale = 0;
track->sampleTable = new SampleTable(mDataSource);
track->meta->setCString(kKeyMIMEType, "application/octet-stream"); track->meta->setCString(kKeyMIMEType, "application/octet-stream");
} }