Merge "Make sure we cache the sampleTable again if using the caching datasource." into gingerbread

2010-10-15 08:49:31 -07:00
parent feebaf35c0 6da2ae11b6
commit e1f3976bb4
1 changed files with 3 additions and 1 deletions
--- 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);