generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix Windows warnings (int/bool mismatch)

Browse Source 
BUG=

Review URL: https://webrtc-codereview.appspot.com/808004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2782 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
mikhal@webrtc.org 2012-09-18 17:09:02 +00:00
parent 043ed9ecbd
commit deea95f76f
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/common_video/i420_video_frame_unittest.cc
View File

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