diff options
| author | Jamie Gennis <jgennis@google.com> | 2012-06-14 13:08:08 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-06-14 13:08:08 -0700 |
| commit | 7b4de10199f3a1803350e9a65baa671874d9c2f1 (patch) | |
| tree | aeca274c77e975cc9c6acd2500dca0172c1185d4 /media | |
| parent | 192cbbad773979a6fe3b5a0c223356de4fc3309c (diff) | |
| parent | 1d5ac80d0c6d3deabcc9e9b4abc9e3ef536aeb27 (diff) | |
| download | frameworks_av-7b4de10199f3a1803350e9a65baa671874d9c2f1.zip frameworks_av-7b4de10199f3a1803350e9a65baa671874d9c2f1.tar.gz frameworks_av-7b4de10199f3a1803350e9a65baa671874d9c2f1.tar.bz2 | |
Merge "stagefright: set scaling mode for blank frames" into jb-dev
Diffstat (limited to 'media')
| -rwxr-xr-x | media/libstagefright/OMXCodec.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
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 @@ status_t OMXCodec::pushBlankBuffersToNativeWindow() { 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) { |