summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidipotu Ashok <sashok@codeaurora.org>2015-10-16 06:16:13 +0530
committerShivaprasad Hongal <shongal@codeaurora.org>2015-10-26 19:08:45 -0700
commitd4c3afbb613f7201ece31ad2230ec22289422680 (patch)
treebef6b14f1072990dacd7b7fde052b47be4251f28
parentdcd760385776f0e4176cf763c8042d56af7e4503 (diff)
downloadframeworks_av-d4c3afbb613f7201ece31ad2230ec22289422680.zip
frameworks_av-d4c3afbb613f7201ece31ad2230ec22289422680.tar.gz
frameworks_av-d4c3afbb613f7201ece31ad2230ec22289422680.tar.bz2
NuPlayer: use a generic funtion to get flags
Use a generic function to get flags while creating extractor, so that there is no restriction to a particular usecase. CRs-Fixed: 911338 Change-Id: I8520d2ea9b25ab564b7eee6610744fcaa364fe87
-rw-r--r--media/libavextensions/mediaplayerservice/AVNuExtensions.h2
-rw-r--r--media/libavextensions/mediaplayerservice/AVNuUtils.cpp2
-rw-r--r--media/libmediaplayerservice/nuplayer/GenericSource.cpp2
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 efdf096..5c68e81 100644
--- a/media/libmediaplayerservice/nuplayer/GenericSource.cpp
+++ b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
@@ -175,7 +175,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) {