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

10
libwvdrmengine/include_hidl/HidlTypes.h
View File

@@ -8,12 +8,12 @@
#define HIDL_TYPES_H_
#include <android/hardware/drm/1.1/types.h>
#include <android/hardware/drm/1.2/ICryptoPlugin.h>
#include <android/hardware/drm/1.2/IDrmPlugin.h>
#include <android/hardware/drm/1.2/IDrmPluginListener.h>
#include <android/hardware/drm/1.2/types.h>
#include <android/hardware/drm/1.3/ICryptoFactory.h>
#include <android/hardware/drm/1.3/IDrmFactory.h>
#include <android/hardware/drm/1.2/IDrmPluginListener.h>
#include <android/hardware/drm/1.4/ICryptoFactory.h>
#include <android/hardware/drm/1.4/ICryptoPlugin.h>
#include <android/hardware/drm/1.4/IDrmFactory.h>
#include <android/hardware/drm/1.4/IDrmPlugin.h>
#include <hidl/HidlTransportSupport.h>
using ::android::hardware::configureRpcThreadpool;

8
libwvdrmengine/include_hidl/WVCreatePluginFactories.h
View File

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

6
libwvdrmengine/include_hidl/WVCryptoFactory.h
View File

@@ -13,10 +13,10 @@
namespace wvdrm {
namespace hardware {
namespace drm {
namespace V1_3 {
namespace V1_4 {
namespace widevine {
struct WVCryptoFactory : public ICryptoFactory {
struct WVCryptoFactory : public ::drm::V1_4::ICryptoFactory {
public:
WVCryptoFactory() {}
virtual ~WVCryptoFactory() {}
@@ -34,7 +34,7 @@ struct WVCryptoFactory : public ICryptoFactory {
};
} // namespace widevine
} // namespace V1_3
} // namespace V1_4
} // namespace drm
} // namespace hardware
} // namespace wvdrm

6
libwvdrmengine/include_hidl/WVDrmFactory.h
View File

@@ -14,13 +14,13 @@
namespace wvdrm {
namespace hardware {
namespace drm {
namespace V1_3 {
namespace V1_4 {
namespace widevine {
using ::android::hardware::hidl_handle;
using ::android::hardware::hidl_vec;
struct WVDrmFactory : public IDrmFactory {
struct WVDrmFactory : public ::drm::V1_4::IDrmFactory {
WVDrmFactory() {}
virtual ~WVDrmFactory() {}
@@ -60,7 +60,7 @@ struct WVDrmFactory : public IDrmFactory {
extern "C" IDrmFactory* HIDL_FETCH_IDrmFactory(const char* name);
} // namespace widevine
} // namespace V1_3
} // namespace V1_4
} // namespace drm
} // namespace hardware
} // namespace wvdrm