summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLajos Molnar <lajos@google.com>2014-08-09 02:01:37 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-08-09 00:45:27 +0000
commit53a1e46e559b00653eadf6f4bb5572679b0ee734 (patch)
tree6c8ca03f95ae4990bf17feab33b986d93422551c
parent5f24404277a4ce2bdfd2a38c45abb48b7aeccad4 (diff)
parent25a147aaad0ce30da8db763054d963ceaedb4065 (diff)
downloadframeworks_av-53a1e46e559b00653eadf6f4bb5572679b0ee734.zip
frameworks_av-53a1e46e559b00653eadf6f4bb5572679b0ee734.tar.gz
frameworks_av-53a1e46e559b00653eadf6f4bb5572679b0ee734.tar.bz2
Merge "stagefright: set crop rect in SoftwareRenderer" into lmp-dev
-rw-r--r--media/libstagefright/colorconversion/SoftwareRenderer.cpp11
1 files changed, 11 insertions, 0 deletions
diff --git a/media/libstagefright/colorconversion/SoftwareRenderer.cpp b/media/libstagefright/colorconversion/SoftwareRenderer.cpp
index 67dfcd2..0c5527a 100644
--- a/media/libstagefright/colorconversion/SoftwareRenderer.cpp
+++ b/media/libstagefright/colorconversion/SoftwareRenderer.cpp
@@ -112,6 +112,17 @@ SoftwareRenderer::SoftwareRenderer(
bufHeight,
halFormat));
+ // NOTE: native window uses extended right-bottom coordinate
+ android_native_rect_t crop;
+ crop.left = mCropLeft;
+ crop.top = mCropTop;
+ crop.right = mCropRight + 1;
+ crop.bottom = mCropBottom + 1;
+ ALOGV("setting crop: [%d, %d, %d, %d] for size [%zu, %zu]",
+ crop.left, crop.top, crop.right, crop.bottom, bufWidth, bufHeight);
+
+ CHECK_EQ(0, native_window_set_crop(mNativeWindow.get(), &crop));
+
uint32_t transform;
switch (rotationDegrees) {
case 0: transform = 0; break;