summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice
diff options
context:
space:
mode:
authorLajos Molnar <lajos@google.com>2014-08-07 15:18:35 -0700
committerLajos Molnar <lajos@google.com>2014-08-07 17:40:13 -0700
commit1381d4b5c0385aec3741073e5998773b064c1fb0 (patch)
tree6087b737255d34703a90d1952d48bb97646e492a /media/libmediaplayerservice
parent60b1c0e79d12a1c70758bc8d060156924635f8ba (diff)
downloadframeworks_av-1381d4b5c0385aec3741073e5998773b064c1fb0.zip
frameworks_av-1381d4b5c0385aec3741073e5998773b064c1fb0.tar.gz
frameworks_av-1381d4b5c0385aec3741073e5998773b064c1fb0.tar.bz2
media/playerservice: add getCodecList() to MediaPlayerService
Bug: 11990470 Change-Id: I8fa45946fd9b76f9b975fc59062819c57e6881ef
Diffstat (limited to 'media/libmediaplayerservice')
-rw-r--r--media/libmediaplayerservice/MediaPlayerService.cpp5
-rw-r--r--media/libmediaplayerservice/MediaPlayerService.h1
2 files changed, 6 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp
index 735344c..a706987 100644
--- a/media/libmediaplayerservice/MediaPlayerService.cpp
+++ b/media/libmediaplayerservice/MediaPlayerService.cpp
@@ -54,6 +54,7 @@
#include <media/Metadata.h>
#include <media/AudioTrack.h>
#include <media/MemoryLeakTrackUtil.h>
+#include <media/stagefright/MediaCodecList.h>
#include <media/stagefright/MediaErrors.h>
#include <media/stagefright/AudioPlayer.h>
#include <media/stagefright/foundation/ADebug.h>
@@ -345,6 +346,10 @@ sp<IMediaPlayer> MediaPlayerService::create(const sp<IMediaPlayerClient>& client
return c;
}
+sp<IMediaCodecList> MediaPlayerService::getCodecList() const {
+ return MediaCodecList::getLocalInstance();
+}
+
sp<IOMX> MediaPlayerService::getOMX() {
Mutex::Autolock autoLock(mLock);
diff --git a/media/libmediaplayerservice/MediaPlayerService.h b/media/libmediaplayerservice/MediaPlayerService.h
index 2eca6a0..406e3f6 100644
--- a/media/libmediaplayerservice/MediaPlayerService.h
+++ b/media/libmediaplayerservice/MediaPlayerService.h
@@ -273,6 +273,7 @@ public:
uint32_t *pSampleRate, int* pNumChannels,
audio_format_t* pFormat,
const sp<IMemoryHeap>& heap, size_t *pSize);
+ virtual sp<IMediaCodecList> getCodecList() const;
virtual sp<IOMX> getOMX();
virtual sp<ICrypto> makeCrypto();
virtual sp<IDrm> makeDrm();