diff options
| author | Andreas Huber <andih@google.com> | 2013-01-30 10:41:25 -0800 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2013-01-30 10:41:25 -0800 |
| commit | a6a88d9c445e261972c2433254e0a996336e78a4 (patch) | |
| tree | 3bcb34c468d9f0f525fb68dbb237e5b709a03465 /media/libmediaplayerservice/HDCP.h | |
| parent | 1bd947a7c99853ad4ee67d59db89524be1e5acfc (diff) | |
| download | frameworks_av-a6a88d9c445e261972c2433254e0a996336e78a4.zip frameworks_av-a6a88d9c445e261972c2433254e0a996336e78a4.tar.gz frameworks_av-a6a88d9c445e261972c2433254e0a996336e78a4.tar.bz2 | |
Plumbing to reflect minor changes in the HDCP module API that allow for
support of _decryption_ modules in addition to what we already supported.
Change-Id: Ic37b87dc170ba8def3817991d25df798f21e950b
Diffstat (limited to 'media/libmediaplayerservice/HDCP.h')
| -rw-r--r-- | media/libmediaplayerservice/HDCP.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/HDCP.h b/media/libmediaplayerservice/HDCP.h index b2fc457..42e6467 100644 --- a/media/libmediaplayerservice/HDCP.h +++ b/media/libmediaplayerservice/HDCP.h @@ -24,7 +24,7 @@ namespace android { struct HDCP : public BnHDCP { - HDCP(); + HDCP(bool createEncryptionModule); virtual ~HDCP(); virtual status_t setObserver(const sp<IHDCPObserver> &observer); @@ -35,9 +35,15 @@ struct HDCP : public BnHDCP { const void *inData, size_t size, uint32_t streamCTR, uint64_t *outInputCTR, void *outData); + virtual status_t decrypt( + const void *inData, size_t size, + uint32_t streamCTR, uint64_t outInputCTR, void *outData); + private: Mutex mLock; + bool mIsEncryptionModule; + void *mLibHandle; HDCPModule *mHDCPModule; sp<IHDCPObserver> mObserver; |