diff options
| author | Jeff Tinker <jtinker@google.com> | 2014-11-06 02:36:17 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-06 02:36:17 +0000 |
| commit | 1cf9ad1abb599ce4057189e0db154cf00b4913f8 (patch) | |
| tree | 1bbf6047da0636dddcac32a904d55c2cd87d2ba0 /media/libmediaplayerservice | |
| parent | 19a3f69d9d5398db62ee7b15f2c13052d7ee9f07 (diff) | |
| parent | 2514d080c8a54ff603a45d7e336de668fe7329db (diff) | |
| download | frameworks_av-1cf9ad1abb599ce4057189e0db154cf00b4913f8.zip frameworks_av-1cf9ad1abb599ce4057189e0db154cf00b4913f8.tar.gz frameworks_av-1cf9ad1abb599ce4057189e0db154cf00b4913f8.tar.bz2 | |
Merge "Pass resolution to Crypto plugin on format change" into lmp-mr1-dev
Diffstat (limited to 'media/libmediaplayerservice')
| -rw-r--r-- | media/libmediaplayerservice/Crypto.cpp | 8 | ||||
| -rw-r--r-- | media/libmediaplayerservice/Crypto.h | 2 |
2 files changed, 10 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/Crypto.cpp b/media/libmediaplayerservice/Crypto.cpp index 62593b2..8ee7c0b 100644 --- a/media/libmediaplayerservice/Crypto.cpp +++ b/media/libmediaplayerservice/Crypto.cpp @@ -257,4 +257,12 @@ ssize_t Crypto::decrypt( errorDetailMsg); } +void Crypto::notifyResolution(uint32_t width, uint32_t height) { + Mutex::Autolock autoLock(mLock); + + if (mInitCheck == OK && mPlugin != NULL) { + mPlugin->notifyResolution(width, height); + } +} + } // namespace android diff --git a/media/libmediaplayerservice/Crypto.h b/media/libmediaplayerservice/Crypto.h index c44ae34..0037c2e 100644 --- a/media/libmediaplayerservice/Crypto.h +++ b/media/libmediaplayerservice/Crypto.h @@ -45,6 +45,8 @@ struct Crypto : public BnCrypto { virtual bool requiresSecureDecoderComponent( const char *mime) const; + virtual void notifyResolution(uint32_t width, uint32_t height); + virtual ssize_t decrypt( bool secure, const uint8_t key[16], |