diff options
| author | Lajos Molnar <lajos@google.com> | 2014-10-14 08:31:20 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-14 08:31:21 +0000 |
| commit | 447898bca790fae2fdae304073162e980d816b79 (patch) | |
| tree | 49331a8c6a6de6d4b4afdbd5eba942d57af4e33f /media | |
| parent | 1375ac6d029b74ac392db411907b3c0ea57f08a7 (diff) | |
| parent | 91a3cc00db31a713a25848f345bd624ac2ad8dc5 (diff) | |
| download | frameworks_av-447898bca790fae2fdae304073162e980d816b79.zip frameworks_av-447898bca790fae2fdae304073162e980d816b79.tar.gz frameworks_av-447898bca790fae2fdae304073162e980d816b79.tar.bz2 | |
Merge "ACodec: only check crop rect on output port" into lmp-dev
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 9b11ded..2048808 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; |