| commit | 840667883fd09d44015716d79bc3ac4d60edc0f0 | [log] [tgz] |
|---|---|---|
| author | Andreas Huber <andih@google.com> | Tue Aug 16 09:34:26 2011 -0700 |
| committer | Marco Nelissen <marcone@google.com> | Fri Aug 03 13:57:32 2012 -0700 |
| tree | cb55492dbe3ca64b2ab9ba2f5a3bb6d0a0bcf650 | |
| parent | 9cb20d4a41eb84bfab7f9f0d0829393f378583f4 [diff] [blame] |
experimental support for fragmented mp4 playback in nuplayer cherry picked from change 170999 Change-Id: I407775f0290154ad4961134839a15c9f296424c0
diff --git a/media/libmediaplayerservice/nuplayer/GenericSource.cpp b/media/libmediaplayerservice/nuplayer/GenericSource.cpp index 99569c9..f0c3240 100644 --- a/media/libmediaplayerservice/nuplayer/GenericSource.cpp +++ b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
@@ -128,7 +128,7 @@ return OK; } -sp<MetaData> NuPlayer::GenericSource::getFormat(bool audio) { +sp<MetaData> NuPlayer::GenericSource::getFormatMeta(bool audio) { sp<MediaSource> source = audio ? mAudioTrack.mSource : mVideoTrack.mSource; if (source == NULL) {