Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05e11b29 authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

am 66ec9068: am 8de5df43: am ebf6a72b: Merge "Surfaceflinger expects... 

am 66ec9068: am 8de5df43: am ebf6a72b: Merge "Surfaceflinger expects rectangles to be specified right/bottom edge exclusive." into honeycomb-mr1

* commit '66ec9068':
  Surfaceflinger expects rectangles to be specified right/bottom edge exclusive.
parents 67a8f940 66ec9068

media/libstagefright/ACodec.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -1081,8 +1081,8 @@ void ACodec::sendFormatChange() { 
                android_native_rect_t crop;

                android_native_rect_t crop;

                crop.left = rect.nLeft;

                crop.left = rect.nLeft;

                crop.top = rect.nTop;

                crop.top = rect.nTop;

                crop.right = rect.nLeft + rect.nWidth - 1;

                crop.right = rect.nLeft + rect.nWidth;

                crop.bottom = rect.nTop + rect.nHeight - 1;

                crop.bottom = rect.nTop + rect.nHeight;





                CHECK_EQ(0, native_window_set_crop(

                CHECK_EQ(0, native_window_set_crop(

                            mNativeWindow.get(), &crop));

                            mNativeWindow.get(), &crop));

media/libstagefright/OMXCodec.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -2240,8 +2240,8 @@ void OMXCodec::onEvent(OMX_EVENTTYPE event, OMX_U32 data1, OMX_U32 data2) { 
                        android_native_rect_t crop;

                        android_native_rect_t crop;

                        crop.left = left;

                        crop.left = left;

                        crop.top = top;

                        crop.top = top;

                        crop.right = right;

                        crop.right = right + 1;

                        crop.bottom = bottom;

                        crop.bottom = bottom + 1;





                        // We'll ignore any errors here, if the surface is

                        // We'll ignore any errors here, if the surface is

                        // already invalid, we'll know soon enough.

                        // already invalid, we'll know soon enough.