Improve Error Reporting

Adds more meaningful error reporting where possible to the DrmEngine.  Adds
translation of CDM and OEMCrypto errors to Android errors.

Bug: 8621516
Change-Id: Ibab8a8711c3929ed72870ec7e138cd42358d9fb3
This commit is contained in:
Jeff Tinker
2013-04-17 19:02:54 -07:00
parent 40abceaaed
commit ded298688c
9 changed files with 218 additions and 120 deletions

View File

@@ -5,6 +5,7 @@
#ifndef WV_DRM_PLUGIN_H_
#define WV_DRM_PLUGIN_H_
#include <stdint.h>
#include <map>
#include "media/drm/DrmAPI.h"
@@ -159,6 +160,8 @@ class WVDrmPlugin : public android::DrmPlugin,
WvContentDecryptionModule* mCDM;
WVGenericCryptoInterface* mCrypto;
map<CdmSessionId, CryptoSession> mCryptoSessions;
static status_t mapOEMCryptoResult(OEMCryptoResult res);
};
} // namespace wvdrm

View File

@@ -5,6 +5,8 @@
#ifndef WV_GENERIC_CRYPTO_INTERFACE_H_
#define WV_GENERIC_CRYPTO_INTERFACE_H_
#include <stdint.h>
#include "OEMCryptoCENC.h"
namespace wvdrm {