Surfaceflinger expects rectangles to be specified right/bottom edge exclusive.

Change-Id: Ib493572c614dbb74fa23b13c3e43899e3b31cf0e
related-to-bug: 4147205

diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp
index 346d0bb..9928f44 100644 (file)
--- a/media/libstagefright/ACodec.cpp
+++ b/media/libstagefright/ACodec.cpp
@@ -1081,8 +1081,8 @@ void ACodec::sendFormatChange() {
                 android_native_rect_t crop;
                 crop.left = rect.nLeft;
                 crop.top = rect.nTop;
-                crop.right = rect.nLeft + rect.nWidth - 1;
-                crop.bottom = rect.nTop + rect.nHeight - 1;
+                crop.right = rect.nLeft + rect.nWidth;
+                crop.bottom = rect.nTop + rect.nHeight;
 
                 CHECK_EQ(0, native_window_set_crop(
                             mNativeWindow.get(), &crop));

diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp
index 3e26a95..a70f868 100644 (file)
--- a/media/libstagefright/OMXCodec.cpp
+++ b/media/libstagefright/OMXCodec.cpp
@@ -2233,8 +2233,8 @@ void OMXCodec::onEvent(OMX_EVENTTYPE event, OMX_U32 data1, OMX_U32 data2) {
                         android_native_rect_t crop;
                         crop.left = left;
                         crop.top = top;
-                        crop.right = right;
-                        crop.bottom = bottom;
+                        crop.right = right + 1;
+                        crop.bottom = bottom + 1;
 
                         // We'll ignore any errors here, if the surface is
                         // already invalid, we'll know soon enough.