commit b0d62457a9630b144187dcd5b143ee9c91f591d0
author Andreas Huber <andih@google.com> Sat Oct 16 09:14:06 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Sat Oct 16 09:14:06 2010 -0700
tree 63a601d4d34d33e8f265a82d668080ee6f87ab69
parent 3e8742fa4a5f0f8b185274763f6ec4e6c3a89344
parent d804a1a27b42541157fddf725593d4e2ccaa6ad5

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

Merge commit 'cb90947bf8ed2c898c1b7e529dd0c99d112ed611'

* commit 'cb90947bf8ed2c898c1b7e529dd0c99d112ed611':
  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);