diff options
| author | Andreas Huber <andih@google.com> | 2012-04-19 13:51:16 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-19 13:51:16 -0700 |
| commit | 8d6086781c79620ce6133df7bd27f0efdee6b4e6 (patch) | |
| tree | e69c38010ec52f70406054c1dc8152d44c2a94c3 /include | |
| parent | 1345ef0f49f83f37953e6d30616611a92294144a (diff) | |
| parent | 5b8987e7de9d04b09153f329c680d2316cdb44ec (diff) | |
| download | frameworks_av-8d6086781c79620ce6133df7bd27f0efdee6b4e6.zip frameworks_av-8d6086781c79620ce6133df7bd27f0efdee6b4e6.tar.gz frameworks_av-8d6086781c79620ce6133df7bd27f0efdee6b4e6.tar.bz2 | |
Merge "Allow propagation of error information and description from the CryptoPlugin to"
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/ICrypto.h | 5 | ||||
| -rw-r--r-- | include/media/stagefright/MediaCodec.h | 7 | ||||
| -rw-r--r-- | include/media/stagefright/MediaErrors.h | 8 |
3 files changed, 15 insertions, 5 deletions
diff --git a/include/media/ICrypto.h b/include/media/ICrypto.h index 376c326..32a2cf7 100644 --- a/include/media/ICrypto.h +++ b/include/media/ICrypto.h @@ -24,6 +24,8 @@ namespace android { +struct AString; + struct ICrypto : public IInterface { DECLARE_META_INTERFACE(Crypto); @@ -46,7 +48,8 @@ struct ICrypto : public IInterface { CryptoPlugin::Mode mode, const void *srcPtr, const CryptoPlugin::SubSample *subSamples, size_t numSubSamples, - void *dstPtr) = 0; + void *dstPtr, + AString *errorDetailMsg) = 0; private: DISALLOW_EVIL_CONSTRUCTORS(ICrypto); diff --git a/include/media/stagefright/MediaCodec.h b/include/media/stagefright/MediaCodec.h index 107699e..d09049e 100644 --- a/include/media/stagefright/MediaCodec.h +++ b/include/media/stagefright/MediaCodec.h @@ -28,6 +28,7 @@ namespace android { struct ABuffer; struct ACodec; struct AMessage; +struct AString; struct ICrypto; struct SoftwareRenderer; struct SurfaceTextureClient; @@ -72,7 +73,8 @@ struct MediaCodec : public AHandler { size_t offset, size_t size, int64_t presentationTimeUs, - uint32_t flags); + uint32_t flags, + AString *errorDetailMsg = NULL); status_t queueSecureInputBuffer( size_t index, @@ -83,7 +85,8 @@ struct MediaCodec : public AHandler { const uint8_t iv[16], CryptoPlugin::Mode mode, int64_t presentationTimeUs, - uint32_t flags); + uint32_t flags, + AString *errorDetailMsg = NULL); status_t dequeueInputBuffer(size_t *index, int64_t timeoutUs = 0ll); diff --git a/include/media/stagefright/MediaErrors.h b/include/media/stagefright/MediaErrors.h index 8889520..bb01467 100644 --- a/include/media/stagefright/MediaErrors.h +++ b/include/media/stagefright/MediaErrors.h @@ -55,8 +55,12 @@ enum { ERROR_DRM_CANNOT_HANDLE = DRM_ERROR_BASE - 6, ERROR_DRM_TAMPER_DETECTED = DRM_ERROR_BASE - 7, - ERROR_DRM_WV_VENDOR_MAX = DRM_ERROR_BASE - 500, - ERROR_DRM_WV_VENDOR_MIN = DRM_ERROR_BASE - 999, + ERROR_DRM_VENDOR_MAX = DRM_ERROR_BASE - 500, + ERROR_DRM_VENDOR_MIN = DRM_ERROR_BASE - 999, + + // Deprecated + ERROR_DRM_WV_VENDOR_MAX = ERROR_DRM_VENDOR_MAX, + ERROR_DRM_WV_VENDOR_MIN = ERROR_DRM_VENDOR_MIN, // Heartbeat Error Codes HEARTBEAT_ERROR_BASE = -3000, |