diff options
| author | Takeshi Aimi <aimitakeshi@gmail.com> | 2010-09-20 23:40:41 +0900 |
|---|---|---|
| committer | Takeshi Aimi <aimitakeshi@gmail.com> | 2010-10-04 22:14:53 +0900 |
| commit | 2272ee27d9022d173b6eab45c409b3c3f57f30ec (patch) | |
| tree | 42fd86597781bdf6b3795907ec1d086b0b549a5c /include/drm/drm_framework_common.h | |
| parent | 0335b70c6cdbe96650d4bed817f9233cd8db1c6d (diff) | |
| download | frameworks_av-2272ee27d9022d173b6eab45c409b3c3f57f30ec.zip frameworks_av-2272ee27d9022d173b6eab45c409b3c3f57f30ec.tar.gz frameworks_av-2272ee27d9022d173b6eab45c409b3c3f57f30ec.tar.bz2 | |
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
Diffstat (limited to 'include/drm/drm_framework_common.h')
| -rw-r--r-- | include/drm/drm_framework_common.h | 4 |
1 files changed, 2 insertions, 2 deletions
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() */ |