diff --git a/src/common_video/i420_video_frame_unittest.cc b/src/common_video/i420_video_frame_unittest.cc index 8280d1307..33c70f152 100644 --- a/src/common_video/i420_video_frame_unittest.cc +++ b/src/common_video/i420_video_frame_unittest.cc @@ -215,14 +215,19 @@ 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)); - 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; + 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; } } // namespace webrtc