diff options
| author | Andreas Huber <andih@google.com> | 2011-03-30 09:34:15 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-30 09:34:15 -0700 |
| commit | 66ec90687f3579fe73f6baa2a188f8a4583167a3 (patch) | |
| tree | f7b52184fb62c2cb0f80e14c59e24ed6462513af /media | |
| parent | 761e4500f31fe59748a53a4f6a85daccf5cd3467 (diff) | |
| parent | 8de5df439244e77d7892deceb86520551ff0499c (diff) | |
| download | frameworks_base-66ec90687f3579fe73f6baa2a188f8a4583167a3.zip frameworks_base-66ec90687f3579fe73f6baa2a188f8a4583167a3.tar.gz frameworks_base-66ec90687f3579fe73f6baa2a188f8a4583167a3.tar.bz2 | |
am 8de5df43: am ebf6a72b: Merge "Surfaceflinger expects rectangles to be specified right/bottom edge exclusive." into honeycomb-mr1
* commit '8de5df439244e77d7892deceb86520551ff0499c':
Surfaceflinger expects rectangles to be specified right/bottom edge exclusive.
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/ACodec.cpp | 4 | ||||
| -rw-r--r-- | media/libstagefright/OMXCodec.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp index 346d0bb..9928f44 100644 --- 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 --- 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. |