From 2272ee27d9022d173b6eab45c409b3c3f57f30ec Mon Sep 17 00:00:00 2001 From: Takeshi Aimi Date: Mon, 20 Sep 2010 23:40:41 +0900 Subject: Update of DRM framework. - Change "void" type of return value to "int" for returning status. - Add some of overloaded Java APIs which accept database Uri as input. - Add asynchronous APIs - Add OnEventListener and OnErrorListener for asynchronous APIs - Disable debug log - Change decrypt() API to accept an optional buffer needed by some of DRM schemes Changes are incorporated by Sony Corporation. Change-Id: I414a165e22cc79be6ea7cd28041788aa2b6b8f7c --- include/drm/drm_framework_common.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/drm/drm_framework_common.h') diff --git a/include/drm/drm_framework_common.h b/include/drm/drm_framework_common.h index 8b8a9f5..c5765a9 100644 --- a/include/drm/drm_framework_common.h +++ b/include/drm/drm_framework_common.h @@ -254,13 +254,13 @@ public: * (file format is not encrypted but ES is encrypted) * e.g., Marlin DRM (MP4 file format), WM-DRM (asf file format) * - * DecryptAPI::TYPE_ELEMENTARY_STREAM_BASED + * DecryptApiType::ELEMENTARY_STREAM_BASED * Decryption API set for ES based DRM * initializeDecryptUnit(), decrypt(), and finalizeDecryptUnit() * 2. Decrypt APIs for container based DRM (file format itself is encrypted) * e.g., OMA DRM (dcf file format) * - * DecryptAPI::TYPE_CONTAINER_BASED + * DecryptApiType::CONTAINER_BASED * POSIX based Decryption API set for container based DRM * pread() */ -- cgit v1.1