Piped CdmEngine's generic crypto operations to Android CDM.

[ Merge of http://go/wvgerrit/172010 ]

The CdmEngine provides an API for generic crypto operations that are
already used for the CE CDM.  This API is being exposed in the Android
CDM.  The parameter order of the Android CDM is modified to match the
existing generic crypto parameters used in the media DRM plugin.

Bug: 274984456
Bug: 29400687
Test: build x86-64 and Android
Change-Id: I3b286ebb011bd58754b7b8ea814ed46daf1f62f9
This commit is contained in:
Alex Dale
2023-04-24 14:21:23 -07:00
parent 3e650cfd9f
commit 37f125a491
5 changed files with 95 additions and 0 deletions

View File

@@ -459,6 +459,7 @@ enum CdmResponseEnum : int32_t {
UNSUPPORTED_SIGNATURE_HASH_ALGORITHM_4 = 393,
STORE_ATSC_LICENSE_DEVICE_FILES_INIT_ERROR = 394,
STORE_ATSC_LICENSE_ERROR = 395,
SESSION_NOT_FOUND_GENERIC_CRYPTO = 396,
// Don't forget to add new values to
// * core/src/wv_cdm_types.cpp
// * android/include/mapErrors-inl.h

View File

@@ -865,6 +865,8 @@ const char* CdmResponseEnumToString(CdmResponseEnum cdm_response_enum) {
return "STORE_ATSC_LICENSE_DEVICE_FILES_INIT_ERROR";
case STORE_ATSC_LICENSE_ERROR:
return "STORE_ATSC_LICENSE_ERROR";
case SESSION_NOT_FOUND_GENERIC_CRYPTO:
return "SESSION_NOT_FOUND_GENERIC_CRYPTO";
}
return UnknownValueRep(cdm_response_enum);
}