diff options
| author | Andreas Huber <andih@google.com> | 2012-04-06 11:06:28 -0700 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2012-04-06 12:16:27 -0700 |
| commit | 4b75a9c8b93a90749bc5d22912ad0d96c12f4ecf (patch) | |
| tree | ae217f5c50a37349dce944c5d8a065a8740c88a9 /include/media/stagefright/MediaCodec.h | |
| parent | 3f502bfc6d04d08369cf147284c5c4c2ac7c9a0e (diff) | |
| download | frameworks_av-4b75a9c8b93a90749bc5d22912ad0d96c12f4ecf.zip frameworks_av-4b75a9c8b93a90749bc5d22912ad0d96c12f4ecf.tar.gz frameworks_av-4b75a9c8b93a90749bc5d22912ad0d96c12f4ecf.tar.bz2 | |
New API to support submitting encrypted buffers to the decoder.
Change-Id: I69dd60e43078c4211c6123cf6e0ce90e676bf873
related-to-bug: 6275919
Diffstat (limited to 'include/media/stagefright/MediaCodec.h')
| -rw-r--r-- | include/media/stagefright/MediaCodec.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/include/media/stagefright/MediaCodec.h b/include/media/stagefright/MediaCodec.h index 0b0d511..107699e 100644 --- a/include/media/stagefright/MediaCodec.h +++ b/include/media/stagefright/MediaCodec.h @@ -19,6 +19,7 @@ #define MEDIA_CODEC_H_ #include <gui/ISurfaceTexture.h> +#include <media/hardware/CryptoAPI.h> #include <media/stagefright/foundation/AHandler.h> #include <utils/Vector.h> @@ -40,7 +41,6 @@ struct MediaCodec : public AHandler { BUFFER_FLAG_SYNCFRAME = 1, BUFFER_FLAG_CODECCONFIG = 2, BUFFER_FLAG_EOS = 4, - BUFFER_FLAG_ENCRYPTED = 8, }; static sp<MediaCodec> CreateByType( @@ -74,6 +74,17 @@ struct MediaCodec : public AHandler { int64_t presentationTimeUs, uint32_t flags); + status_t queueSecureInputBuffer( + size_t index, + size_t offset, + const CryptoPlugin::SubSample *subSamples, + size_t numSubSamples, + const uint8_t key[16], + const uint8_t iv[16], + CryptoPlugin::Mode mode, + int64_t presentationTimeUs, + uint32_t flags); + status_t dequeueInputBuffer(size_t *index, int64_t timeoutUs = 0ll); status_t dequeueOutputBuffer( |