summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2011-01-26 12:02:35 -0800
committerAndreas Huber <andih@google.com>2011-01-26 12:02:35 -0800
commit00d6c725ec465fe2d51252f961b5eaeebf9c9864 (patch)
tree3fe3e1801d0f27c1a49dbd8f2b681d6c14df7421 /media/libstagefright
parent7765c65dbe1ba8f2229f2fec5a83ba2d1da79733 (diff)
downloadframeworks_base-00d6c725ec465fe2d51252f961b5eaeebf9c9864.zip
frameworks_base-00d6c725ec465fe2d51252f961b5eaeebf9c9864.tar.gz
frameworks_base-00d6c725ec465fe2d51252f961b5eaeebf9c9864.tar.bz2
Ignore errors returned from native_window_set_crop.
If the surface is already invalid, we'll know soon enough. Change-Id: If360ffb8293817afb47df8c1a75722aea74bb335 related-to-bug: 3394601
Diffstat (limited to 'media/libstagefright')
-rw-r--r--media/libstagefright/OMXCodec.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp
index 94694a3..802eaa9 100644
--- a/media/libstagefright/OMXCodec.cpp
+++ b/media/libstagefright/OMXCodec.cpp
@@ -2203,8 +2203,9 @@ void OMXCodec::onEvent(OMX_EVENTTYPE event, OMX_U32 data1, OMX_U32 data2) {
crop.right = right;
crop.bottom = bottom;
- CHECK_EQ(0, native_window_set_crop(
- mNativeWindow.get(), &crop));
+ // We'll ignore any errors here, if the surface is
+ // already invalid, we'll know soon enough.
+ native_window_set_crop(mNativeWindow.get(), &crop);
}
}
}