diff options
| author | Andreas Huber <andih@google.com> | 2012-09-20 09:42:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-20 09:42:35 -0700 |
| commit | 858882f2e6bd18d3da1db5cd8731fe3691628fb1 (patch) | |
| tree | 876b5b7f4586924f7b1f97db021f1aa35449e961 /media/libmediaplayerservice/MediaPlayerService.h | |
| parent | 720a153ceb6f27bec2912918bce094f5a63355aa (diff) | |
| parent | b88516c4c0695c4b9ea2feccd3aafef654da62bd (diff) | |
| download | frameworks_av-858882f2e6bd18d3da1db5cd8731fe3691628fb1.zip frameworks_av-858882f2e6bd18d3da1db5cd8731fe3691628fb1.tar.gz frameworks_av-858882f2e6bd18d3da1db5cd8731fe3691628fb1.tar.bz2 | |
am b88516c4: Merge "HDCP module binderized" into jb-mr1-dev
* commit 'b88516c4c0695c4b9ea2feccd3aafef654da62bd':
HDCP module binderized
Diffstat (limited to 'media/libmediaplayerservice/MediaPlayerService.h')
| -rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.h | 1 |
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); |