commit 4d7aacd7e12f084aed2bc8cfe28daa0dc915a08b
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Mar 23 21:11:15 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 23 21:11:15 2017 +0000
tree cf7d52b97c455f21d3ef783ea870e8c9ccc1e0c2
parent d0844433fff7aea6473235422c452f2677c87502
parent 607e65286b7c3dcd06b7175c9d81b82e6fcfcb9a

Merge "Revert "ACodec: update native window crop rectangle""

media/libstagefright/ACodec.cpp

diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp
index 1791d35..81eecaf 100644
--- a/media/libstagefright/ACodec.cpp
+++ b/media/libstagefright/ACodec.cpp
@@ -1079,7 +1079,7 @@
     mLastNativeWindowDataSpace = HAL_DATASPACE_UNKNOWN;
 
     ALOGV("gralloc usage: %#x(OMX) => %#x(ACodec)", omxUsage, usage);
-    err = setNativeWindowSizeFormatAndUsage(
+    return setNativeWindowSizeFormatAndUsage(
             nativeWindow,
             def.format.video.nFrameWidth,
             def.format.video.nFrameHeight,
@@ -1087,24 +1087,6 @@
             mRotationDegrees,
             usage,
             reconnect);
-    if (err == OK) {
-        OMX_CONFIG_RECTTYPE rect;
-        InitOMXParams(&rect);
-        rect.nPortIndex = kPortIndexOutput;
-        err = mOMXNode->getConfig(
-                OMX_IndexConfigCommonOutputCrop, &rect, sizeof(rect));
-        if (err == OK) {
-            ALOGV("rect size = %d, %d, %d, %d", rect.nLeft, rect.nTop, rect.nWidth, rect.nHeight);
-            android_native_rect_t crop;
-            crop.left = rect.nLeft;
-            crop.top = rect.nTop;
-            crop.right = rect.nLeft + rect.nWidth - 1;
-            crop.bottom = rect.nTop + rect.nHeight - 1;
-            ALOGV("crop update (%d, %d), (%d, %d)", crop.left, crop.top, crop.right, crop.bottom);
-            err = native_window_set_crop(nativeWindow, &crop);
-        }
-    }
-    return err;
 }
 
 status_t ACodec::configureOutputBuffersFromNativeWindow(