From 98439a439a228c6c9ed2e8d54afc00fe72c0ecad Mon Sep 17 00:00:00 2001 From: Edwin Wong Date: Tue, 8 Nov 2022 03:01:36 +0000 Subject: [PATCH] Address review comment in go/wvgerrit/160480 Merged in http://go/wvgerrit/160638 Test: Netflix, Play TV and Movies, Youtube Test: adb shell dumpsys android.hardware.drm.IDrmFactory/widevine Test: ./build_and_run_all_unit_tests.sh Bug: 239462891 Change-Id: Ib63abfaf70edec01e2ef5f81678d6bae1462fd65 --- .../cdm/core/include/wv_cdm_types.h | 2 +- libwvdrmengine/cdm/core/src/wv_cdm_types.cpp | 661 +++++++++--------- libwvdrmengine/src/WVDrmFactory.cpp | 2 +- 3 files changed, 332 insertions(+), 333 deletions(-) diff --git a/libwvdrmengine/cdm/core/include/wv_cdm_types.h b/libwvdrmengine/cdm/core/include/wv_cdm_types.h index d1111d79..47d78a81 100644 --- a/libwvdrmengine/cdm/core/include/wv_cdm_types.h +++ b/libwvdrmengine/cdm/core/include/wv_cdm_types.h @@ -844,7 +844,7 @@ const char* CdmClientTokenTypeToString(CdmClientTokenType type); const char* CdmLicenseTypeToString(CdmLicenseType license_type); const char* CdmOfflineLicenseStateToString( CdmOfflineLicenseState license_state); -const std::string CdmResponseTypeToString(int cdm_response_type); +const char* CdmResponseTypeToString(int cdm_response_type); const char* CdmSecurityLevelToString(CdmSecurityLevel security_level); const char* CdmUsageEntryStorageTypeToString(CdmUsageEntryStorageType type); const char* RequestedSecurityLevelToString( diff --git a/libwvdrmengine/cdm/core/src/wv_cdm_types.cpp b/libwvdrmengine/cdm/core/src/wv_cdm_types.cpp index ccf57b36..6a374f2a 100644 --- a/libwvdrmengine/cdm/core/src/wv_cdm_types.cpp +++ b/libwvdrmengine/cdm/core/src/wv_cdm_types.cpp @@ -143,668 +143,667 @@ const char* CdmProductionReadinessToString(CdmProductionReadiness readiness) { return UnknownValueRep(readiness); } -const std::string CdmResponseTypeToString(int cdm_response_type) { +const char* CdmResponseTypeToString(int cdm_response_type) { switch (cdm_response_type) { - case wvcdm::NO_ERROR: + case NO_ERROR: return "NO_ERROR"; - case wvcdm::UNKNOWN_ERROR: + case UNKNOWN_ERROR: return "UNKNOWN_ERROR"; // Remaining codes are order alphabetically. - case wvcdm::ADD_KEY_ERROR: + case ADD_KEY_ERROR: return "ADD_KEY_ERROR"; - case wvcdm::ANALOG_OUTPUT_ERROR: + case ANALOG_OUTPUT_ERROR: return "ANALOG_OUTPUT_ERROR"; - case wvcdm::CANNOT_DECRYPT_ZERO_SAMPLES: + case CANNOT_DECRYPT_ZERO_SAMPLES: return "CANNOT_DECRYPT_ZERO_SAMPLES"; - case wvcdm::CANNOT_DECRYPT_ZERO_SUBSAMPLES: + case CANNOT_DECRYPT_ZERO_SUBSAMPLES: return "CANNOT_DECRYPT_ZERO_SUBSAMPLES"; - case wvcdm::CENC_INIT_DATA_UNAVAILABLE: + case CENC_INIT_DATA_UNAVAILABLE: return "CENC_INIT_DATA_UNAVAILABLE"; - case wvcdm::CERT_PROVISIONING_EMPTY_SERVICE_CERTIFICATE: + case CERT_PROVISIONING_EMPTY_SERVICE_CERTIFICATE: return "CERT_PROVISIONING_EMPTY_SERVICE_CERTIFICATE"; - case wvcdm::CERT_PROVISIONING_GET_KEYBOX_ERROR_1: + case CERT_PROVISIONING_GET_KEYBOX_ERROR_1: return "CERT_PROVISIONING_GET_KEYBOX_ERROR_1"; - case wvcdm::CERT_PROVISIONING_INVALID_CERT_TYPE: + case CERT_PROVISIONING_INVALID_CERT_TYPE: return "CERT_PROVISIONING_INVALID_CERT_TYPE"; - case wvcdm::CERT_PROVISIONING_NONCE_GENERATION_ERROR: + case CERT_PROVISIONING_NONCE_GENERATION_ERROR: return "CERT_PROVISIONING_NONCE_GENERATION_ERROR"; - case wvcdm::CERT_PROVISIONING_REQUEST_ERROR_1: + case CERT_PROVISIONING_REQUEST_ERROR_1: return "CERT_PROVISIONING_REQUEST_ERROR_1"; - case wvcdm::CERT_PROVISIONING_REQUEST_ERROR_4: + case CERT_PROVISIONING_REQUEST_ERROR_4: return "CERT_PROVISIONING_REQUEST_ERROR_4"; - case wvcdm::CERT_PROVISIONING_RESPONSE_ERROR_1: + case CERT_PROVISIONING_RESPONSE_ERROR_1: return "CERT_PROVISIONING_RESPONSE_ERROR_1"; - case wvcdm::CERT_PROVISIONING_RESPONSE_ERROR_2: + case CERT_PROVISIONING_RESPONSE_ERROR_2: return "CERT_PROVISIONING_RESPONSE_ERROR_2"; - case wvcdm::CERT_PROVISIONING_RESPONSE_ERROR_3: + case CERT_PROVISIONING_RESPONSE_ERROR_3: return "CERT_PROVISIONING_RESPONSE_ERROR_3"; - case wvcdm::CERT_PROVISIONING_RESPONSE_ERROR_4: + case CERT_PROVISIONING_RESPONSE_ERROR_4: return "CERT_PROVISIONING_RESPONSE_ERROR_4"; - case wvcdm::CERT_PROVISIONING_RESPONSE_ERROR_7: + case CERT_PROVISIONING_RESPONSE_ERROR_7: return "CERT_PROVISIONING_RESPONSE_ERROR_7"; - case wvcdm::CERT_PROVISIONING_RESPONSE_ERROR_8: + case CERT_PROVISIONING_RESPONSE_ERROR_8: return "CERT_PROVISIONING_RESPONSE_ERROR_8"; - case wvcdm::CERT_PROVISIONING_RESPONSE_ERROR_9: + case CERT_PROVISIONING_RESPONSE_ERROR_9: return "CERT_PROVISIONING_RESPONSE_ERROR_9"; - case wvcdm::CERT_PROVISIONING_RESPONSE_ERROR_10: + case CERT_PROVISIONING_RESPONSE_ERROR_10: return "CERT_PROVISIONING_RESPONSE_ERROR_10"; - case wvcdm::CLIENT_ID_AES_ENCRYPT_ERROR: + case CLIENT_ID_AES_ENCRYPT_ERROR: return "CLIENT_ID_AES_ENCRYPT_ERROR"; - case wvcdm::CLIENT_ID_AES_INIT_ERROR: + case CLIENT_ID_AES_INIT_ERROR: return "CLIENT_ID_AES_INIT_ERROR"; - case wvcdm::CLIENT_IDENTIFICATION_TOKEN_ERROR_1: + case CLIENT_IDENTIFICATION_TOKEN_ERROR_1: return "CLIENT_IDENTIFICATION_TOKEN_ERROR_1"; - case wvcdm::CLIENT_ID_GENERATE_RANDOM_ERROR: + case CLIENT_ID_GENERATE_RANDOM_ERROR: return "CLIENT_ID_GENERATE_RANDOM_ERROR"; - case wvcdm::CLIENT_ID_RSA_ENCRYPT_ERROR: + case CLIENT_ID_RSA_ENCRYPT_ERROR: return "CLIENT_ID_RSA_ENCRYPT_ERROR"; - case wvcdm::CLIENT_ID_RSA_INIT_ERROR: + case CLIENT_ID_RSA_INIT_ERROR: return "CLIENT_ID_RSA_INIT_ERROR"; - case wvcdm::CLIENT_TOKEN_NOT_SET: + case CLIENT_TOKEN_NOT_SET: return "CLIENT_TOKEN_NOT_SET"; - case wvcdm::COPY_OLD_USAGE_ENTRY_UNKNOWN_ERROR: + case COPY_OLD_USAGE_ENTRY_UNKNOWN_ERROR: return "COPY_OLD_USAGE_ENTRY_UNKNOWN_ERROR"; - case wvcdm::CORE_MESSAGE_NOT_FOUND: + case CORE_MESSAGE_NOT_FOUND: return "CORE_MESSAGE_NOT_FOUND"; - case wvcdm::CREATE_USAGE_ENTRY_UNKNOWN_ERROR: + case CREATE_USAGE_ENTRY_UNKNOWN_ERROR: return "CREATE_USAGE_ENTRY_UNKNOWN_ERROR"; - case wvcdm::CREATE_USAGE_TABLE_ERROR: + case CREATE_USAGE_TABLE_ERROR: return "CREATE_USAGE_TABLE_ERROR"; - case wvcdm::CRYPTO_SESSION_NOT_INITIALIZED: + case CRYPTO_SESSION_NOT_INITIALIZED: return "CRYPTO_SESSION_NOT_INITIALIZED"; - case wvcdm::CRYPTO_SESSION_NOT_OPEN: + case CRYPTO_SESSION_NOT_OPEN: return "CRYPTO_SESSION_NOT_OPEN"; - case wvcdm::DEACTIVATE_USAGE_ENTRY_ERROR: + case DEACTIVATE_USAGE_ENTRY_ERROR: return "DEACTIVATE_USAGE_ENTRY_ERROR"; - case wvcdm::DECRYPT_ERROR: + case DECRYPT_ERROR: return "DECRYPT_ERROR"; - case wvcdm::DECRYPT_NOT_READY: + case DECRYPT_NOT_READY: return "DECRYPT_NOT_READY"; - case wvcdm::DELETE_USAGE_ERROR_1: + case DELETE_USAGE_ERROR_1: return "DELETE_USAGE_ERROR_1"; - case wvcdm::DELETE_USAGE_ERROR_2: + case DELETE_USAGE_ERROR_2: return "DELETE_USAGE_ERROR_2"; - case wvcdm::DELETE_USAGE_ERROR_3: + case DELETE_USAGE_ERROR_3: return "DELETE_USAGE_ERROR_3"; - case wvcdm::DEVICE_CANNOT_REPROVISION: + case DEVICE_CANNOT_REPROVISION: return "DEVICE_CANNOT_REPROVISION"; - case wvcdm::DEVICE_CERTIFICATE_ERROR_1: + case DEVICE_CERTIFICATE_ERROR_1: return "DEVICE_CERTIFICATE_ERROR_1"; - case wvcdm::DEVICE_CERTIFICATE_ERROR_2: + case DEVICE_CERTIFICATE_ERROR_2: return "DEVICE_CERTIFICATE_ERROR_2"; - case wvcdm::DEVICE_CERTIFICATE_ERROR_3: + case DEVICE_CERTIFICATE_ERROR_3: return "DEVICE_CERTIFICATE_ERROR_3"; - case wvcdm::DEVICE_CERTIFICATE_ERROR_4: + case DEVICE_CERTIFICATE_ERROR_4: return "DEVICE_CERTIFICATE_ERROR_4"; - case wvcdm::DEVICE_REVOKED: + case DEVICE_REVOKED: return "DEVICE_REVOKED"; - case wvcdm::DUPLICATE_SESSION_ID_SPECIFIED: + case DUPLICATE_SESSION_ID_SPECIFIED: return "DUPLICATE_SESSION_ID_SPECIFIED"; - case wvcdm::EMPTY_KEY_DATA_1: + case EMPTY_KEY_DATA_1: return "EMPTY_KEY_DATA_1"; - case wvcdm::EMPTY_KEY_DATA_2: + case EMPTY_KEY_DATA_2: return "EMPTY_KEY_DATA_2"; - case wvcdm::EMPTY_KEYSET_ID: + case EMPTY_KEYSET_ID: return "EMPTY_KEYSET_ID"; - case wvcdm::EMPTY_KEYSET_ID_ENG_1: + case EMPTY_KEYSET_ID_ENG_1: return "EMPTY_KEYSET_ID_ENG_1"; - case wvcdm::EMPTY_KEYSET_ID_ENG_2: + case EMPTY_KEYSET_ID_ENG_2: return "EMPTY_KEYSET_ID_ENG_2"; - case wvcdm::EMPTY_KEYSET_ID_ENG_3: + case EMPTY_KEYSET_ID_ENG_3: return "EMPTY_KEYSET_ID_ENG_3"; - case wvcdm::EMPTY_KEYSET_ID_ENG_4: + case EMPTY_KEYSET_ID_ENG_4: return "EMPTY_KEYSET_ID_ENG_4"; - case wvcdm::EMPTY_LICENSE_RENEWAL: + case EMPTY_LICENSE_RENEWAL: return "EMPTY_LICENSE_RENEWAL"; - case wvcdm::EMPTY_LICENSE_REQUEST: + case EMPTY_LICENSE_REQUEST: return "EMPTY_LICENSE_REQUEST"; - case wvcdm::EMPTY_LICENSE_REQUEST_2: + case EMPTY_LICENSE_REQUEST_2: return "EMPTY_LICENSE_REQUEST_2"; - case wvcdm::EMPTY_LICENSE_REQUEST_3: + case EMPTY_LICENSE_REQUEST_3: return "EMPTY_LICENSE_REQUEST_3"; - case wvcdm::EMPTY_LICENSE_RESPONSE_1: + case EMPTY_LICENSE_RESPONSE_1: return "EMPTY_LICENSE_RESPONSE_1"; - case wvcdm::EMPTY_LICENSE_RESPONSE_2: + case EMPTY_LICENSE_RESPONSE_2: return "EMPTY_LICENSE_RESPONSE_2"; - case wvcdm::EMPTY_LICENSE_RESPONSE_3: + case EMPTY_LICENSE_RESPONSE_3: return "EMPTY_LICENSE_RESPONSE_3"; - case wvcdm::EMPTY_LICENSE_RESPONSE_4: + case EMPTY_LICENSE_RESPONSE_4: return "EMPTY_LICENSE_RESPONSE_4"; - case wvcdm::EMPTY_PROVISIONING_CERTIFICATE_1: + case EMPTY_PROVISIONING_CERTIFICATE_1: return "EMPTY_PROVISIONING_CERTIFICATE_1"; - case wvcdm::EMPTY_PROVISIONING_CERTIFICATE_2: + case EMPTY_PROVISIONING_CERTIFICATE_2: return "EMPTY_PROVISIONING_CERTIFICATE_2"; - case wvcdm::EMPTY_PROVISIONING_RESPONSE: + case EMPTY_PROVISIONING_RESPONSE: return "EMPTY_PROVISIONING_RESPONSE"; - case wvcdm::EMPTY_RESPONSE_ERROR_1: + case EMPTY_RESPONSE_ERROR_1: return "EMPTY_RESPONSE_ERROR_1"; - case wvcdm::EMPTY_SESSION_ID: + case EMPTY_SESSION_ID: return "EMPTY_SESSION_ID"; - case wvcdm::EXTRACT_SYSTEM_ID_FROM_OEM_CERT_ERROR: + case EXTRACT_SYSTEM_ID_FROM_OEM_CERT_ERROR: return "EXTRACT_SYSTEM_ID_FROM_OEM_CERT_ERROR"; - case wvcdm::GENERATE_DERIVED_KEYS_ERROR: + case GENERATE_DERIVED_KEYS_ERROR: return "GENERATE_DERIVED_KEYS_ERROR"; - case wvcdm::GENERATE_DERIVED_KEYS_ERROR_2: + case GENERATE_DERIVED_KEYS_ERROR_2: return "GENERATE_DERIVED_KEYS_ERROR_2"; - case wvcdm::GENERATE_SIGNATURE_ERROR: + case GENERATE_SIGNATURE_ERROR: return "GENERATE_SIGNATURE_ERROR"; - case wvcdm::GENERATE_USAGE_REPORT_ERROR: + case GENERATE_USAGE_REPORT_ERROR: return "GENERATE_USAGE_REPORT_ERROR"; - case wvcdm::GET_DECRYPT_HASH_ERROR: + case GET_DECRYPT_HASH_ERROR: return "GET_DECRYPT_HASH_ERROR"; - case wvcdm::GET_DEVICE_ID_ERROR: + case GET_DEVICE_ID_ERROR: return "GET_DEVICE_ID_ERROR"; - case wvcdm::GET_HDCP_CAPABILITY_FAILED: + case GET_HDCP_CAPABILITY_FAILED: return "GET_HDCP_CAPABILITY_FAILED"; - case wvcdm::GET_LICENSE_ERROR: + case GET_LICENSE_ERROR: return "GET_LICENSE_ERROR"; - case wvcdm::GET_MAX_NUMBER_OF_OPEN_SESSIONS_ERROR: + case GET_MAX_NUMBER_OF_OPEN_SESSIONS_ERROR: return "GET_MAX_NUMBER_OF_OPEN_SESSIONS_ERROR"; - case wvcdm::GET_NUMBER_OF_OPEN_SESSIONS_ERROR: + case GET_NUMBER_OF_OPEN_SESSIONS_ERROR: return "GET_NUMBER_OF_OPEN_SESSIONS_ERROR"; - case wvcdm::GET_OFFLINE_LICENSE_STATE_ERROR_1: + case GET_OFFLINE_LICENSE_STATE_ERROR_1: return "GET_OFFLINE_LICENSE_STATE_ERROR_1"; - case wvcdm::GET_OFFLINE_LICENSE_STATE_ERROR_2: + case GET_OFFLINE_LICENSE_STATE_ERROR_2: return "GET_OFFLINE_LICENSE_STATE_ERROR_2"; - case wvcdm::GET_PROVISIONING_METHOD_ERROR: + case GET_PROVISIONING_METHOD_ERROR: return "GET_PROVISIONING_METHOD_ERROR"; - case wvcdm::GET_RELEASED_LICENSE_ERROR: + case GET_RELEASED_LICENSE_ERROR: return "GET_RELEASED_LICENSE_ERROR"; - case wvcdm::GET_SRM_VERSION_ERROR: + case GET_SRM_VERSION_ERROR: return "GET_SRM_VERSION_ERROR"; - case wvcdm::GET_TOKEN_FROM_KEYBOX_ERROR: + case GET_TOKEN_FROM_KEYBOX_ERROR: return "GET_TOKEN_FROM_KEYBOX_ERROR"; - case wvcdm::GET_TOKEN_FROM_OEM_CERT_ERROR: + case GET_TOKEN_FROM_OEM_CERT_ERROR: return "GET_TOKEN_FROM_OEM_CERT_ERROR"; - case wvcdm::GET_USAGE_INFO_ERROR_1: + case GET_USAGE_INFO_ERROR_1: return "GET_USAGE_INFO_ERROR_1"; - case wvcdm::GET_USAGE_INFO_ERROR_2: + case GET_USAGE_INFO_ERROR_2: return "GET_USAGE_INFO_ERROR_2"; - case wvcdm::GET_USAGE_INFO_ERROR_3: + case GET_USAGE_INFO_ERROR_3: return "GET_USAGE_INFO_ERROR_3"; - case wvcdm::GET_USAGE_INFO_ERROR_4: + case GET_USAGE_INFO_ERROR_4: return "GET_USAGE_INFO_ERROR_4"; - case wvcdm::INCORRECT_CRYPTO_MODE: + case INCORRECT_CRYPTO_MODE: return "INCORRECT_CRYPTO_MODE"; - case wvcdm::INCORRECT_USAGE_SUPPORT_TYPE_1: + case INCORRECT_USAGE_SUPPORT_TYPE_1: return "INCORRECT_USAGE_SUPPORT_TYPE_1"; - case wvcdm::INCORRECT_USAGE_SUPPORT_TYPE_2: + case INCORRECT_USAGE_SUPPORT_TYPE_2: return "INCORRECT_USAGE_SUPPORT_TYPE_2"; - case wvcdm::INIT_DATA_NOT_FOUND: + case INIT_DATA_NOT_FOUND: return "INIT_DATA_NOT_FOUND"; - case wvcdm::INSUFFICIENT_CRYPTO_RESOURCES: + case INSUFFICIENT_CRYPTO_RESOURCES: return "INSUFFICIENT_CRYPTO_RESOURCES"; - case wvcdm::INSUFFICIENT_OUTPUT_PROTECTION: + case INSUFFICIENT_OUTPUT_PROTECTION: return "INSUFFICIENT_OUTPUT_PROTECTION"; - case wvcdm::INVALID_DECRYPT_HASH_FORMAT: + case INVALID_DECRYPT_HASH_FORMAT: return "INVALID_DECRYPT_HASH_FORMAT"; - case wvcdm::INVALID_DECRYPT_PARAMETERS_ENG_1: + case INVALID_DECRYPT_PARAMETERS_ENG_1: return "INVALID_DECRYPT_PARAMETERS_ENG_1"; - case wvcdm::INVALID_DECRYPT_PARAMETERS_ENG_2: + case INVALID_DECRYPT_PARAMETERS_ENG_2: return "INVALID_DECRYPT_PARAMETERS_ENG_2"; - case wvcdm::INVALID_DECRYPT_PARAMETERS_ENG_3: + case INVALID_DECRYPT_PARAMETERS_ENG_3: return "INVALID_DECRYPT_PARAMETERS_ENG_3"; - case wvcdm::INVALID_DECRYPT_PARAMETERS_ENG_4: + case INVALID_DECRYPT_PARAMETERS_ENG_4: return "INVALID_DECRYPT_PARAMETERS_ENG_4"; - case wvcdm::INVALID_DEVICE_CERTIFICATE_TYPE: + case INVALID_DEVICE_CERTIFICATE_TYPE: return "INVALID_DEVICE_CERTIFICATE_TYPE"; - case wvcdm::INVALID_IV_SIZE: + case INVALID_IV_SIZE: return "INVALID_IV_SIZE"; - case wvcdm::INVALID_KEY_SYSTEM: + case INVALID_KEY_SYSTEM: return "INVALID_KEY_SYSTEM"; - case wvcdm::INVALID_LICENSE_REQUEST_TYPE_1: + case INVALID_LICENSE_REQUEST_TYPE_1: return "INVALID_LICENSE_REQUEST_TYPE_1"; - case wvcdm::INVALID_LICENSE_REQUEST_TYPE_2: + case INVALID_LICENSE_REQUEST_TYPE_2: return "INVALID_LICENSE_REQUEST_TYPE_2"; - case wvcdm::INVALID_LICENSE_RESPONSE: + case INVALID_LICENSE_RESPONSE: return "INVALID_LICENSE_RESPONSE"; - case wvcdm::INVALID_LICENSE_TYPE: + case INVALID_LICENSE_TYPE: return "INVALID_LICENSE_TYPE"; - case wvcdm::INVALID_LICENSE_TYPE_2: + case INVALID_LICENSE_TYPE_2: return "INVALID_LICENSE_TYPE_2"; - case wvcdm::INVALID_PARAMETERS_ENG_5: + case INVALID_PARAMETERS_ENG_5: return "INVALID_PARAMETERS_ENG_5"; - case wvcdm::INVALID_PARAMETERS_ENG_13: + case INVALID_PARAMETERS_ENG_13: return "INVALID_PARAMETERS_ENG_13"; - case wvcdm::INVALID_PARAMETERS_ENG_14: + case INVALID_PARAMETERS_ENG_14: return "INVALID_PARAMETERS_ENG_14"; - case wvcdm::INVALID_PARAMETERS_ENG_15: + case INVALID_PARAMETERS_ENG_15: return "INVALID_PARAMETERS_ENG_15"; - case wvcdm::INVALID_PARAMETERS_ENG_16: + case INVALID_PARAMETERS_ENG_16: return "INVALID_PARAMETERS_ENG_16"; - case wvcdm::INVALID_PARAMETERS_ENG_22: + case INVALID_PARAMETERS_ENG_22: return "INVALID_PARAMETERS_ENG_22"; - case wvcdm::INVALID_PARAMETERS_ENG_23: + case INVALID_PARAMETERS_ENG_23: return "INVALID_PARAMETERS_ENG_23"; - case wvcdm::INVALID_PARAMETERS_ENG_24: + case INVALID_PARAMETERS_ENG_24: return "INVALID_PARAMETERS_ENG_24"; - case wvcdm::INVALID_PARAMETERS_LIC_1: + case INVALID_PARAMETERS_LIC_1: return "INVALID_PARAMETERS_LIC_1"; - case wvcdm::INVALID_PARAMETERS_LIC_2: + case INVALID_PARAMETERS_LIC_2: return "INVALID_PARAMETERS_LIC_2"; - case wvcdm::INVALID_PARAMETERS_LIC_3: + case INVALID_PARAMETERS_LIC_3: return "INVALID_PARAMETERS_LIC_3"; - case wvcdm::INVALID_PARAMETERS_LIC_4: + case INVALID_PARAMETERS_LIC_4: return "INVALID_PARAMETERS_LIC_4"; - case wvcdm::INVALID_PARAMETERS_LIC_6: + case INVALID_PARAMETERS_LIC_6: return "INVALID_PARAMETERS_LIC_6"; - case wvcdm::INVALID_PARAMETERS_LIC_7: + case INVALID_PARAMETERS_LIC_7: return "INVALID_PARAMETERS_LIC_7"; - case wvcdm::INVALID_PROVISIONING_PARAMETERS_1: + case INVALID_PROVISIONING_PARAMETERS_1: return "INVALID_PROVISIONING_PARAMETERS_1"; - case wvcdm::INVALID_PROVISIONING_PARAMETERS_2: + case INVALID_PROVISIONING_PARAMETERS_2: return "INVALID_PROVISIONING_PARAMETERS_2"; - case wvcdm::INVALID_PROVISIONING_REQUEST_PARAM_1: + case INVALID_PROVISIONING_REQUEST_PARAM_1: return "INVALID_PROVISIONING_REQUEST_PARAM_1"; - case wvcdm::INVALID_PROVISIONING_REQUEST_PARAM_2: + case INVALID_PROVISIONING_REQUEST_PARAM_2: return "INVALID_PROVISIONING_REQUEST_PARAM_2"; - case wvcdm::INVALID_QUERY_KEY: + case INVALID_QUERY_KEY: return "INVALID_QUERY_KEY"; - case wvcdm::INVALID_SESSION_1: + case INVALID_SESSION_1: return "INVALID_SESSION_1"; - case wvcdm::INVALID_SESSION_2: + case INVALID_SESSION_2: return "INVALID_SESSION_2"; - case wvcdm::INVALID_SESSION_ID: + case INVALID_SESSION_ID: return "INVALID_SESSION_ID"; - case wvcdm::INVALID_SRM_LIST: + case INVALID_SRM_LIST: return "INVALID_SRM_LIST"; - case wvcdm::INVALID_USAGE_ENTRY_NUMBER_MODIFICATION: + case INVALID_USAGE_ENTRY_NUMBER_MODIFICATION: return "INVALID_USAGE_ENTRY_NUMBER_MODIFICATION"; - case wvcdm::KEY_ADDED: + case KEY_ADDED: return "KEY_ADDED"; - case wvcdm::KEYBOX_TOKEN_TOO_SHORT: + case KEYBOX_TOKEN_TOO_SHORT: return "KEYBOX_TOKEN_TOO_SHORT"; - case wvcdm::KEY_CANCELED: + case KEY_CANCELED: return "KEY_CANCELED"; - case wvcdm::KEY_CONFLICT_1: + case KEY_CONFLICT_1: return "KEY_CONFLICT_1"; - case wvcdm::KEY_ERROR: + case KEY_ERROR: return "KEY_ERROR"; - case wvcdm::KEY_MESSAGE: + case KEY_MESSAGE: return "KEY_MESSAGE"; - case wvcdm::KEY_NOT_FOUND_1: + case KEY_NOT_FOUND_1: return "KEY_NOT_FOUND_1"; - case wvcdm::KEY_NOT_FOUND_2: + case KEY_NOT_FOUND_2: return "KEY_NOT_FOUND_2"; - case wvcdm::KEY_NOT_FOUND_3: + case KEY_NOT_FOUND_3: return "KEY_NOT_FOUND_3"; - case wvcdm::KEY_NOT_FOUND_4: + case KEY_NOT_FOUND_4: return "KEY_NOT_FOUND_4"; - case wvcdm::KEY_NOT_FOUND_5: + case KEY_NOT_FOUND_5: return "KEY_NOT_FOUND_5"; - case wvcdm::KEY_NOT_FOUND_6: + case KEY_NOT_FOUND_6: return "KEY_NOT_FOUND_6"; - case wvcdm::KEY_NOT_FOUND_IN_SESSION: + case KEY_NOT_FOUND_IN_SESSION: return "KEY_NOT_FOUND_IN_SESSION"; - case wvcdm::KEY_PROHIBITED_FOR_SECURITY_LEVEL: + case KEY_PROHIBITED_FOR_SECURITY_LEVEL: return "KEY_PROHIBITED_FOR_SECURITY_LEVEL"; - case wvcdm::KEY_REQUEST_ERROR_1: + case KEY_REQUEST_ERROR_1: return "KEY_REQUEST_ERROR_1"; - case wvcdm::KEYSET_ID_NOT_FOUND_1: + case KEYSET_ID_NOT_FOUND_1: return "KEYSET_ID_NOT_FOUND_1"; - case wvcdm::KEYSET_ID_NOT_FOUND_2: + case KEYSET_ID_NOT_FOUND_2: return "KEYSET_ID_NOT_FOUND_2"; - case wvcdm::KEYSET_ID_NOT_FOUND_3: + case KEYSET_ID_NOT_FOUND_3: return "KEYSET_ID_NOT_FOUND_3"; - case wvcdm::KEYSET_ID_NOT_FOUND_4: + case KEYSET_ID_NOT_FOUND_4: return "KEYSET_ID_NOT_FOUND_4"; - case wvcdm::KEY_SIZE_ERROR_1: + case KEY_SIZE_ERROR_1: return "KEY_SIZE_ERROR_1"; - case wvcdm::KEY_SIZE_ERROR_2: + case KEY_SIZE_ERROR_2: return "KEY_SIZE_ERROR_2"; - case wvcdm::LICENSE_ID_NOT_FOUND: + case LICENSE_ID_NOT_FOUND: return "LICENSE_ID_NOT_FOUND"; - case wvcdm::LICENSE_PARSER_INIT_ERROR: + case LICENSE_PARSER_INIT_ERROR: return "LICENSE_PARSER_INIT_ERROR"; - case wvcdm::LICENSE_PARSER_NOT_INITIALIZED_1: + case LICENSE_PARSER_NOT_INITIALIZED_1: return "LICENSE_PARSER_NOT_INITIALIZED_1"; - case wvcdm::LICENSE_PARSER_NOT_INITIALIZED_2: + case LICENSE_PARSER_NOT_INITIALIZED_2: return "LICENSE_PARSER_NOT_INITIALIZED_2"; - case wvcdm::LICENSE_PARSER_NOT_INITIALIZED_3: + case LICENSE_PARSER_NOT_INITIALIZED_3: return "LICENSE_PARSER_NOT_INITIALIZED_3"; - case wvcdm::LICENSE_PARSER_NOT_INITIALIZED_4: + case LICENSE_PARSER_NOT_INITIALIZED_4: return "LICENSE_PARSER_NOT_INITIALIZED_4"; - case wvcdm::LICENSE_RENEWAL_NONCE_GENERATION_ERROR: + case LICENSE_RENEWAL_NONCE_GENERATION_ERROR: return "LICENSE_RENEWAL_NONCE_GENERATION_ERROR"; - case wvcdm::LICENSE_RENEWAL_PROHIBITED: + case LICENSE_RENEWAL_PROHIBITED: return "LICENSE_RENEWAL_PROHIBITED"; - case wvcdm::LICENSE_REQUEST_NONCE_GENERATION_ERROR: + case LICENSE_REQUEST_NONCE_GENERATION_ERROR: return "LICENSE_REQUEST_NONCE_GENERATION_ERROR"; - case wvcdm::LICENSE_RESPONSE_NOT_SIGNED: + case LICENSE_RESPONSE_NOT_SIGNED: return "LICENSE_RESPONSE_NOT_SIGNED"; - case wvcdm::LICENSE_RESPONSE_PARSE_ERROR_1: + case LICENSE_RESPONSE_PARSE_ERROR_1: return "LICENSE_RESPONSE_PARSE_ERROR_1"; - case wvcdm::LICENSE_RESPONSE_PARSE_ERROR_2: + case LICENSE_RESPONSE_PARSE_ERROR_2: return "LICENSE_RESPONSE_PARSE_ERROR_2"; - case wvcdm::LICENSE_RESPONSE_PARSE_ERROR_3: + case LICENSE_RESPONSE_PARSE_ERROR_3: return "LICENSE_RESPONSE_PARSE_ERROR_3"; - case wvcdm::LICENSE_RESPONSE_PARSE_ERROR_4: + case LICENSE_RESPONSE_PARSE_ERROR_4: return "LICENSE_RESPONSE_PARSE_ERROR_4"; - case wvcdm::LICENSE_RESPONSE_PARSE_ERROR_5: + case LICENSE_RESPONSE_PARSE_ERROR_5: return "LICENSE_RESPONSE_PARSE_ERROR_5"; - case wvcdm::LICENSE_USAGE_ENTRY_MISSING: + case LICENSE_USAGE_ENTRY_MISSING: return "LICENSE_USAGE_ENTRY_MISSING"; - case wvcdm::LIST_LICENSE_ERROR_1: + case LIST_LICENSE_ERROR_1: return "LIST_LICENSE_ERROR_1"; - case wvcdm::LIST_LICENSE_ERROR_2: + case LIST_LICENSE_ERROR_2: return "LIST_LICENSE_ERROR_2"; - case wvcdm::LIST_USAGE_ERROR_1: + case LIST_USAGE_ERROR_1: return "LIST_USAGE_ERROR_1"; - case wvcdm::LIST_USAGE_ERROR_2: + case LIST_USAGE_ERROR_2: return "LIST_USAGE_ERROR_2"; - case wvcdm::LOAD_DEVICE_RSA_KEY_ERROR: + case LOAD_DEVICE_RSA_KEY_ERROR: return "LOAD_DEVICE_RSA_KEY_ERROR"; - case wvcdm::LOAD_ENTITLED_CONTENT_KEYS_ERROR: + case LOAD_ENTITLED_CONTENT_KEYS_ERROR: return "LOAD_ENTITLED_CONTENT_KEYS_ERROR"; - case wvcdm::LOAD_KEY_ERROR: + case LOAD_KEY_ERROR: return "LOAD_KEY_ERROR"; - case wvcdm::LOAD_LICENSE_ERROR: + case LOAD_LICENSE_ERROR: return "LOAD_LICENSE_ERROR"; - case wvcdm::LOAD_PROVISIONING_ERROR: + case LOAD_PROVISIONING_ERROR: return "LOAD_PROVISIONING_ERROR"; - case wvcdm::LOAD_RENEWAL_ERROR: + case LOAD_RENEWAL_ERROR: return "LOAD_RENEWAL_ERROR"; - case wvcdm::LOAD_SRM_ERROR: + case LOAD_SRM_ERROR: return "LOAD_SRM_ERROR"; - case wvcdm::LOAD_SYSTEM_ID_ERROR: + case LOAD_SYSTEM_ID_ERROR: return "LOAD_SYSTEM_ID_ERROR"; - case wvcdm::LOAD_USAGE_ENTRY_GENERATION_SKEW: + case LOAD_USAGE_ENTRY_GENERATION_SKEW: return "LOAD_USAGE_ENTRY_GENERATION_SKEW"; - case wvcdm::LOAD_USAGE_ENTRY_INVALID_SESSION: + case LOAD_USAGE_ENTRY_INVALID_SESSION: return "LOAD_USAGE_ENTRY_INVALID_SESSION"; - case wvcdm::LOAD_USAGE_ENTRY_SIGNATURE_FAILURE: + case LOAD_USAGE_ENTRY_SIGNATURE_FAILURE: return "LOAD_USAGE_ENTRY_SIGNATURE_FAILURE"; - case wvcdm::LOAD_USAGE_ENTRY_UNKNOWN_ERROR: + case LOAD_USAGE_ENTRY_UNKNOWN_ERROR: return "LOAD_USAGE_ENTRY_UNKNOWN_ERROR"; - case wvcdm::LOAD_USAGE_HEADER_BAD_MAGIC: + case LOAD_USAGE_HEADER_BAD_MAGIC: return "LOAD_USAGE_HEADER_BAD_MAGIC"; - case wvcdm::LOAD_USAGE_HEADER_GENERATION_SKEW: + case LOAD_USAGE_HEADER_GENERATION_SKEW: return "LOAD_USAGE_HEADER_GENERATION_SKEW"; - case wvcdm::LOAD_USAGE_HEADER_SIGNATURE_FAILURE: + case LOAD_USAGE_HEADER_SIGNATURE_FAILURE: return "LOAD_USAGE_HEADER_SIGNATURE_FAILURE"; - case wvcdm::LOAD_USAGE_HEADER_UNKNOWN_ERROR: + case LOAD_USAGE_HEADER_UNKNOWN_ERROR: return "LOAD_USAGE_HEADER_UNKNOWN_ERROR"; - case wvcdm::MOVE_USAGE_ENTRY_DESTINATION_IN_USE: + case MOVE_USAGE_ENTRY_DESTINATION_IN_USE: return "MOVE_USAGE_ENTRY_DESTINATION_IN_USE"; - case wvcdm::MOVE_USAGE_ENTRY_UNKNOWN_ERROR: + case MOVE_USAGE_ENTRY_UNKNOWN_ERROR: return "MOVE_USAGE_ENTRY_UNKNOWN_ERROR"; - case wvcdm::NEED_KEY: + case NEED_KEY: return "NEED_KEY"; - case wvcdm::NEED_PROVISIONING: + case NEED_PROVISIONING: return "NEED_PROVISIONING"; - case wvcdm::NO_CONTENT_KEY: + case NO_CONTENT_KEY: return "NO_CONTENT_KEY"; - case wvcdm::NO_CONTENT_KEY_2: + case NO_CONTENT_KEY_2: return "NO_CONTENT_KEY_2"; - case wvcdm::NO_CONTENT_KEY_3: + case NO_CONTENT_KEY_3: return "NO_CONTENT_KEY_3"; - case wvcdm::NO_DEVICE_KEY_1: + case NO_DEVICE_KEY_1: return "NO_DEVICE_KEY_1"; - case wvcdm::NO_MATCHING_ENTITLEMENT_KEY: + case NO_MATCHING_ENTITLEMENT_KEY: return "NO_MATCHING_ENTITLEMENT_KEY"; - case wvcdm::NO_SRM_VERSION: + case NO_SRM_VERSION: return "NO_SRM_VERSION"; - case wvcdm::NONCE_GENERATION_ERROR: + case NONCE_GENERATION_ERROR: return "NONCE_GENERATION_ERROR"; - case wvcdm::NOT_AN_ENTITLEMENT_SESSION: + case NOT_AN_ENTITLEMENT_SESSION: return "NOT_AN_ENTITLEMENT_SESSION"; - case wvcdm::NOT_IMPLEMENTED_ERROR: + case NOT_IMPLEMENTED_ERROR: return "NOT_IMPLEMENTED_ERROR"; - case wvcdm::NOT_INITIALIZED_ERROR: + case NOT_INITIALIZED_ERROR: return "NOT_INITIALIZED_ERROR"; - case wvcdm::NO_USAGE_ENTRIES: + case NO_USAGE_ENTRIES: return "NO_USAGE_ENTRIES"; - case wvcdm::OKP_ALREADY_PROVISIONED: + case OKP_ALREADY_PROVISIONED: return "OKP_ALREADY_PROVISIONED"; - case wvcdm::OPEN_CRYPTO_SESSION_ERROR: + case OPEN_CRYPTO_SESSION_ERROR: return "OPEN_CRYPTO_SESSION_ERROR"; - case wvcdm::OUTPUT_TOO_LARGE_ERROR: + case OUTPUT_TOO_LARGE_ERROR: return "OUTPUT_TOO_LARGE_ERROR"; - case wvcdm::PARAMETER_NULL: + case PARAMETER_NULL: return "PARAMETER_NULL"; - case wvcdm::PARSE_OKP_RESPONSE_ERROR: + case PARSE_OKP_RESPONSE_ERROR: return "PARSE_OKP_RESPONSE_ERROR"; - case wvcdm::PARSE_REQUEST_ERROR_1: + case PARSE_REQUEST_ERROR_1: return "PARSE_REQUEST_ERROR_1"; - case wvcdm::PARSE_REQUEST_ERROR_2: + case PARSE_REQUEST_ERROR_2: return "PARSE_REQUEST_ERROR_2"; - case wvcdm::PARSE_RESPONSE_ERROR_1: + case PARSE_RESPONSE_ERROR_1: return "PARSE_RESPONSE_ERROR_1"; - case wvcdm::PARSE_RESPONSE_ERROR_2: + case PARSE_RESPONSE_ERROR_2: return "PARSE_RESPONSE_ERROR_2"; - case wvcdm::PARSE_RESPONSE_ERROR_3: + case PARSE_RESPONSE_ERROR_3: return "PARSE_RESPONSE_ERROR_3"; - case wvcdm::PARSE_RESPONSE_ERROR_4: + case PARSE_RESPONSE_ERROR_4: return "PARSE_RESPONSE_ERROR_4"; - case wvcdm::PARSE_SERVICE_CERTIFICATE_ERROR: + case PARSE_SERVICE_CERTIFICATE_ERROR: return "PARSE_SERVICE_CERTIFICATE_ERROR"; - case wvcdm::PREPARE_CENC_CONTENT_ID_FAILED: + case PREPARE_CENC_CONTENT_ID_FAILED: return "PREPARE_CENC_CONTENT_ID_FAILED"; - case wvcdm::PREPARE_WEBM_CONTENT_ID_FAILED: + case PREPARE_WEBM_CONTENT_ID_FAILED: return "PREPARE_WEBM_CONTENT_ID_FAILED"; - case wvcdm::PRIVACY_MODE_ERROR_1: + case PRIVACY_MODE_ERROR_1: return "PRIVACY_MODE_ERROR_1"; - case wvcdm::PRIVACY_MODE_ERROR_2: + case PRIVACY_MODE_ERROR_2: return "PRIVACY_MODE_ERROR_2"; - case wvcdm::PRIVACY_MODE_ERROR_3: + case PRIVACY_MODE_ERROR_3: return "PRIVACY_MODE_ERROR_3"; - case wvcdm::RANDOM_GENERATION_ERROR: + case RANDOM_GENERATION_ERROR: return "RANDOM_GENERATION_ERROR"; - case wvcdm::REFRESH_KEYS_ERROR: + case REFRESH_KEYS_ERROR: return "REFRESH_KEYS_ERROR"; - case wvcdm::REINIT_ERROR: + case REINIT_ERROR: return "REINIT_ERROR"; - case wvcdm::RELEASE_KEY_ERROR: + case RELEASE_KEY_ERROR: return "RELEASE_KEY_ERROR"; - case wvcdm::RELEASE_KEY_REQUEST_ERROR: + case RELEASE_KEY_REQUEST_ERROR: return "RELEASE_KEY_REQUEST_ERROR"; - case wvcdm::RELEASE_LICENSE_ERROR_1: + case RELEASE_LICENSE_ERROR_1: return "RELEASE_LICENSE_ERROR_1"; - case wvcdm::RELEASE_LICENSE_ERROR_2: + case RELEASE_LICENSE_ERROR_2: return "RELEASE_LICENSE_ERROR_2"; - case wvcdm::RELEASE_USAGE_INFO_ERROR: + case RELEASE_USAGE_INFO_ERROR: return "RELEASE_USAGE_INFO_ERROR"; - case wvcdm::RELEASE_USAGE_INFO_FAILED: + case RELEASE_USAGE_INFO_FAILED: return "RELEASE_USAGE_INFO_FAILED"; - case wvcdm::REMOVE_ALL_USAGE_INFO_ERROR_1: + case REMOVE_ALL_USAGE_INFO_ERROR_1: return "REMOVE_ALL_USAGE_INFO_ERROR_1"; - case wvcdm::REMOVE_ALL_USAGE_INFO_ERROR_2: + case REMOVE_ALL_USAGE_INFO_ERROR_2: return "REMOVE_ALL_USAGE_INFO_ERROR_2"; - case wvcdm::REMOVE_ALL_USAGE_INFO_ERROR_5: + case REMOVE_ALL_USAGE_INFO_ERROR_5: return "REMOVE_ALL_USAGE_INFO_ERROR_5"; - case wvcdm::REMOVE_ALL_USAGE_INFO_ERROR_6: + case REMOVE_ALL_USAGE_INFO_ERROR_6: return "REMOVE_ALL_USAGE_INFO_ERROR_6"; - case wvcdm::REMOVE_ALL_USAGE_INFO_ERROR_7: + case REMOVE_ALL_USAGE_INFO_ERROR_7: return "REMOVE_ALL_USAGE_INFO_ERROR_7"; - case wvcdm::REMOVE_OFFLINE_LICENSE_ERROR_1: + case REMOVE_OFFLINE_LICENSE_ERROR_1: return "REMOVE_OFFLINE_LICENSE_ERROR_1"; - case wvcdm::REMOVE_OFFLINE_LICENSE_ERROR_2: + case REMOVE_OFFLINE_LICENSE_ERROR_2: return "REMOVE_OFFLINE_LICENSE_ERROR_2"; - case wvcdm::REMOVE_USAGE_INFO_ERROR_1: + case REMOVE_USAGE_INFO_ERROR_1: return "REMOVE_USAGE_INFO_ERROR_1"; - case wvcdm::REMOVE_USAGE_INFO_ERROR_2: + case REMOVE_USAGE_INFO_ERROR_2: return "REMOVE_USAGE_INFO_ERROR_2"; - case wvcdm::REMOVE_USAGE_INFO_ERROR_3: + case REMOVE_USAGE_INFO_ERROR_3: return "REMOVE_USAGE_INFO_ERROR_3"; - case wvcdm::RENEW_KEY_ERROR_1: + case RENEW_KEY_ERROR_1: return "RENEW_KEY_ERROR_1"; - case wvcdm::RENEW_KEY_ERROR_2: + case RENEW_KEY_ERROR_2: return "RENEW_KEY_ERROR_2"; - case wvcdm::RESTORE_OFFLINE_LICENSE_ERROR_2: + case RESTORE_OFFLINE_LICENSE_ERROR_2: return "RESTORE_OFFLINE_LICENSE_ERROR_2"; - case wvcdm::REWRAP_DEVICE_RSA_KEY_ERROR: + case REWRAP_DEVICE_RSA_KEY_ERROR: return "REWRAP_DEVICE_RSA_KEY_ERROR"; - case wvcdm::RSA_SIGNATURE_GENERATION_ERROR: + case RSA_SIGNATURE_GENERATION_ERROR: return "RSA_SIGNATURE_GENERATION_ERROR"; - case wvcdm::SAMPLE_AND_SUBSAMPLE_SIZE_MISMATCH: + case SAMPLE_AND_SUBSAMPLE_SIZE_MISMATCH: return "SAMPLE_AND_SUBSAMPLE_SIZE_MISMATCH"; - case wvcdm::SERVICE_CERTIFICATE_PROVIDER_ID_EMPTY: + case SERVICE_CERTIFICATE_PROVIDER_ID_EMPTY: return "SERVICE_CERTIFICATE_PROVIDER_ID_EMPTY"; - case wvcdm::SESSION_FILE_HANDLE_INIT_ERROR: + case SESSION_FILE_HANDLE_INIT_ERROR: return "SESSION_FILE_HANDLE_INIT_ERROR"; - case wvcdm::SESSION_KEYS_NOT_FOUND: + case SESSION_KEYS_NOT_FOUND: return "SESSION_KEYS_NOT_FOUND"; - case wvcdm::SESSION_KEYS_NOT_FOUND_2: + case SESSION_KEYS_NOT_FOUND_2: return "SESSION_KEYS_NOT_FOUND_2"; - case wvcdm::SESSION_LOST_STATE_ERROR: + case SESSION_LOST_STATE_ERROR: return "SESSION_LOST_STATE_ERROR"; - case wvcdm::SESSION_NOT_FOUND_1: + case SESSION_NOT_FOUND_1: return "SESSION_NOT_FOUND_1"; - case wvcdm::SESSION_NOT_FOUND_2: + case SESSION_NOT_FOUND_2: return "SESSION_NOT_FOUND_2"; - case wvcdm::SESSION_NOT_FOUND_3: + case SESSION_NOT_FOUND_3: return "SESSION_NOT_FOUND_3"; - case wvcdm::SESSION_NOT_FOUND_4: + case SESSION_NOT_FOUND_4: return "SESSION_NOT_FOUND_4"; - case wvcdm::SESSION_NOT_FOUND_5: + case SESSION_NOT_FOUND_5: return "SESSION_NOT_FOUND_5"; - case wvcdm::SESSION_NOT_FOUND_6: + case SESSION_NOT_FOUND_6: return "SESSION_NOT_FOUND_6"; - case wvcdm::SESSION_NOT_FOUND_7: + case SESSION_NOT_FOUND_7: return "SESSION_NOT_FOUND_7"; - case wvcdm::SESSION_NOT_FOUND_8: + case SESSION_NOT_FOUND_8: return "SESSION_NOT_FOUND_8"; - case wvcdm::SESSION_NOT_FOUND_9: + case SESSION_NOT_FOUND_9: return "SESSION_NOT_FOUND_9"; - case wvcdm::SESSION_NOT_FOUND_10: + case SESSION_NOT_FOUND_10: return "SESSION_NOT_FOUND_10"; - case wvcdm::SESSION_NOT_FOUND_12: + case SESSION_NOT_FOUND_12: return "SESSION_NOT_FOUND_12"; - case wvcdm::SESSION_NOT_FOUND_13: + case SESSION_NOT_FOUND_13: return "SESSION_NOT_FOUND_13"; - case wvcdm::SESSION_NOT_FOUND_14: + case SESSION_NOT_FOUND_14: return "SESSION_NOT_FOUND_14"; - case wvcdm::SESSION_NOT_FOUND_15: + case SESSION_NOT_FOUND_15: return "SESSION_NOT_FOUND_15"; - case wvcdm::SESSION_NOT_FOUND_16: + case SESSION_NOT_FOUND_16: return "SESSION_NOT_FOUND_16"; - case wvcdm::SESSION_NOT_FOUND_18: + case SESSION_NOT_FOUND_18: return "SESSION_NOT_FOUND_18"; - case wvcdm::SESSION_NOT_FOUND_19: + case SESSION_NOT_FOUND_19: return "SESSION_NOT_FOUND_19"; - case wvcdm::SESSION_NOT_FOUND_20: + case SESSION_NOT_FOUND_20: return "SESSION_NOT_FOUND_20"; - case wvcdm::SESSION_NOT_FOUND_21: + case SESSION_NOT_FOUND_21: return "SESSION_NOT_FOUND_21"; - case wvcdm::SESSION_NOT_FOUND_22: + case SESSION_NOT_FOUND_22: return "SESSION_NOT_FOUND_22"; - case wvcdm::SESSION_NOT_FOUND_23: + case SESSION_NOT_FOUND_23: return "SESSION_NOT_FOUND_23"; - case wvcdm::SESSION_NOT_FOUND_FOR_DECRYPT: + case SESSION_NOT_FOUND_FOR_DECRYPT: return "SESSION_NOT_FOUND_FOR_DECRYPT"; - case wvcdm::SET_DECRYPT_HASH_ERROR: + case SET_DECRYPT_HASH_ERROR: return "SET_DECRYPT_HASH_ERROR"; - case wvcdm::SHRINK_USAGE_TABLE_HEADER_ENTRY_IN_USE: + case SHRINK_USAGE_TABLE_HEADER_ENTRY_IN_USE: return "SHRINK_USAGE_TABLE_HEADER_ENTRY_IN_USE"; - case wvcdm::SHRINK_USAGE_TABLE_HEADER_UNKNOWN_ERROR: + case SHRINK_USAGE_TABLE_HEADER_UNKNOWN_ERROR: return "SHRINK_USAGE_TABLE_HEADER_UNKNOWN_ERROR"; - case wvcdm::SIGNATURE_NOT_FOUND: + case SIGNATURE_NOT_FOUND: return "SIGNATURE_NOT_FOUND"; - case wvcdm::SIGNATURE_NOT_FOUND_2: + case SIGNATURE_NOT_FOUND_2: return "SIGNATURE_NOT_FOUND_2"; - case wvcdm::STORE_LICENSE_ERROR_1: + case STORE_LICENSE_ERROR_1: return "STORE_LICENSE_ERROR_1"; - case wvcdm::STORE_LICENSE_ERROR_2: + case STORE_LICENSE_ERROR_2: return "STORE_LICENSE_ERROR_2"; - case wvcdm::STORE_USAGE_INFO_ERROR: + case STORE_USAGE_INFO_ERROR: return "STORE_USAGE_INFO_ERROR"; - case wvcdm::SYSTEM_INVALIDATED_ERROR: + case SYSTEM_INVALIDATED_ERROR: return "SYSTEM_INVALIDATED_ERROR"; - case wvcdm::UNEXPECTED_EMPTY_USAGE_ENTRY: + case UNEXPECTED_EMPTY_USAGE_ENTRY: return "UNEXPECTED_EMPTY_USAGE_ENTRY"; - case wvcdm::UNKNOWN_CLIENT_TOKEN_TYPE: + case UNKNOWN_CLIENT_TOKEN_TYPE: return "UNKNOWN_CLIENT_TOKEN_TYPE"; - case wvcdm::UNKNOWN_SELECT_KEY_ERROR_1: + case UNKNOWN_SELECT_KEY_ERROR_1: return "UNKNOWN_SELECT_KEY_ERROR_1"; - case wvcdm::UNKNOWN_SELECT_KEY_ERROR_2: + case UNKNOWN_SELECT_KEY_ERROR_2: return "UNKNOWN_SELECT_KEY_ERROR_2"; - case wvcdm::UNPROVISION_ERROR_1: + case UNPROVISION_ERROR_1: return "UNPROVISION_ERROR_1"; - case wvcdm::UNPROVISION_ERROR_2: + case UNPROVISION_ERROR_2: return "UNPROVISION_ERROR_2"; - case wvcdm::UNPROVISION_ERROR_3: + case UNPROVISION_ERROR_3: return "UNPROVISION_ERROR_3"; - case wvcdm::UNPROVISION_ERROR_4: + case UNPROVISION_ERROR_4: return "UNPROVISION_ERROR_4"; - case wvcdm::UNSUPPORTED_INIT_DATA: + case UNSUPPORTED_INIT_DATA: return "UNSUPPORTED_INIT_DATA"; - case wvcdm::UNSUPPORTED_INIT_DATA_FORMAT: + case UNSUPPORTED_INIT_DATA_FORMAT: return "UNSUPPORTED_INIT_DATA_FORMAT"; - case wvcdm::UPDATE_USAGE_ENTRY_UNKNOWN_ERROR: + case UPDATE_USAGE_ENTRY_UNKNOWN_ERROR: return "UPDATE_USAGE_ENTRY_UNKNOWN_ERROR"; - case wvcdm::USAGE_ENTRY_NUMBER_MISMATCH: + case USAGE_ENTRY_NUMBER_MISMATCH: return "USAGE_ENTRY_NUMBER_MISMATCH"; - case wvcdm::USAGE_ENTRY_ALREADY_LOADED: + case USAGE_ENTRY_ALREADY_LOADED: return "USAGE_ENTRY_ALREADY_LOADED"; - case wvcdm::USAGE_GET_ENTRY_RETRIEVE_INVALID_STORAGE_TYPE: + case USAGE_GET_ENTRY_RETRIEVE_INVALID_STORAGE_TYPE: return "USAGE_GET_ENTRY_RETRIEVE_INVALID_STORAGE_TYPE"; - case wvcdm::USAGE_GET_ENTRY_RETRIEVE_LICENSE_FAILED: + case USAGE_GET_ENTRY_RETRIEVE_LICENSE_FAILED: return "USAGE_GET_ENTRY_RETRIEVE_LICENSE_FAILED"; - case wvcdm::USAGE_GET_ENTRY_RETRIEVE_USAGE_INFO_FAILED: + case USAGE_GET_ENTRY_RETRIEVE_USAGE_INFO_FAILED: return "USAGE_GET_ENTRY_RETRIEVE_USAGE_INFO_FAILED"; - case wvcdm::USAGE_INFO_NOT_FOUND: + case USAGE_INFO_NOT_FOUND: return "USAGE_INFO_NOT_FOUND"; - case wvcdm::USAGE_INFORMATION_SUPPORT_FAILED: + case USAGE_INFORMATION_SUPPORT_FAILED: return "USAGE_INFORMATION_SUPPORT_FAILED"; - case wvcdm::USAGE_INVALID_LOAD_ENTRY: + case USAGE_INVALID_LOAD_ENTRY: return "USAGE_INVALID_LOAD_ENTRY"; - case wvcdm::USAGE_INVALID_NEW_ENTRY: + case USAGE_INVALID_NEW_ENTRY: return "USAGE_INVALID_NEW_ENTRY"; - case wvcdm::USAGE_INVALID_PARAMETERS_1: + case USAGE_INVALID_PARAMETERS_1: return "USAGE_INVALID_PARAMETERS_1"; - case wvcdm::USAGE_INVALID_PARAMETERS_2: + case USAGE_INVALID_PARAMETERS_2: return "USAGE_INVALID_PARAMETERS_2"; - case wvcdm::USAGE_STORE_ENTRY_RETRIEVE_INVALID_STORAGE_TYPE: + case USAGE_STORE_ENTRY_RETRIEVE_INVALID_STORAGE_TYPE: return "USAGE_STORE_ENTRY_RETRIEVE_INVALID_STORAGE_TYPE"; - case wvcdm::USAGE_STORE_ENTRY_RETRIEVE_LICENSE_FAILED: + case USAGE_STORE_ENTRY_RETRIEVE_LICENSE_FAILED: return "USAGE_STORE_ENTRY_RETRIEVE_LICENSE_FAILED"; - case wvcdm::USAGE_STORE_ENTRY_RETRIEVE_USAGE_INFO_FAILED: + case USAGE_STORE_ENTRY_RETRIEVE_USAGE_INFO_FAILED: return "USAGE_STORE_ENTRY_RETRIEVE_USAGE_INFO_FAILED"; - case wvcdm::USAGE_STORE_LICENSE_FAILED: + case USAGE_STORE_LICENSE_FAILED: return "USAGE_STORE_LICENSE_FAILED"; - case wvcdm::USAGE_STORE_USAGE_INFO_FAILED: + case USAGE_STORE_USAGE_INFO_FAILED: return "USAGE_STORE_USAGE_INFO_FAILED"; - case wvcdm::USAGE_SUPPORT_GET_API_FAILED: + case USAGE_SUPPORT_GET_API_FAILED: return "USAGE_SUPPORT_GET_API_FAILED"; - case wvcdm::WEBM_INIT_DATA_UNAVAILABLE: + case WEBM_INIT_DATA_UNAVAILABLE: return "WEBM_INIT_DATA_UNAVAILABLE"; - case wvcdm::PROVISIONING_NOT_ALLOWED_FOR_ATSC: + case PROVISIONING_NOT_ALLOWED_FOR_ATSC: return "PROVISIONING_NOT_ALLOWED_FOR_ATSC"; - case wvcdm::PROVISIONING_TYPE_IS_NOT_BOOT_CERTIFICATE_CHAIN_ERROR: + case PROVISIONING_TYPE_IS_NOT_BOOT_CERTIFICATE_CHAIN_ERROR: return "PROVISIONING_TYPE_IS_NOT_BOOT_CERTIFICATE_CHAIN_ERROR"; - case wvcdm::GET_BOOT_CERTIFICATE_CHAIN_ERROR: + case GET_BOOT_CERTIFICATE_CHAIN_ERROR: return "GET_BOOT_CERTIFICATE_CHAIN_ERROR"; - case wvcdm::GENERATE_CERTIFICATE_KEY_PAIR_ERROR: + case GENERATE_CERTIFICATE_KEY_PAIR_ERROR: return "GENERATE_CERTIFICATE_KEY_PAIR_ERROR"; - case wvcdm::GENERATE_CERTIFICATE_KEY_PAIR_UNKNOWN_TYPE_ERROR: + case GENERATE_CERTIFICATE_KEY_PAIR_UNKNOWN_TYPE_ERROR: return "GENERATE_CERTIFICATE_KEY_PAIR_ERROR"; - case wvcdm::LOAD_OEM_CERTIFICATE_PRIVATE_KEY_ERROR: + case LOAD_OEM_CERTIFICATE_PRIVATE_KEY_ERROR: return "GENERATE_CERTIFICATE_KEY_PAIR_ERROR"; - case wvcdm::PROVISIONING_4_CRYPTO_SESSION_NOT_OPEN: + case PROVISIONING_4_CRYPTO_SESSION_NOT_OPEN: return "PROVISIONING_4_CRYPTO_SESSION_NOT_OPEN"; - case wvcdm::PROVISIONING_4_FILE_SYSTEM_IS_NULL: + case PROVISIONING_4_FILE_SYSTEM_IS_NULL: return "PROVISIONING_4_FILE_SYSTEM_IS_NULL"; - case wvcdm::PROVISIONING_4_FAILED_TO_INITIALIZE_DEVICE_FILES: + case PROVISIONING_4_FAILED_TO_INITIALIZE_DEVICE_FILES: return "PROVISIONING_4_FAILED_TO_INITIALIZE_DEVICE_FILES"; - case wvcdm::PROVISIONING_4_RESPONSE_FAILED_TO_PARSE_MESSAGE: + case PROVISIONING_4_RESPONSE_FAILED_TO_PARSE_MESSAGE: return "PROVISIONING_4_RESPONSE_FAILED_TO_PARSE_MESSAGE"; - case wvcdm::PROVISIONING_4_RESPONSE_HAS_ERROR_STATUS: + case PROVISIONING_4_RESPONSE_HAS_ERROR_STATUS: return "PROVISIONING_4_RESPONSE_HAS_ERROR_STATUS"; - case wvcdm::PROVISIONING_4_RESPONSE_HAS_NO_CERTIFICATE: + case PROVISIONING_4_RESPONSE_HAS_NO_CERTIFICATE: return "PROVISIONING_4_RESPONSE_HAS_NO_CERTIFICATE"; - case wvcdm::PROVISIONING_4_NO_PRIVATE_KEY: + case PROVISIONING_4_NO_PRIVATE_KEY: return "PROVISIONING_4_NO_PRIVATE_KEY"; - case wvcdm::PROVISIONING_4_FAILED_TO_INITIALIZE_DEVICE_FILES_2: + case PROVISIONING_4_FAILED_TO_INITIALIZE_DEVICE_FILES_2: return "PROVISIONING_4_FAILED_TO_INITIALIZE_DEVICE_FILES_2"; - case wvcdm::PROVISIONING_4_FAILED_TO_STORE_OEM_CERTIFICATE: + case PROVISIONING_4_FAILED_TO_STORE_OEM_CERTIFICATE: return "PROVISIONING_4_FAILED_TO_STORE_OEM_CERTIFICATE"; - case wvcdm::PROVISIONING_4_FAILED_TO_STORE_DRM_CERTIFICATE: + case PROVISIONING_4_FAILED_TO_STORE_DRM_CERTIFICATE: return "PROVISIONING_4_FAILED_TO_STORE_DRM_CERTIFICATE"; - case wvcdm::PROVISIONING_4_FAILED_TO_INITIALIZE_DEVICE_FILES_3: + case PROVISIONING_4_FAILED_TO_INITIALIZE_DEVICE_FILES_3: return "PROVISIONING_4_FAILED_TO_INITIALIZE_DEVICE_FILES_3"; - default: - return "Invalid Cdm error."; } + return UnknownEnumValueToString(static_cast(cdm_response_type)); } const char* UnknownEnumValueToString(int value) { diff --git a/libwvdrmengine/src/WVDrmFactory.cpp b/libwvdrmengine/src/WVDrmFactory.cpp index 73814679..c5f78de0 100644 --- a/libwvdrmengine/src/WVDrmFactory.cpp +++ b/libwvdrmengine/src/WVDrmFactory.cpp @@ -205,7 +205,7 @@ void WVDrmFactory::printCdmMetrics(int fd) { dprintf(fd, "%s\n", formatted.c_str()); } } else { - dprintf(fd, " error_message: %s\n", ::wvcdm::CdmResponseTypeToString(result).c_str()); + dprintf(fd, " error_message: %s\n", ::wvcdm::CdmResponseTypeToString(result)); dprintf(fd, " error_code: %d\n", result); } }