From 91a3cc00db31a713a25848f345bd624ac2ad8dc5 Mon Sep 17 00:00:00 2001
From: Lajos Molnar <lajos@google.com>
Date: Tue, 7 Oct 2014 18:42:45 -0700
Subject: ACodec: only check crop rect on output port

Bug: 17789956
Change-Id: I0e17660d95ac0b3b051e7f555820188d9286571a
---
 media/libstagefright/ACodec.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'media')

diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp
index b693625..229e688 100644
--- a/media/libstagefright/ACodec.cpp
+++ b/media/libstagefright/ACodec.cpp
@@ -3200,12 +3200,20 @@ status_t ACodec::getPortFormat(OMX_U32 portIndex, sp<AMessage> &notify) {
                                         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;
-- 
cgit v1.1