Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b0d62457 authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

am cb90947b: am e1f3976b: Merge "Make sure we cache the sampleTable again if... 

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.
parents 3e8742fa d804a1a2

media/libstagefright/MPEG4Extractor.cpp

+3 −1
Original line number Diff line number Diff line
@@ -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);