Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2084)

Unified Diff: talk/media/webrtc/webrtcvideoframe_unittest.cc

Issue 1583223002: Revert of Delete remnants of non-square pixel support from cricket::VideoFrame. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « talk/media/webrtc/webrtcvideoframe.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: talk/media/webrtc/webrtcvideoframe_unittest.cc
diff --git a/talk/media/webrtc/webrtcvideoframe_unittest.cc b/talk/media/webrtc/webrtcvideoframe_unittest.cc
index 2552331141cf175b5204d71f4d33f09dd754ab1a..8388f07ba0c2d66f08530cc2ef91a0f6a7de439a 100644
--- a/talk/media/webrtc/webrtcvideoframe_unittest.cc
+++ b/talk/media/webrtc/webrtcvideoframe_unittest.cc
@@ -39,9 +39,11 @@
virtual VideoFrame* CreateEmptyFrame(int w,
int h,
+ size_t pixel_width,
+ size_t pixel_height,
int64_t time_stamp) const override {
WebRtcVideoTestFrame* frame = new WebRtcVideoTestFrame();
- frame->InitToBlack(w, h, time_stamp);
+ frame->InitToBlack(w, h, pixel_width, pixel_height, time_stamp);
return frame;
}
};
@@ -62,6 +64,8 @@
// Build the CapturedFrame.
cricket::CapturedFrame captured_frame;
captured_frame.fourcc = cricket::FOURCC_I420;
+ captured_frame.pixel_width = 1;
+ captured_frame.pixel_height = 1;
captured_frame.time_stamp = 5678;
captured_frame.rotation = frame_rotation;
captured_frame.width = frame_width;
@@ -81,6 +85,8 @@
apply_rotation));
// Verify the new frame.
+ EXPECT_EQ(1u, frame.GetPixelWidth());
+ EXPECT_EQ(1u, frame.GetPixelHeight());
EXPECT_EQ(5678, frame.GetTimeStamp());
if (apply_rotation)
EXPECT_EQ(webrtc::kVideoRotation_0, frame.GetRotation());
« no previous file with comments | « talk/media/webrtc/webrtcvideoframe.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698