commit e86f4be598b1d2c521e2b3fcd05101c3848e93e2
author Lajos Molnar <lajos@google.com> Tue Oct 14 15:38:18 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Oct 14 15:38:18 2014 +0000
tree 1cdd311c5b04e9665b3a1b4ec2c1967586799d67
parent c3340b80f77fa35d346fb050d571adbed2a73b28
parent 447898bca790fae2fdae304073162e980d816b79

am 447898bc: Merge "ACodec: only check crop rect on output port" into lmp-dev

* commit '447898bca790fae2fdae304073162e980d816b79':
  ACodec: only check crop rect on output port

media/libstagefright/ACodec.cpp

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 @@
                                         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;