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

8
libwvdrmengine/src_hidl/WVCreatePluginFactories.cpp
View File

@@ -12,22 +12,22 @@
namespace wvdrm {
namespace hardware {
namespace drm {
namespace V1_3 {
namespace V1_4 {
namespace widevine {
extern "C" {
IDrmFactory* createDrmFactory() {
::drm::V1_4::IDrmFactory* createDrmFactory() {
return new WVDrmFactory();
}
ICryptoFactory* createCryptoFactory() {
::drm::V1_4::ICryptoFactory* createCryptoFactory() {
return new WVCryptoFactory();
}
} // extern "C"
} // namespace widevine
} // namespace V1_3
} // namespace V1_4
} // namespace drm
} // namespace hardware
} // namespace wvdrm

6
libwvdrmengine/src_hidl/WVCryptoFactory.cpp
View File

@@ -19,10 +19,10 @@
namespace wvdrm {
namespace hardware {
namespace drm {
namespace V1_3 {
namespace V1_4 {
namespace widevine {
using wvdrm::hardware::drm::V1_2::widevine::WVCryptoPlugin;
using wvdrm::hardware::drm::V1_4::widevine::WVCryptoPlugin;
Return<bool> WVCryptoFactory::isCryptoSchemeSupported(
const hidl_array<uint8_t, 16>& uuid) {
@@ -54,7 +54,7 @@ Return<void> WVCryptoFactory::createPlugin(
}
} // namespace widevine
} // namespace V1_3
} // namespace V1_4
} // namespace drm
} // namespace hardware
} // namespace wvdrm

6
libwvdrmengine/src_hidl/WVDrmFactory.cpp
View File

@@ -24,10 +24,10 @@
namespace wvdrm {
namespace hardware {
namespace drm {
namespace V1_3 {
namespace V1_4 {
namespace widevine {
using wvdrm::hardware::drm::V1_2::widevine::WVDrmPlugin;
using wvdrm::hardware::drm::V1_4::widevine::WVDrmPlugin;
WVGenericCryptoInterface WVDrmFactory::sOemCryptoInterface;
@@ -269,7 +269,7 @@ Return<void> WVDrmFactory::debug(const hidl_handle& fd,
}
} // namespace widevine
} // namespace V1_3
} // namespace V1_4
} // namespace drm
} // namespace hardware
} // namespace wvdrm

30
libwvdrmengine/src_hidl/android.hardware.drm@1.4-service-lazy.widevine.rc Normal file
View File

@@ -0,0 +1,30 @@
on property:init.svc.mediadrm=running
mkdir /data/vendor/mediadrm 0770 media mediadrm
start vendor.move_data_sh
service vendor.move_data_sh /system/bin/move_widevine_data.sh
class late_start
user media
group media mediadrm system
disabled
oneshot
service vendor.drm-widevine-hal-1-4 /vendor/bin/hw/android.hardware.drm@1.4-service-lazy.widevine
interface android.hardware.drm@1.0::ICryptoFactory widevine
interface android.hardware.drm@1.0::IDrmFactory widevine
interface android.hardware.drm@1.1::ICryptoFactory widevine
interface android.hardware.drm@1.1::IDrmFactory widevine
interface android.hardware.drm@1.2::ICryptoFactory widevine
interface android.hardware.drm@1.2::IDrmFactory widevine
interface android.hardware.drm@1.3::ICryptoFactory widevine
interface android.hardware.drm@1.3::IDrmFactory widevine
interface android.hardware.drm@1.4::ICryptoFactory widevine
interface android.hardware.drm@1.4::IDrmFactory widevine
interface android.hidl.base@1.0::IBase widevine
oneshot
disabled
class hal
user media
group media mediadrm drmrpc system
ioprio rt 4
writepid /dev/cpuset/foreground/tasks

28
libwvdrmengine/src_hidl/android.hardware.drm@1.4-service.widevine.rc Normal file
View File

@@ -0,0 +1,28 @@
on property:init.svc.mediadrm=running
mkdir /data/vendor/mediadrm 0770 media mediadrm
start vendor.move_data_sh
service vendor.move_data_sh /system/bin/move_widevine_data.sh
class late_start
user media
group media mediadrm system
disabled
oneshot
service vendor.drm-widevine-hal-1-4 /vendor/bin/hw/android.hardware.drm@1.4-service.widevine
interface android.hardware.drm@1.0::ICryptoFactory widevine
interface android.hardware.drm@1.0::IDrmFactory widevine
interface android.hardware.drm@1.1::ICryptoFactory widevine
interface android.hardware.drm@1.1::IDrmFactory widevine
interface android.hardware.drm@1.2::ICryptoFactory widevine
interface android.hardware.drm@1.2::IDrmFactory widevine
interface android.hardware.drm@1.3::ICryptoFactory widevine
interface android.hardware.drm@1.3::IDrmFactory widevine
interface android.hardware.drm@1.4::ICryptoFactory widevine
interface android.hardware.drm@1.4::IDrmFactory widevine
interface android.hidl.base@1.0::IBase widevine
class hal
user media
group media mediadrm drmrpc system
ioprio rt 4
writepid /dev/cpuset/foreground/tasks

4
libwvdrmengine/src_hidl/service.cpp
View File

@@ -22,8 +22,8 @@
#include "WVCryptoFactory.h"
#include "WVDrmFactory.h"
using wvdrm::hardware::drm::V1_3::widevine::WVCryptoFactory;
using wvdrm::hardware::drm::V1_3::widevine::WVDrmFactory;
using wvdrm::hardware::drm::V1_4::widevine::WVCryptoFactory;
using wvdrm::hardware::drm::V1_4::widevine::WVDrmFactory;
int main(int /* argc */, char** /* argv */) {
sp<IDrmFactory> drmFactory = new WVDrmFactory;

4
libwvdrmengine/src_hidl/serviceLazy.cpp
View File

@@ -23,8 +23,8 @@
#include "WVCryptoFactory.h"
#include "WVDrmFactory.h"
using wvdrm::hardware::drm::V1_3::widevine::WVCryptoFactory;
using wvdrm::hardware::drm::V1_3::widevine::WVDrmFactory;
using wvdrm::hardware::drm::V1_4::widevine::WVCryptoFactory;
using wvdrm::hardware::drm::V1_4::widevine::WVDrmFactory;
using android::hardware::LazyServiceRegistrar;
int main(int /* argc */, char** /* argv */) {