Revert "Stagefright: Provide crop info to native window"

This reverts commit ea532f064e7ad949d0e31a83911bebc0ef7ab701

Build https://android-build.linaro.org/builds/~linaro-android/staging-panda/#build=140 isn't booting, rolling back.

1 files changed, 4 insertions, 6 deletions

diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp
index 5d21b98d9697..b177e4629d64 100755
--- a/media/libstagefright/OMXCodec.cpp
+++ b/media/libstagefright/OMXCodec.cpp
@@ -1854,10 +1854,6 @@ status_t OMXCodec::allocateOutputBuffersFromNativeWindow() {
         return err;
     }
 
-    if (mNativeWindow != NULL) {
-         initNativeWindowCrop();
-    }
-
     err = applyRotation();
     if (err != OK) {
         return err;
@@ -2085,8 +2081,6 @@ status_t OMXCodec::pushBlankBuffersToNativeWindow() {
         goto error;
     }
 
-    initNativeWindowCrop();
-
     err = native_window_set_usage(mNativeWindow.get(),
             GRALLOC_USAGE_SW_WRITE_OFTEN);
     if (err != NO_ERROR) {
@@ -4605,6 +4599,10 @@ void OMXCodec::initOutputFormat(const sp<MetaData> &inputFormat) {
                             video_def->nFrameWidth - 1,
                             video_def->nFrameHeight - 1);
                 }
+
+                if (mNativeWindow != NULL) {
+                     initNativeWindowCrop();
+                }
             }
             break;
         }