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

Side by Side Diff: webrtc/media/engine/webrtcvideoengine2_unittest.cc

Issue 1713493003: Enabling rtcp-rsize negotiation and fixing some issues with it. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fixing unit test and adding more TODOs. Created 4 years, 9 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2004 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2004 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 2557 matching lines...) Expand 10 before | Expand all | Expand 10 after
2568 } 2568 }
2569 2569
2570 // This test verifies that the RTCP reduced size mode is properly applied to 2570 // This test verifies that the RTCP reduced size mode is properly applied to
2571 // receive video streams. 2571 // receive video streams.
2572 TEST_F(WebRtcVideoChannel2Test, TestSetRecvRtcpReducedSize) { 2572 TEST_F(WebRtcVideoChannel2Test, TestSetRecvRtcpReducedSize) {
2573 // Create stream, expecting that default mode is "compound". 2573 // Create stream, expecting that default mode is "compound".
2574 FakeVideoReceiveStream* stream1 = AddRecvStream(); 2574 FakeVideoReceiveStream* stream1 = AddRecvStream();
2575 EXPECT_EQ(webrtc::RtcpMode::kCompound, stream1->GetConfig().rtp.rtcp_mode); 2575 EXPECT_EQ(webrtc::RtcpMode::kCompound, stream1->GetConfig().rtp.rtcp_mode);
2576 2576
2577 // Now enable reduced size mode. 2577 // Now enable reduced size mode.
2578 recv_parameters_.rtcp.reduced_size = true; 2578 // TODO(deadbeef): Once "recv_parameters" becomes "receiver_parameters",
2579 EXPECT_TRUE(channel_->SetRecvParameters(recv_parameters_)); 2579 // the reduced_size flag should come from that.
2580 send_parameters_.rtcp.reduced_size = true;
2581 EXPECT_TRUE(channel_->SetSendParameters(send_parameters_));
2580 stream1 = fake_call_->GetVideoReceiveStreams()[0]; 2582 stream1 = fake_call_->GetVideoReceiveStreams()[0];
2581 EXPECT_EQ(webrtc::RtcpMode::kReducedSize, stream1->GetConfig().rtp.rtcp_mode); 2583 EXPECT_EQ(webrtc::RtcpMode::kReducedSize, stream1->GetConfig().rtp.rtcp_mode);
2582 2584
2583 // Create a new stream and ensure it picks up the reduced size mode. 2585 // Create a new stream and ensure it picks up the reduced size mode.
2584 FakeVideoReceiveStream* stream2 = AddRecvStream(); 2586 FakeVideoReceiveStream* stream2 = AddRecvStream();
2585 EXPECT_EQ(webrtc::RtcpMode::kReducedSize, stream2->GetConfig().rtp.rtcp_mode); 2587 EXPECT_EQ(webrtc::RtcpMode::kReducedSize, stream2->GetConfig().rtp.rtcp_mode);
2586 } 2588 }
2587 2589
2588 TEST_F(WebRtcVideoChannel2Test, OnReadyToSendSignalsNetworkState) { 2590 TEST_F(WebRtcVideoChannel2Test, OnReadyToSendSignalsNetworkState) {
2589 EXPECT_EQ(webrtc::kNetworkUp, fake_call_->GetNetworkState()); 2591 EXPECT_EQ(webrtc::kNetworkUp, fake_call_->GetNetworkState());
(...skipping 802 matching lines...) Expand 10 before | Expand all | Expand 10 after
3392 } 3394 }
3393 3395
3394 // Test that we normalize send codec format size in simulcast. 3396 // Test that we normalize send codec format size in simulcast.
3395 TEST_F(WebRtcVideoChannel2SimulcastTest, SetSendCodecsWithOddSizeInSimulcast) { 3397 TEST_F(WebRtcVideoChannel2SimulcastTest, SetSendCodecsWithOddSizeInSimulcast) {
3396 cricket::VideoCodec codec(kVp8Codec270p); 3398 cricket::VideoCodec codec(kVp8Codec270p);
3397 codec.width += 1; 3399 codec.width += 1;
3398 codec.height += 1; 3400 codec.height += 1;
3399 VerifySimulcastSettings(codec, 2, 2); 3401 VerifySimulcastSettings(codec, 2, 2);
3400 } 3402 }
3401 } // namespace cricket 3403 } // namespace cricket
OLDNEW
« no previous file with comments | « webrtc/media/engine/webrtcvideoengine2.cc ('k') | webrtc/modules/rtp_rtcp/source/rtcp_receiver.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698