widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libwvhidl: upgrade to android.hardware.drm@1.4

Browse Source 
Bug: 136119370
Test: GtsMediaTestCases MediaDrmTest#testRequiresSecureDecoder
Change-Id: Iaaa7c225c0056904b5fd98c4557ec47f661b2c7d
This commit is contained in:
Robert Shih
2021-01-19 05:52:59 -08:00
parent 5eb7d21fd5
commit 56195b41c6
27 changed files with 204 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libwvdrmengine/mediacrypto/Android.bp
View File

@@ -83,6 +83,7 @@ cc_library_static {
"android.hardware.drm@1.1",
"android.hardware.drm@1.2",
"android.hardware.drm@1.3",
"android.hardware.drm@1.4",
"android.hidl.memory@1.0",
"libcrypto",
"libhidlmemory",

6
libwvdrmengine/mediacrypto/include_hidl/WVCryptoPlugin.h
View File

@@ -16,12 +16,12 @@
namespace wvdrm {
namespace hardware {
namespace drm {
namespace V1_2 {
namespace V1_4 {
namespace widevine {
using ::android::hidl::memory::V1_0::IMemory;
struct WVCryptoPlugin : public ICryptoPlugin {
struct WVCryptoPlugin : public ::drm::V1_4::ICryptoPlugin {
WVCryptoPlugin(const void* data, size_t size,
const sp<wvcdm::WvContentDecryptionModule>& cdm);
virtual ~WVCryptoPlugin() {}
@@ -75,7 +75,7 @@ struct WVCryptoPlugin : public ICryptoPlugin {
};
} // namespace widevine
} // namespace V1_2
} // namespace V1_4
} // namespace drm
} // namespace hardware
} // namespace wvdrm

4
libwvdrmengine/mediacrypto/src_hidl/WVCryptoPlugin.cpp
View File

@@ -40,7 +40,7 @@ inline Status toStatus_1_0(Status_V1_2 status) {
namespace wvdrm {
namespace hardware {
namespace drm {
namespace V1_2 {
namespace V1_4 {
namespace widevine {
using android::hardware::drm::V1_2::widevine::toVector;
@@ -345,7 +345,7 @@ Status_V1_2 WVCryptoPlugin::attemptDecrypt(
}
} // namespace widevine
} // namespace V1_2
} // namespace V1_4
} // namespace drm
} // namespace hardware
} // namespace wvdrm

1
libwvdrmengine/mediacrypto/test/Android.mk
View File

@@ -96,6 +96,7 @@ LOCAL_SHARED_LIBRARIES := \
android.hardware.drm@1.1 \
android.hardware.drm@1.2 \
android.hardware.drm@1.3 \
android.hardware.drm@1.4 \
android.hidl.memory@1.0 \
libbase \
libbinder \

4
libwvdrmengine/mediacrypto/test/WVCryptoPlugin_test.cpp
View File

@@ -30,7 +30,7 @@
namespace wvdrm {
namespace hardware {
namespace drm {
namespace V1_2 {
namespace V1_4 {
namespace widevine {
using ::android::MemoryDealer;
@@ -637,7 +637,7 @@ TEST_F(WVCryptoPluginTest, DisallowsUnopenedSessionIdChanges) {
}
} // namespace widevine
} // namespace V1_2
} // namespace V1_4
} // namespace drm
} // namespace hardware
} // namespace wvdrm