diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-10-30 15:45:22 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-10-30 15:45:22 -0700 |
| commit | 57b1d0550ae889ecd4d858ee24bc50cced2dd451 (patch) | |
| tree | 8170745c18ba7189bf42b27d29f017a5b1eca0f5 /media | |
| parent | 9b91e4cbe2e3e5135b55a0e9128a620f00aaf8f7 (diff) | |
| parent | d4c3afbb613f7201ece31ad2230ec22289422680 (diff) | |
| download | frameworks_av-57b1d0550ae889ecd4d858ee24bc50cced2dd451.zip frameworks_av-57b1d0550ae889ecd4d858ee24bc50cced2dd451.tar.gz frameworks_av-57b1d0550ae889ecd4d858ee24bc50cced2dd451.tar.bz2 | |
Merge "NuPlayer: use a generic funtion to get flags"
Diffstat (limited to 'media')
3 files changed, 3 insertions, 3 deletions
diff --git a/media/libavextensions/mediaplayerservice/AVNuExtensions.h b/media/libavextensions/mediaplayerservice/AVNuExtensions.h index c6aba71..7aeb5c3 100644 --- a/media/libavextensions/mediaplayerservice/AVNuExtensions.h +++ b/media/libavextensions/mediaplayerservice/AVNuExtensions.h @@ -80,7 +80,7 @@ struct AVNuUtils { virtual void setDecodedPCMFormat(const sp<AMessage> &); virtual status_t convertToSinkFormatIfNeeded(const sp<ABuffer> &, sp<ABuffer> &, audio_format_t sinkFormat, bool isOffload); - virtual uint32_t getUseSetBuffersFlag(); + virtual uint32_t getFlags(); virtual bool canUseSetBuffers(const sp<MetaData> &Meta); virtual void printFileName(int fd); diff --git a/media/libavextensions/mediaplayerservice/AVNuUtils.cpp b/media/libavextensions/mediaplayerservice/AVNuUtils.cpp index c254a70..51c4a37 100644 --- a/media/libavextensions/mediaplayerservice/AVNuUtils.cpp +++ b/media/libavextensions/mediaplayerservice/AVNuUtils.cpp @@ -104,7 +104,7 @@ void AVNuUtils::checkFormatChange(bool * /*formatChange*/, const sp<ABuffer> & /*accessUnit*/) { } -uint32_t AVNuUtils::getUseSetBuffersFlag() { +uint32_t AVNuUtils::getFlags() { return 0; } diff --git a/media/libmediaplayerservice/nuplayer/GenericSource.cpp b/media/libmediaplayerservice/nuplayer/GenericSource.cpp index ddad991..ee0310e 100644 --- a/media/libmediaplayerservice/nuplayer/GenericSource.cpp +++ b/media/libmediaplayerservice/nuplayer/GenericSource.cpp @@ -181,7 +181,7 @@ status_t NuPlayer::GenericSource::initFromDataSource() { } else { extractor = MediaExtractor::Create(mDataSource, mimeType.isEmpty() ? NULL : mimeType.string(), - mIsStreaming ? 0 : AVNuUtils::get()->getUseSetBuffersFlag()); + mIsStreaming ? 0 : AVNuUtils::get()->getFlags()); } if (extractor == NULL) { |