summaryrefslogtreecommitdiffstats
path: root/include/media/stagefright/MediaCodec.h
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2012-04-19 12:52:20 -0700
committerAndreas Huber <andih@google.com>2012-04-19 12:53:59 -0700
commit5b8987e7de9d04b09153f329c680d2316cdb44ec (patch)
tree2b08e1f8abd0d4b869ce8923b1462530b916a7eb /include/media/stagefright/MediaCodec.h
parentfd9e14bc28f377065e43ec6833d754ca151b3941 (diff)
downloadframeworks_av-5b8987e7de9d04b09153f329c680d2316cdb44ec.zip
frameworks_av-5b8987e7de9d04b09153f329c680d2316cdb44ec.tar.gz
frameworks_av-5b8987e7de9d04b09153f329c680d2316cdb44ec.tar.bz2
Allow propagation of error information and description from the CryptoPlugin to
the higher layers. Change-Id: I9f434ad55cdf575803c208bedf47b607baff2330 related-to-bug: 6365261
Diffstat (limited to 'include/media/stagefright/MediaCodec.h')
-rw-r--r--include/media/stagefright/MediaCodec.h7
1 files changed, 5 insertions, 2 deletions
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);