diff options
| author | Marco Nelissen <marcone@google.com> | 2014-09-17 22:08:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-17 22:08:31 +0000 |
| commit | 866e028bbe30b1ba0b9d8903c88bbe8525b81a37 (patch) | |
| tree | 9e66da521a9ad1b051ea97bf6c6f4f5969bb007b /media/libmediaplayerservice/nuplayer/GenericSource.cpp | |
| parent | 999b888f07f4549b1f8490d7153e3b1704684ca2 (diff) | |
| parent | f0b72b509ab1147a2a0925aced970dd68fd7fa4f (diff) | |
| download | frameworks_av-866e028bbe30b1ba0b9d8903c88bbe8525b81a37.zip frameworks_av-866e028bbe30b1ba0b9d8903c88bbe8525b81a37.tar.gz frameworks_av-866e028bbe30b1ba0b9d8903c88bbe8525b81a37.tar.bz2 | |
Merge "Add support for ANDROID_LOOP to NuPlayer" into lmp-dev
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/GenericSource.cpp')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/GenericSource.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/media/libmediaplayerservice/nuplayer/GenericSource.cpp b/media/libmediaplayerservice/nuplayer/GenericSource.cpp index 3eb87a4..142107d 100644 --- a/media/libmediaplayerservice/nuplayer/GenericSource.cpp +++ b/media/libmediaplayerservice/nuplayer/GenericSource.cpp @@ -106,6 +106,10 @@ status_t NuPlayer::GenericSource::setDataSource( return OK; } +sp<MetaData> NuPlayer::GenericSource::getFileFormatMeta() const { + return mFileMeta; +} + status_t NuPlayer::GenericSource::initFromDataSource() { sp<MediaExtractor> extractor; @@ -144,10 +148,10 @@ status_t NuPlayer::GenericSource::initFromDataSource() { checkDrmStatus(mDataSource); } - sp<MetaData> fileMeta = extractor->getMetaData(); - if (fileMeta != NULL) { + mFileMeta = extractor->getMetaData(); + if (mFileMeta != NULL) { int64_t duration; - if (fileMeta->findInt64(kKeyDuration, &duration)) { + if (mFileMeta->findInt64(kKeyDuration, &duration)) { mDurationUs = duration; } } |