drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '8de5df439244e77d7892deceb86520551ff0499c':
  Surfaceflinger expects rectangles to be specified right/bottom edge exclusive.
This commit is contained in:
Andreas Huber
2011-03-30 09:34:15 -07:00
committed by Android Git Automerger
parent 761e4500f3 8de5df4392
commit 66ec90687f
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/libstagefright/ACodec.cpp
View File

@ -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));

4
media/libstagefright/OMXCodec.cpp
View File

@ -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.