diff options
| author | Jeff Tinker <jtinker@google.com> | 2015-04-09 17:47:46 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-09 17:47:47 +0000 |
| commit | 03763a9573fcfdd0f85dd9ac0203e7da525a6c98 (patch) | |
| tree | cf48ab8ce281938ef7440a3ad67664cbbd628a39 /include/media | |
| parent | 31ffe45a22b72ee5d25bb4932d0525e90dbc19fe (diff) | |
| parent | c481b5012a5f6cf72e5e93b36f1ed4c9169916f2 (diff) | |
| download | frameworks_av-03763a9573fcfdd0f85dd9ac0203e7da525a6c98.zip frameworks_av-03763a9573fcfdd0f85dd9ac0203e7da525a6c98.tar.gz frameworks_av-03763a9573fcfdd0f85dd9ac0203e7da525a6c98.tar.bz2 | |
Merge "Pass crypto source data using a shared buffer"
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/ICrypto.h | 3 | ||||
| -rw-r--r-- | include/media/stagefright/MediaCodec.h | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/include/media/ICrypto.h b/include/media/ICrypto.h index 07742ca..ac2b3ba 100644 --- a/include/media/ICrypto.h +++ b/include/media/ICrypto.h @@ -25,6 +25,7 @@ namespace android { struct AString; +struct IMemory; struct ICrypto : public IInterface { DECLARE_META_INTERFACE(Crypto); @@ -48,7 +49,7 @@ struct ICrypto : public IInterface { const uint8_t key[16], const uint8_t iv[16], CryptoPlugin::Mode mode, - const void *srcPtr, + const sp<IMemory> &sharedBuffer, size_t offset, const CryptoPlugin::SubSample *subSamples, size_t numSubSamples, void *dstPtr, AString *errorDetailMsg) = 0; diff --git a/include/media/stagefright/MediaCodec.h b/include/media/stagefright/MediaCodec.h index d055341..3bc6391 100644 --- a/include/media/stagefright/MediaCodec.h +++ b/include/media/stagefright/MediaCodec.h @@ -30,8 +30,10 @@ struct AMessage; struct AReplyToken; struct AString; struct CodecBase; -struct ICrypto; struct IBatteryStats; +struct ICrypto; +struct IMemory; +struct MemoryDealer; struct SoftwareRenderer; struct Surface; @@ -214,6 +216,7 @@ private: uint32_t mBufferID; sp<ABuffer> mData; sp<ABuffer> mEncryptedData; + sp<IMemory> mSharedEncryptedBuffer; sp<AMessage> mNotify; sp<AMessage> mFormat; bool mOwnedByClient; @@ -232,6 +235,7 @@ private: sp<AMessage> mOutputFormat; sp<AMessage> mInputFormat; sp<AMessage> mCallback; + sp<MemoryDealer> mDealer; bool mBatteryStatNotified; bool mIsVideo; |