diff options
| author | Andreas Huber <andih@google.com> | 2010-10-15 08:49:31 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-15 08:49:31 -0700 |
| commit | e1f3976bb4eab0d7c46bc8596679d4d00695148c (patch) | |
| tree | ec0e66bffbc05cb2048878ea41cd5b840f377743 | |
| parent | feebaf35c0edaed87edc6eb33a33ad9df1a209d6 (diff) | |
| parent | 6da2ae11b62f155ee83c3e31fdd9cc53b2058586 (diff) | |
| download | frameworks_base-e1f3976bb4eab0d7c46bc8596679d4d00695148c.zip frameworks_base-e1f3976bb4eab0d7c46bc8596679d4d00695148c.tar.gz frameworks_base-e1f3976bb4eab0d7c46bc8596679d4d00695148c.tar.bz2 | |
Merge "Make sure we cache the sampleTable again if using the caching datasource." into gingerbread
| -rw-r--r-- | media/libstagefright/MPEG4Extractor.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp index 4bbc251..f404708 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -498,7 +498,9 @@ status_t MPEG4Extractor::parseChunk(off_t *offset, int depth) { if (chunk_type == FOURCC('s', 't', 'b', 'l')) { LOGV("sampleTable chunk is %d bytes long.", (size_t)chunk_size); - if (mDataSource->flags() & DataSource::kWantsPrefetching) { + if (mDataSource->flags() + & (DataSource::kWantsPrefetching + | DataSource::kIsCachingDataSource)) { sp<MPEG4DataSource> cachedSource = new MPEG4DataSource(mDataSource); |