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/libstagefright | |
| 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/libstagefright')
| -rw-r--r-- | media/libstagefright/MediaCodec.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/media/libstagefright/MediaCodec.cpp b/media/libstagefright/MediaCodec.cpp index df47bd5..d7ddc89 100644 --- a/media/libstagefright/MediaCodec.cpp +++ b/media/libstagefright/MediaCodec.cpp @@ -1011,6 +1011,16 @@ void MediaCodec::onMessageReceived(const sp<AMessage> &msg) { mFlags |= kFlagOutputFormatChanged; postActivityNotificationIfPossible(); } + + // Notify mCrypto of video resolution changes + if (mCrypto != NULL) { + int32_t height, width; + if (mOutputFormat->findInt32("height", &height) && + mOutputFormat->findInt32("width", &width)) { + mCrypto->notifyResolution(width, height); + } + } + break; } |