summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorDima Zavin <dima@android.com>2013-07-18 20:37:19 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-07-18 20:37:19 +0000
commit760874ca0ff100ed04d80495347f7e98424c838a (patch)
treee0fc901f9bf4e417ab1b0ee4ea24819679d36d5e /media
parent9d7376a7a4910a61ee4e9b1ad94b125d157882cc (diff)
parent87eb285dca94b20dc5f0ff8e60a0d395a4ca3be9 (diff)
downloadframeworks_av-760874ca0ff100ed04d80495347f7e98424c838a.zip
frameworks_av-760874ca0ff100ed04d80495347f7e98424c838a.tar.gz
frameworks_av-760874ca0ff100ed04d80495347f7e98424c838a.tar.bz2
Merge "stagefright: set scaling mode for blank frames in ACodec"
Diffstat (limited to 'media')
-rw-r--r--media/libstagefright/ACodec.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp
index 8d1020e..00804c5 100644
--- a/media/libstagefright/ACodec.cpp
+++ b/media/libstagefright/ACodec.cpp
@@ -2630,6 +2630,14 @@ status_t ACodec::pushBlankBuffersToNativeWindow() {
goto error;
}
+ err = native_window_set_scaling_mode(mNativeWindow.get(),
+ NATIVE_WINDOW_SCALING_MODE_SCALE_TO_WINDOW);
+ if (err != NO_ERROR) {
+ ALOGE("error pushing blank_frames: set_scaling_mode failed: %s (%d)",
+ strerror(-err), -err);
+ goto error;
+ }
+
err = native_window_set_usage(mNativeWindow.get(),
GRALLOC_USAGE_SW_WRITE_OFTEN);
if (err != NO_ERROR) {