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

Declare class for drmFactory, crypto/drmPlugins

Browse Source 
[ Merged from http://go/wvgerrit/152493 ]

Replace struct with class for WVDrmFactory, WVCryptoPlugin
and WVDrmPlugin.

Also fix build_all_unit_tests.sh, hidl_metrics_adapter_unittest
has been renamed to hal_metrics_adapter_unittest.

Test: unit tests
Test: Google TV and Netflix
Test: atest GtsMediaTestCases

Bug: 216717460
Change-Id: I92b15510267e8f37058845be760a6ec6241bc5d7
This commit is contained in:
Edwin Wong
2022-05-24 00:03:50 +00:00
parent f735b263ab
commit 8651e9a47c
5 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libwvdrmengine/mediacrypto/aidl_include/WVCryptoPlugin.h
View File

@@ -23,14 +23,21 @@ namespace hardware {
namespace drm {
namespace widevine {
struct SharedBufferBase {
uint8_t* mBase;
int64_t mSize;
class SharedBufferBase {
public:
SharedBufferBase(const ::aidl::android::hardware::drm::SharedBuffer& mem);
~SharedBufferBase();
uint8_t* base() const { return mBase; }
int64_t size() const { return mSize; }
void set_base(uint8_t* base) { mBase = base; }
void set_size(uint64_t size) { mSize = size; }
private:
uint8_t* mBase;
int64_t mSize;
};
struct WVCryptoPlugin : public ::aidl::android::hardware::drm::BnCryptoPlugin {
class WVCryptoPlugin : public ::aidl::android::hardware::drm::BnCryptoPlugin {
public:
WVCryptoPlugin(const void* data, size_t size,
const ::android::sp<wvcdm::WvContentDecryptionModule>& cdm);
virtual ~WVCryptoPlugin();

23
libwvdrmengine/mediacrypto/aidl_src/WVCryptoPlugin.cpp
View File

@@ -64,8 +64,9 @@ WVCryptoPlugin::~WVCryptoPlugin() {
}
SharedBufferBase::SharedBufferBase(
const ::aidl::android::hardware::drm::SharedBuffer& mem)
: mBase(nullptr), mSize(mem.size) {
const ::aidl::android::hardware::drm::SharedBuffer& mem) {
set_base(nullptr);
set_size(mem.size);
if (mem.handle.fds.empty()) {
return;
}
@@ -75,13 +76,13 @@ SharedBufferBase::SharedBufferBase(
if (addr == MAP_FAILED) {
ALOGE("mmap err: fd %d; errno %s", fd, strerror(errno));
} else {
mBase = static_cast<uint8_t*>(addr);
set_base(static_cast<uint8_t*>(addr));
}
}
SharedBufferBase::~SharedBufferBase() {
if (munmap(mBase, mSize)) {
ALOGE("munmap err: base %p; errno %s", mBase, strerror(errno));
if (munmap(base(), size())) {
ALOGE("munmap err: base %p; errno %s", base(), strerror(errno));
}
}
@@ -183,7 +184,7 @@ SharedBufferBase::~SharedBufferBase() {
}
auto src = mSharedBufferMap[in_args.source.bufferId];
if (src->mBase == nullptr) {
if (src->base() == nullptr) {
detailedError = "source is a nullptr";
return toNdkScopedAStatus(Status::ERROR_DRM_CANNOT_HANDLE, detailedError);
}
@@ -193,18 +194,18 @@ SharedBufferBase::~SharedBufferBase() {
&totalSrcSize) ||
__builtin_add_overflow(totalSrcSize, in_args.source.size,
&totalSrcSize) ||
totalSrcSize > src->mSize) {
totalSrcSize > src->size()) {
android_errorWriteLog(0x534e4554, "176496160");
detailedError = "invalid source buffer size";
return toNdkScopedAStatus(Status::ERROR_DRM_CANNOT_HANDLE, detailedError);
}
srcPtr = src->mBase + in_args.source.offset + in_args.offset;
srcPtr = src->base() + in_args.source.offset + in_args.offset;
if (in_args.destination.getTag() == NON_SECURE) {
const SharedBuffer& destBuffer = in_args.destination.get<NON_SECURE>();
auto dest = mSharedBufferMap[destBuffer.bufferId];
if (dest->mBase == nullptr) {
if (dest->base() == nullptr) {
detailedError = "destination is a nullptr";
return toNdkScopedAStatus(Status::ERROR_DRM_CANNOT_HANDLE,
detailedError);
@@ -212,14 +213,14 @@ SharedBufferBase::~SharedBufferBase() {
size_t totalDstSize = 0;
if (__builtin_add_overflow(destBuffer.offset, destBuffer.size,
&totalDstSize) ||
totalDstSize > dest->mSize) {
totalDstSize > dest->size()) {
android_errorWriteLog(0x534e4554, "176444622");
detailedError = "invalid buffer size";
return toNdkScopedAStatus(Status::ERROR_DRM_FRAME_TOO_LARGE,
detailedError);
}
destPtr = static_cast<void*>(
dest->mBase + in_args.destination.get<NON_SECURE>().offset);
dest->base() + in_args.destination.get<NON_SECURE>().offset);
} else if (in_args.destination.getTag() == SECURE) {
handle = android::makeFromAidl(in_args.destination.get<SECURE>());
destPtr = static_cast<void*>(handle);