summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-05-14 15:28:51 -0700
committerAndreas Huber <andih@google.com>2010-05-14 15:32:21 -0700
commit1edbcb2bb9988cc7cb54a865aaea4613bdd53a9d (patch)
tree962de13061feaa0d428f33f8c94ced16c8bcf343
parenta945bfd91aa291fba4d9201ffcb38fce40eab7fe (diff)
downloadframeworks_av-1edbcb2bb9988cc7cb54a865aaea4613bdd53a9d.zip
frameworks_av-1edbcb2bb9988cc7cb54a865aaea4613bdd53a9d.tar.gz
frameworks_av-1edbcb2bb9988cc7cb54a865aaea4613bdd53a9d.tar.bz2
Fix sampleTable instantiation, this makes sure that the sample table refers to the custom datasource that caches the metadata to prevent needless seeking.
Change-Id: I576178144ffd753b809e1c4ae269ffc3aa34b511 related-to-bug: 2686604 QA-Impact: well, ..., everything related to streaming mpeg4/aac content over http
-rw-r--r--media/libstagefright/MPEG4Extractor.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index 323f145..a41b2f4 100644
--- 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");
}