Index: webrtc/media/base/videoframe_unittest.h |
diff --git a/webrtc/media/base/videoframe_unittest.h b/webrtc/media/base/videoframe_unittest.h |
index 9658f878f59137d87264c44d645a92bfbbf6bcb2..8040804f83bfe9da6fe64b01e38f6f122d4661da 100644 |
--- a/webrtc/media/base/videoframe_unittest.h |
+++ b/webrtc/media/base/videoframe_unittest.h |
@@ -453,7 +453,7 @@ |
static bool IsEqual(const cricket::VideoFrame& frame, |
int width, |
int height, |
- int64_t timestamp_us, |
+ int64_t time_stamp, |
const uint8_t* y, |
uint32_t ypitch, |
const uint8_t* u, |
@@ -461,8 +461,7 @@ |
const uint8_t* v, |
uint32_t vpitch, |
int max_error) { |
- return IsSize(frame, width, height) && |
- frame.timestamp_us() == timestamp_us && |
+ return IsSize(frame, width, height) && frame.GetTimeStamp() == time_stamp && |
IsPlaneEqual("y", frame.video_frame_buffer()->DataY(), |
frame.video_frame_buffer()->StrideY(), y, ypitch, |
static_cast<uint32_t>(width), |
@@ -482,7 +481,7 @@ |
int max_error) { |
return IsEqual(frame1, |
frame2.width(), frame2.height(), |
- frame2.timestamp_us(), |
+ frame2.GetTimeStamp(), |
frame2.video_frame_buffer()->DataY(), |
frame2.video_frame_buffer()->StrideY(), |
frame2.video_frame_buffer()->DataU(), |
@@ -500,7 +499,7 @@ |
IsEqual(frame1, |
frame2.width() - hcrop * 2, |
frame2.height() - vcrop * 2, |
- frame2.timestamp_us(), |
+ frame2.GetTimeStamp(), |
frame2.video_frame_buffer()->DataY() |
+ vcrop * frame2.video_frame_buffer()->StrideY() |
+ hcrop, |