summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorLajos Molnar <lajos@google.com>2014-10-07 18:42:45 -0700
committerLajos Molnar <lajos@google.com>2014-10-07 18:44:46 -0700
commit91a3cc00db31a713a25848f345bd624ac2ad8dc5 (patch)
treeb40a67692beea503304810f92040390cea10c1a3 /media
parentce26e9d13da7a4a4443b9be775bb12fb3ac97d23 (diff)
downloadframeworks_av-91a3cc00db31a713a25848f345bd624ac2ad8dc5.zip
frameworks_av-91a3cc00db31a713a25848f345bd624ac2ad8dc5.tar.gz
frameworks_av-91a3cc00db31a713a25848f345bd624ac2ad8dc5.tar.bz2
ACodec: only check crop rect on output port
Bug: 17789956 Change-Id: I0e17660d95ac0b3b051e7f555820188d9286571a
Diffstat (limited to 'media')
-rw-r--r--media/libstagefright/ACodec.cpp12
1 files changed, 10 insertions, 2 deletions
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;