diff options
author | Jeff Tinker <jtinker@google.com> | 2014-11-06 02:49:12 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-06 02:49:12 +0000 |
commit | 6e0da0226503ddea118d43962a76fa2fa56bad1e (patch) | |
tree | f181518a435200abbe5efb17a238e112bcde8358 /media/libmedia/ICrypto.cpp | |
parent | a4dd2e19f917f25b3eee36f499b126dc115e5446 (diff) | |
parent | e0e8223c10e051b73fdcbed4fc67a69df2655c56 (diff) | |
download | frameworks_av-6e0da0226503ddea118d43962a76fa2fa56bad1e.zip frameworks_av-6e0da0226503ddea118d43962a76fa2fa56bad1e.tar.gz frameworks_av-6e0da0226503ddea118d43962a76fa2fa56bad1e.tar.bz2 |
am e0e8223c: am 1cf9ad1a: Merge "Pass resolution to Crypto plugin on format change" into lmp-mr1-dev
* commit 'e0e8223c10e051b73fdcbed4fc67a69df2655c56':
Pass resolution to Crypto plugin on format change
Diffstat (limited to 'media/libmedia/ICrypto.cpp')
-rw-r--r-- | media/libmedia/ICrypto.cpp | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/media/libmedia/ICrypto.cpp b/media/libmedia/ICrypto.cpp index 0d5f990..c26c5bf 100644 --- a/media/libmedia/ICrypto.cpp +++ b/media/libmedia/ICrypto.cpp @@ -33,6 +33,7 @@ enum { DESTROY_PLUGIN, REQUIRES_SECURE_COMPONENT, DECRYPT, + NOTIFY_RESOLUTION, }; struct BpCrypto : public BpInterface<ICrypto> { @@ -149,6 +150,15 @@ struct BpCrypto : public BpInterface<ICrypto> { return result; } + virtual void notifyResolution( + uint32_t width, uint32_t height) { + Parcel data, reply; + data.writeInterfaceToken(ICrypto::getInterfaceDescriptor()); + data.writeInt32(width); + data.writeInt32(height); + remote()->transact(NOTIFY_RESOLUTION, data, &reply); + } + private: DISALLOW_EVIL_CONSTRUCTORS(BpCrypto); }; @@ -290,10 +300,20 @@ status_t BnCrypto::onTransact( return OK; } + case NOTIFY_RESOLUTION: + { + CHECK_INTERFACE(ICrypto, data, reply); + + int32_t width = data.readInt32(); + int32_t height = data.readInt32(); + notifyResolution(width, height); + + return OK; + } + default: return BBinder::onTransact(code, data, reply, flags); } } } // namespace android - |