diff options
| author | Lajos Molnar <lajos@google.com> | 2014-10-14 09:19:07 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-14 09:19:07 +0000 |
| commit | 260bca4fc6c9350209736614f72133d5ec21ee01 (patch) | |
| tree | bca066170038fb077dcfc84ca71eda44eaab37b1 /media | |
| parent | 2201314dcaec5a6b595a8307bff46bc06f803beb (diff) | |
| parent | 447898bca790fae2fdae304073162e980d816b79 (diff) | |
| download | frameworks_av-260bca4fc6c9350209736614f72133d5ec21ee01.zip frameworks_av-260bca4fc6c9350209736614f72133d5ec21ee01.tar.gz frameworks_av-260bca4fc6c9350209736614f72133d5ec21ee01.tar.bz2 | |
am 447898bc: Merge "ACodec: only check crop rect on output port" into lmp-dev
* commit '447898bca790fae2fdae304073162e980d816b79':
ACodec: only check crop rect on output port
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/ACodec.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp index da47e30..fcc3a5a 100644 --- a/media/libstagefright/ACodec.cpp +++ b/media/libstagefright/ACodec.cpp @@ -3200,12 +3200,20 @@ status_t ACodec::getPortFormat(OMX_U32 portIndex, sp<AMessage> ¬ify) { sizeof(describeParams.sMediaImage))); } + if (portIndex != kPortIndexOutput) { + // TODO: also get input crop + break; + } + OMX_CONFIG_RECTTYPE rect; InitOMXParams(&rect); - rect.nPortIndex = kPortIndexOutput; + rect.nPortIndex = portIndex; if (mOMX->getConfig( - mNode, OMX_IndexConfigCommonOutputCrop, + mNode, + (portIndex == kPortIndexOutput ? + OMX_IndexConfigCommonOutputCrop : + OMX_IndexConfigCommonInputCrop), &rect, sizeof(rect)) != OK) { rect.nLeft = 0; rect.nTop = 0; |