Fix sampleTable instantiation, this makes sure that the sample table refers to the...

Change-Id: I576178144ffd753b809e1c4ae269ffc3aa34b511
related-to-bug: 2686604
QA-Impact: well, ..., everything related to streaming mpeg4/aac content over http

diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index 323f145..a41b2f4 100644 (file)
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -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");
             }