summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice/MediaPlayerService.h
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2012-09-20 09:30:11 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-09-20 09:30:11 -0700
commitb88516c4c0695c4b9ea2feccd3aafef654da62bd (patch)
tree876b5b7f4586924f7b1f97db021f1aa35449e961 /media/libmediaplayerservice/MediaPlayerService.h
parentda1c5c15c2483cd41035e1a492c5963ac86bbcf5 (diff)
parentefbb781c15abf8e085f5ab8d39710bd58ea0b6e4 (diff)
downloadframeworks_av-b88516c4c0695c4b9ea2feccd3aafef654da62bd.zip
frameworks_av-b88516c4c0695c4b9ea2feccd3aafef654da62bd.tar.gz
frameworks_av-b88516c4c0695c4b9ea2feccd3aafef654da62bd.tar.bz2
Merge "HDCP module binderized" into jb-mr1-dev
Diffstat (limited to 'media/libmediaplayerservice/MediaPlayerService.h')
-rw-r--r--media/libmediaplayerservice/MediaPlayerService.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.h b/media/libmediaplayerservice/MediaPlayerService.h
index ca8a96f..6105ce4 100644
--- a/media/libmediaplayerservice/MediaPlayerService.h
+++ b/media/libmediaplayerservice/MediaPlayerService.h
@@ -250,6 +250,7 @@ public:
virtual sp<IMemory> decode(int fd, int64_t offset, int64_t length, uint32_t *pSampleRate, int* pNumChannels, audio_format_t* pFormat);
virtual sp<IOMX> getOMX();
virtual sp<ICrypto> makeCrypto();
+ virtual sp<IHDCP> makeHDCP();
virtual sp<IRemoteDisplay> listenForRemoteDisplay(const sp<IRemoteDisplayClient>& client,
const String8& iface);