summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice/nuplayer/StreamingSource.cpp
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2011-08-16 09:34:26 -0700
committerMarco Nelissen <marcone@google.com>2012-08-03 13:57:32 -0700
commit840667883fd09d44015716d79bc3ac4d60edc0f0 (patch)
treecb55492dbe3ca64b2ab9ba2f5a3bb6d0a0bcf650 /media/libmediaplayerservice/nuplayer/StreamingSource.cpp
parent9cb20d4a41eb84bfab7f9f0d0829393f378583f4 (diff)
downloadframeworks_av-840667883fd09d44015716d79bc3ac4d60edc0f0.zip
frameworks_av-840667883fd09d44015716d79bc3ac4d60edc0f0.tar.gz
frameworks_av-840667883fd09d44015716d79bc3ac4d60edc0f0.tar.bz2
experimental support for fragmented mp4 playback in nuplayer
cherry picked from change 170999 Change-Id: I407775f0290154ad4961134839a15c9f296424c0
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/StreamingSource.cpp')
-rw-r--r--media/libmediaplayerservice/nuplayer/StreamingSource.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/nuplayer/StreamingSource.cpp b/media/libmediaplayerservice/nuplayer/StreamingSource.cpp
index 7c9bc5e..b696aa4 100644
--- a/media/libmediaplayerservice/nuplayer/StreamingSource.cpp
+++ b/media/libmediaplayerservice/nuplayer/StreamingSource.cpp
@@ -107,7 +107,7 @@ status_t NuPlayer::StreamingSource::feedMoreTSData() {
return OK;
}
-sp<MetaData> NuPlayer::StreamingSource::getFormat(bool audio) {
+sp<MetaData> NuPlayer::StreamingSource::getFormatMeta(bool audio) {
ATSParser::SourceType type =
audio ? ATSParser::AUDIO : ATSParser::VIDEO;