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

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

am eb9128f9: Fix sampleTable instantiation, this makes sure that the sample... 

am eb9128f9: Fix sampleTable instantiation, this makes sure that the sample table refers to the custom datasource that caches the metadata to prevent needless seeking.

Merge commit 'eb9128f9' into froyo-plus-aosp

* commit 'eb9128f9':
  Fix sampleTable instantiation, this makes sure that the sample table refers to the custom datasource that caches the metadata to prevent needless seeking.
parents 900b6157 eb9128f9

media/libstagefright/MPEG4Extractor.cpp

+2 −1
Original line number Diff line number Diff line
@@ -499,6 +499,8 @@ status_t MPEG4Extractor::parseChunk(off_t *offset, int depth) { 
                        mDataSource = cachedSource;

                    }

                }



                mLastTrack->sampleTable = new SampleTable(mDataSource);

            }



            bool isTrack = false;
@@ -518,7 +520,6 @@ status_t MPEG4Extractor::parseChunk(off_t *offset, int depth) { 
                track->includes_expensive_metadata = false;

                track->skipTrack = false;

                track->timescale = 0;

                track->sampleTable = new SampleTable(mDataSource);

                track->meta->setCString(kKeyMIMEType, "application/octet-stream");

            }