diff options
| author | wu@webrtc.org <wu@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-03-28 16:22:19 +0000 |
|---|---|---|
| committer | wu@webrtc.org <wu@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-03-28 16:22:19 +0000 |
| commit | fc1e785be93c8b9bcce13c29d35af2a1ca91e6af (patch) | |
| tree | 2e3f6c15437a59a0d56a56415cbf3537236f6936 /media/base/videoengine_unittest.h | |
| parent | 37367930af165586e9c9dae094e7e8bc4ac276ca (diff) | |
| download | talk-fc1e785be93c8b9bcce13c29d35af2a1ca91e6af.tar.gz | |
(Auto)update libjingle 63913264-> 63948945
git-svn-id: http://webrtc.googlecode.com/svn/trunk/talk@5807 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'media/base/videoengine_unittest.h')
| -rw-r--r-- | media/base/videoengine_unittest.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/media/base/videoengine_unittest.h b/media/base/videoengine_unittest.h index 1d2d352..54b5500 100644 --- a/media/base/videoengine_unittest.h +++ b/media/base/videoengine_unittest.h @@ -806,8 +806,8 @@ class VideoMediaChannelTest : public testing::Test, EXPECT_EQ(0, info.senders[0].firs_rcvd); EXPECT_EQ(0, info.senders[0].plis_rcvd); EXPECT_EQ(0, info.senders[0].nacks_rcvd); - EXPECT_EQ(DefaultCodec().width, info.senders[0].frame_width); - EXPECT_EQ(DefaultCodec().height, info.senders[0].frame_height); + EXPECT_EQ(DefaultCodec().width, info.senders[0].send_frame_width); + EXPECT_EQ(DefaultCodec().height, info.senders[0].send_frame_height); EXPECT_GT(info.senders[0].framerate_input, 0); EXPECT_GT(info.senders[0].framerate_sent, 0); @@ -866,8 +866,8 @@ class VideoMediaChannelTest : public testing::Test, EXPECT_EQ(0, info.senders[0].firs_rcvd); EXPECT_EQ(0, info.senders[0].plis_rcvd); EXPECT_EQ(0, info.senders[0].nacks_rcvd); - EXPECT_EQ(DefaultCodec().width, info.senders[0].frame_width); - EXPECT_EQ(DefaultCodec().height, info.senders[0].frame_height); + EXPECT_EQ(DefaultCodec().width, info.senders[0].send_frame_width); + EXPECT_EQ(DefaultCodec().height, info.senders[0].send_frame_height); EXPECT_GT(info.senders[0].framerate_input, 0); EXPECT_GT(info.senders[0].framerate_sent, 0); @@ -937,12 +937,12 @@ class VideoMediaChannelTest : public testing::Test, info.senders[0].packets_sent + info.senders[1].packets_sent); EXPECT_EQ(1U, info.senders[0].ssrcs().size()); EXPECT_EQ(1234U, info.senders[0].ssrcs()[0]); - EXPECT_EQ(DefaultCodec().width, info.senders[0].frame_width); - EXPECT_EQ(DefaultCodec().height, info.senders[0].frame_height); + EXPECT_EQ(DefaultCodec().width, info.senders[0].send_frame_width); + EXPECT_EQ(DefaultCodec().height, info.senders[0].send_frame_height); EXPECT_EQ(1U, info.senders[1].ssrcs().size()); EXPECT_EQ(5678U, info.senders[1].ssrcs()[0]); - EXPECT_EQ(kTestWidth, info.senders[1].frame_width); - EXPECT_EQ(kTestHeight, info.senders[1].frame_height); + EXPECT_EQ(kTestWidth, info.senders[1].send_frame_width); + EXPECT_EQ(kTestHeight, info.senders[1].send_frame_height); // The capturer must be unregistered here as it runs out of it's scope next. EXPECT_TRUE(channel_->SetCapturer(5678, NULL)); } |