diff options
| author | Chong Zhang <chz@google.com> | 2013-09-03 14:35:37 -0700 |
|---|---|---|
| committer | Chong Zhang <chz@google.com> | 2013-09-03 16:02:35 -0700 |
| commit | ec3acca4a75fc4adc076b56751124f507b419622 (patch) | |
| tree | d8e15b4acf4de74c3edcdad49f3528ca668fc2a1 /media/libmediaplayerservice | |
| parent | 4585e8f0ff47580fdb81ed8652bde32db1770050 (diff) | |
| download | frameworks_av-ec3acca4a75fc4adc076b56751124f507b419622.zip frameworks_av-ec3acca4a75fc4adc076b56751124f507b419622.tar.gz frameworks_av-ec3acca4a75fc4adc076b56751124f507b419622.tar.bz2 | |
wifi-display: do not use HDCP's encryptNative method if its unsupported
Bug: 10609422
Change-Id: I005f1d04a4191b1503b5f3e895a98b8d6560c402
Diffstat (limited to 'media/libmediaplayerservice')
| -rw-r--r-- | media/libmediaplayerservice/HDCP.cpp | 14 | ||||
| -rw-r--r-- | media/libmediaplayerservice/HDCP.h | 1 |
2 files changed, 15 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/HDCP.cpp b/media/libmediaplayerservice/HDCP.cpp index 8a3188c..c2ac1a3 100644 --- a/media/libmediaplayerservice/HDCP.cpp +++ b/media/libmediaplayerservice/HDCP.cpp @@ -100,6 +100,20 @@ status_t HDCP::shutdownAsync() { return mHDCPModule->shutdownAsync(); } +uint32_t HDCP::getCaps() { + Mutex::Autolock autoLock(mLock); + + if (mHDCPModule == NULL) { + return NO_INIT; + } + + // TO-DO: + // Only support HDCP_CAPS_ENCRYPT (byte-array to byte-array) for now. + // use mHDCPModule->getCaps() when the HDCP libraries get updated. + //return mHDCPModule->getCaps(); + return HDCPModule::HDCP_CAPS_ENCRYPT; +} + status_t HDCP::encrypt( const void *inData, size_t size, uint32_t streamCTR, uint64_t *outInputCTR, void *outData) { diff --git a/media/libmediaplayerservice/HDCP.h b/media/libmediaplayerservice/HDCP.h index c60c2e0..26ddc86 100644 --- a/media/libmediaplayerservice/HDCP.h +++ b/media/libmediaplayerservice/HDCP.h @@ -30,6 +30,7 @@ struct HDCP : public BnHDCP { virtual status_t setObserver(const sp<IHDCPObserver> &observer); virtual status_t initAsync(const char *host, unsigned port); virtual status_t shutdownAsync(); + virtual uint32_t getCaps(); virtual status_t encrypt( const void *inData, size_t size, uint32_t streamCTR, |