From 67465791389ad37a61d48937dd0763f545b9e201 Mon Sep 17 00:00:00 2001 From: "mflodman@webrtc.org" Date: Wed, 19 Sep 2012 12:23:00 +0000 Subject: [PATCH] Revert r2782 due to Valgrind issues in i420_video_frame_unittest.cc. TBR=mikhal@webrtc.org Review URL: https://webrtc-codereview.appspot.com/807006 git-svn-id: http://webrtc.googlecode.com/svn/trunk@2785 4adac7df-926f-26a2-2b94-8c16560cd09d --- src/common_video/i420_video_frame_unittest.cc | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/common_video/i420_video_frame_unittest.cc b/src/common_video/i420_video_frame_unittest.cc index 33c70f152c..8280d13077 100644 --- a/src/common_video/i420_video_frame_unittest.cc +++ b/src/common_video/i420_video_frame_unittest.cc @@ -215,19 +215,14 @@ bool EqualFramesExceptSize(const I420VideoFrame& frame1, ret |= (frame1.stride(kVPlane) == frame2.stride(kVPlane)); ret |= (frame1.timestamp() == frame2.timestamp()); ret |= (frame1.render_time_ms() == frame2.render_time_ms()); - if (!ret) - return false; // Memory should be the equal for the minimum of the two sizes. int size_y = std::min(frame1.size(kYPlane), frame2.size(kYPlane)); int size_u = std::min(frame1.size(kUPlane), frame1.size(kUPlane)); int size_v = std::min(frame1.size(kVPlane), frame1.size(kVPlane)); - int ret_val = 0; - ret_val += memcmp(frame1.buffer(kYPlane), frame2.buffer(kYPlane), size_y); - ret_val += memcmp(frame1.buffer(kUPlane), frame2.buffer(kUPlane), size_u); - ret_val += memcmp(frame1.buffer(kVPlane), frame2.buffer(kVPlane), size_v); - if (ret_val == 0) - return true; - return false; + ret |= memcmp(frame1.buffer(kYPlane), frame2.buffer(kYPlane), size_y); + ret |= memcmp(frame1.buffer(kUPlane), frame2.buffer(kYPlane), size_u); + ret |= memcmp(frame1.buffer(kVPlane), frame2.buffer(kYPlane), size_v); + return ret; } } // namespace webrtc