summaryrefslogtreecommitdiffstats
path: root/media
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
commiteb9128f9b0ee660504621381fd96f82d5bf8a3fd (patch)
tree828af137ce319ecb2fef1a45562bf6e63aa0c417 /media
parent826c9f7773188c2a7f48d5b2d1ae4612ec2bbb49 (diff)
downloadframeworks_base-eb9128f9b0ee660504621381fd96f82d5bf8a3fd.zip
frameworks_base-eb9128f9b0ee660504621381fd96f82d5bf8a3fd.tar.gz
frameworks_base-eb9128f9b0ee660504621381fd96f82d5bf8a3fd.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
Diffstat (limited to 'media')
-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");
}