commit d804a1a27b42541157fddf725593d4e2ccaa6ad5
author Andreas Huber <andih@google.com> Fri Oct 15 08:54:17 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Oct 15 08:54:17 2010 -0700
tree 0b8b7c7a30cbdf27ae48aa58a44277f35aec13a1
parent 8cde59da2dd8540466aff5e94e9a6e5f74df1f10
parent b9d3038ec950665639e26acd51329ebc800e780d

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

Merge commit 'e1f3976bb4eab0d7c46bc8596679d4d00695148c' into gingerbread-plus-aosp

* commit 'e1f3976bb4eab0d7c46bc8596679d4d00695148c':
  Make sure we cache the sampleTable again if using the caching datasource.

media/libstagefright/MPEG4Extractor.cpp

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 @@
             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);