diff --git a/webrtc/media/base/videoengine_unittest.h b/webrtc/media/base/videoengine_unittest.h index 60f1155931..394b9c9a8e 100644 --- a/webrtc/media/base/videoengine_unittest.h +++ b/webrtc/media/base/videoengine_unittest.h @@ -1063,16 +1063,7 @@ class VideoMediaChannelTest : public testing::Test, void TwoStreamsSendAndReceive(const cricket::VideoCodec& codec) { SetUpSecondStream(); // Test sending and receiving on first stream. - EXPECT_TRUE(SetOneCodec(codec)); - EXPECT_TRUE(SetSend(true)); - EXPECT_TRUE(channel_->SetSink(kDefaultReceiveSsrc, &renderer_)); - EXPECT_EQ(0, renderer_.num_rendered_frames()); - EXPECT_TRUE(SendFrame()); - // Since multiple streams share this link we should be receiving smaller - // initial frames (start at QVGA since shared bitrate is 150k each). - EXPECT_FRAME_WAIT(1, codec.width / 2, codec.height / 2, kTimeout); - std::unique_ptr p(GetRtpPacket(0)); - EXPECT_EQ(codec.id, GetPayloadType(p.get())); + SendAndReceive(codec); // Test sending and receiving on second stream. EXPECT_EQ_WAIT(1, renderer2_.num_rendered_frames(), kTimeout); EXPECT_GT(NumRtpPackets(), 0); diff --git a/webrtc/media/engine/webrtcvideoengine2_unittest.cc b/webrtc/media/engine/webrtcvideoengine2_unittest.cc index 95d418e798..5075aa20ea 100644 --- a/webrtc/media/engine/webrtcvideoengine2_unittest.cc +++ b/webrtc/media/engine/webrtcvideoengine2_unittest.cc @@ -871,7 +871,14 @@ TEST_F(WebRtcVideoChannel2BaseTest, SendAndReceiveVp8SvcQqvga) { } TEST_F(WebRtcVideoChannel2BaseTest, TwoStreamsSendAndReceive) { - Base::TwoStreamsSendAndReceive(kVp8Codec); + // Set a high bitrate to not be downscaled by VP8 due to low initial start + // bitrates. This currently happens at <250k, and two streams sharing 300k + // initially will use QVGA instead of VGA. + // TODO(pbos): Set up the quality scaler so that both senders reliably start + // at QVGA, then verify that instead. + cricket::VideoCodec codec = kVp8Codec; + codec.params[kCodecParamStartBitrate] = "1000000"; + Base::TwoStreamsSendAndReceive(codec); } class WebRtcVideoChannel2Test : public WebRtcVideoEngine2Test {