diff options
| author | Marco Nelissen <marcone@google.com> | 2014-05-15 21:58:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-15 21:58:36 +0000 |
| commit | 5362ba070797c52a18d3cb5558cd41d1a72c74c5 (patch) | |
| tree | fddfcdb07fcc5499c3b026fe4c42b217fef21c7a /include/ndk/NdkMediaError.h | |
| parent | 16a25c150c49c730d206167012a24cbd9eb3a082 (diff) | |
| parent | e419d7cd5c62b4b5866a45d59c5770bb470193c1 (diff) | |
| download | frameworks_av-5362ba070797c52a18d3cb5558cd41d1a72c74c5.zip frameworks_av-5362ba070797c52a18d3cb5558cd41d1a72c74c5.tar.gz frameworks_av-5362ba070797c52a18d3cb5558cd41d1a72c74c5.tar.bz2 | |
Merge "Unify error/status codes"
Diffstat (limited to 'include/ndk/NdkMediaError.h')
| -rw-r--r-- | include/ndk/NdkMediaError.h | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/include/ndk/NdkMediaError.h b/include/ndk/NdkMediaError.h index b89a10e..12613eb 100644 --- a/include/ndk/NdkMediaError.h +++ b/include/ndk/NdkMediaError.h @@ -32,13 +32,28 @@ extern "C" { #endif -enum { - AMEDIAERROR_BASE = -10000, - - AMEDIAERROR_GENERIC = AMEDIAERROR_BASE, - AMEDIAERROR_MALFORMED = AMEDIAERROR_BASE - 1, - AMEDIAERROR_UNSUPPORTED = AMEDIAERROR_BASE - 2 -}; +typedef enum { + AMEDIA_OK = 0, + + AMEDIA_ERROR_BASE = -10000, + AMEDIA_ERROR_UNKNOWN = AMEDIA_ERROR_BASE, + AMEDIA_ERROR_MALFORMED = AMEDIA_ERROR_BASE - 1, + AMEDIA_ERROR_UNSUPPORTED = AMEDIA_ERROR_BASE - 2, + AMEDIA_ERROR_INVALID_OBJECT = AMEDIA_ERROR_BASE - 3, + AMEDIA_ERROR_INVALID_PARAMETER = AMEDIA_ERROR_BASE - 4, + + AMEDIA_DRM_ERROR_BASE = -20000, + AMEDIA_DRM_NOT_PROVISIONED = AMEDIA_DRM_ERROR_BASE - 1, + AMEDIA_DRM_RESOURCE_BUSY = AMEDIA_DRM_ERROR_BASE - 2, + AMEDIA_DRM_DEVICE_REVOKED = AMEDIA_DRM_ERROR_BASE - 3, + AMEDIA_DRM_SHORT_BUFFER = AMEDIA_DRM_ERROR_BASE - 4, + AMEDIA_DRM_SESSION_NOT_OPENED = AMEDIA_DRM_ERROR_BASE - 5, + AMEDIA_DRM_TAMPER_DETECTED = AMEDIA_DRM_ERROR_BASE - 6, + AMEDIA_DRM_VERIFY_FAILED = AMEDIA_DRM_ERROR_BASE - 7, + AMEDIA_DRM_NEED_KEY = AMEDIA_DRM_ERROR_BASE - 8, + AMEDIA_DRM_LICENSE_EXPIRED = AMEDIA_DRM_ERROR_BASE - 9, + +} media_status_t; #ifdef __cplusplus |