Update Widevine HIDL service to 1.2.
Widevine HIDL service added new v1.2 media APIs, update the service to support new APIs. Merged from http://go/wvgerrit/67083 Test: Netflix and Play Movies & TV (streaming and offline playback) Test: GTS WidevineH264PlaybackTests test e.g. ANDROID_BUILD_TOP= ./android-gts/toolsefed run gts -m GtsMediaTestCases --test com.google.android.media.gts.WidevineH264PlaybackTests#testL1With480P30 Test: Widevine unit tests bug: 117570686 Change-Id: I3a2091e7c62a0d2697ef97f983fd898aedfb4519
This commit is contained in:
@@ -71,6 +71,7 @@ LOCAL_STATIC_LIBRARIES := \
|
||||
LOCAL_SHARED_LIBRARIES := \
|
||||
android.hardware.drm@1.0 \
|
||||
android.hardware.drm@1.1 \
|
||||
android.hardware.drm@1.2 \
|
||||
libcutils \
|
||||
libdl \
|
||||
libhidlbase \
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
namespace wvdrm {
|
||||
namespace hardware {
|
||||
namespace drm {
|
||||
namespace V1_1 {
|
||||
namespace V1_2 {
|
||||
namespace widevine {
|
||||
|
||||
using ::android::sp;
|
||||
@@ -32,7 +32,7 @@ TEST(CreatePluginFactoriesTest, CreatesCryptoFactory) {
|
||||
}
|
||||
|
||||
} // namespace widevine
|
||||
} // namespace V1_1
|
||||
} // namespace V1_2
|
||||
} // namespace drm
|
||||
} // namespace hardware
|
||||
} // namespace wvdrm
|
||||
|
||||
@@ -10,10 +10,10 @@
|
||||
namespace wvdrm {
|
||||
namespace hardware {
|
||||
namespace drm {
|
||||
namespace V1_1 {
|
||||
namespace V1_2 {
|
||||
namespace widevine {
|
||||
|
||||
using wvdrm::hardware::drm::V1_1::widevine::WVCryptoFactory;
|
||||
using wvdrm::hardware::drm::V1_2::widevine::WVCryptoFactory;
|
||||
using ::android::sp;
|
||||
|
||||
const uint8_t kWidevineUUID[16] = {
|
||||
@@ -49,7 +49,7 @@ TEST(WVCryptoFactoryTest, DoesNotSupportUnsupportedCryptoSchemes) {
|
||||
}
|
||||
|
||||
} // namespace widevine
|
||||
} // namespace V1_1
|
||||
} // namespace V1_2
|
||||
} // namespace drm
|
||||
} // namespace hardware
|
||||
} // namespace wvdrm
|
||||
|
||||
@@ -12,11 +12,11 @@
|
||||
namespace wvdrm {
|
||||
namespace hardware {
|
||||
namespace drm {
|
||||
namespace V1_1 {
|
||||
namespace V1_2 {
|
||||
namespace widevine {
|
||||
|
||||
using ::android::hardware::hidl_string;
|
||||
using wvdrm::hardware::drm::V1_1::widevine::WVDrmFactory;
|
||||
using wvdrm::hardware::drm::V1_2::widevine::WVDrmFactory;
|
||||
|
||||
using namespace android;
|
||||
|
||||
@@ -113,7 +113,7 @@ TEST(WVDrmFactoryTest, CalculatesSpoidUseCorrectly) {
|
||||
}
|
||||
|
||||
} // namespace widevine
|
||||
} // namespace V1_1
|
||||
} // namespace V1_2
|
||||
} // namespace drm
|
||||
} // namespace hardware
|
||||
} // namespace wvdrm
|
||||
|
||||
Reference in New Issue
Block a user