commit fea3699c6921f50f404b6285d588894cee63d85f
author Jamie Gennis <jgennis@google.com> Thu Jun 14 13:12:59 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Jun 14 13:12:59 2012 -0700
tree 680710afc199c96419fb6afed6044be7767b922f
parent 627b9a3b4014fe6134493ab77e340b07cf4556d2
parent be8cf4a280b0aa786ba1aa3dad85d51125e0a86f

am be8cf4a2: am 7b4de101: Merge "stagefright: set scaling mode for blank frames" into jb-dev

* commit 'be8cf4a280b0aa786ba1aa3dad85d51125e0a86f':
  stagefright: set scaling mode for blank frames

media/libstagefright/OMXCodec.cpp

diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp
index 7fb395e..fde7ebf 100755
--- a/media/libstagefright/OMXCodec.cpp
+++ b/media/libstagefright/OMXCodec.cpp
@@ -1921,6 +1921,14 @@
         goto error;
     }
 
+    err = native_window_set_scaling_mode(mNativeWindow.get(),
+            NATIVE_WINDOW_SCALING_MODE_SCALE_TO_WINDOW);
+    if (err != OK) {
+        ALOGE("error pushing blank frames: set_scaling_mode failed: %s (%d)",
+                strerror(-err), -err);
+        goto error;
+    }
+
     err = mNativeWindow->query(mNativeWindow.get(),
             NATIVE_WINDOW_MIN_UNDEQUEUED_BUFFERS, &minUndequeuedBufs);
     if (err != NO_ERROR) {