summaryrefslogtreecommitdiffstats
path: root/media/libmedia/ICrypto.cpp
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2012-04-06 11:06:28 -0700
committerAndreas Huber <andih@google.com>2012-04-06 12:16:27 -0700
commit4b75a9c8b93a90749bc5d22912ad0d96c12f4ecf (patch)
treeae217f5c50a37349dce944c5d8a065a8740c88a9 /media/libmedia/ICrypto.cpp
parent3f502bfc6d04d08369cf147284c5c4c2ac7c9a0e (diff)
downloadframeworks_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 'media/libmedia/ICrypto.cpp')
-rw-r--r--media/libmedia/ICrypto.cpp11
1 files changed, 11 insertions, 0 deletions
diff --git a/media/libmedia/ICrypto.cpp b/media/libmedia/ICrypto.cpp
index 1fe6bed..e6bea1f 100644
--- a/media/libmedia/ICrypto.cpp
+++ b/media/libmedia/ICrypto.cpp
@@ -97,6 +97,17 @@ struct BpCrypto : public BpInterface<ICrypto> {
data.writeInterfaceToken(ICrypto::getInterfaceDescriptor());
data.writeInt32(secure);
data.writeInt32(mode);
+
+ static const uint8_t kDummy[16] = { 0 };
+
+ if (key == NULL) {
+ key = kDummy;
+ }
+
+ if (iv == NULL) {
+ iv = kDummy;
+ }
+
data.write(key, 16);
data.write(iv, 16);