Merge "Revert "Stagefright: Provide crop info to native window"" into linaro_android_4.0.1

1 files changed, 4 insertions, 6 deletions

diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp
index 8a418778aa58..4e7602f826ef 100755
--- a/media/libstagefright/OMXCodec.cpp
+++ b/media/libstagefright/OMXCodec.cpp
@@ -1815,10 +1815,6 @@ status_t OMXCodec::allocateOutputBuffersFromNativeWindow() {
         return err;
     }
 
-    if (mNativeWindow != NULL) {
-         initNativeWindowCrop();
-    }
-
     err = applyRotation();
     if (err != OK) {
         return err;
@@ -2046,8 +2042,6 @@ status_t OMXCodec::pushBlankBuffersToNativeWindow() {
         goto error;
     }
 
-    initNativeWindowCrop();
-
     err = native_window_set_usage(mNativeWindow.get(),
             GRALLOC_USAGE_SW_WRITE_OFTEN);
     if (err != NO_ERROR) {
@@ -4566,6 +4560,10 @@ void OMXCodec::initOutputFormat(const sp<MetaData> &inputFormat) {
                             video_def->nFrameWidth - 1,
                             video_def->nFrameHeight - 1);
                 }
+
+                if (mNativeWindow != NULL) {
+                     initNativeWindowCrop();
+                }
             }
             break;
         }