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

Side by Side Diff: webrtc/pc/channel_unittest.cc

Issue 1838413002: Combining SetVideoSend and SetSource into one method. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 8 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 2009 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2009 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 2362 matching lines...) Expand 10 before | Expand all | Expand 10 after
2373 2373
2374 TEST_F(VideoChannelTest, TestPlayoutAndSendingStates) { 2374 TEST_F(VideoChannelTest, TestPlayoutAndSendingStates) {
2375 Base::TestPlayoutAndSendingStates(); 2375 Base::TestPlayoutAndSendingStates();
2376 } 2376 }
2377 2377
2378 TEST_F(VideoChannelTest, TestMuteStream) { 2378 TEST_F(VideoChannelTest, TestMuteStream) {
2379 CreateChannels(0, 0); 2379 CreateChannels(0, 0);
2380 // Test that we can Mute the default channel even though the sending SSRC 2380 // Test that we can Mute the default channel even though the sending SSRC
2381 // is unknown. 2381 // is unknown.
2382 EXPECT_FALSE(media_channel1_->IsStreamMuted(0)); 2382 EXPECT_FALSE(media_channel1_->IsStreamMuted(0));
2383 EXPECT_TRUE(channel1_->SetVideoSend(0, false, nullptr)); 2383 EXPECT_TRUE(channel1_->SetVideoSend(0, false, nullptr, nullptr));
2384 EXPECT_TRUE(media_channel1_->IsStreamMuted(0)); 2384 EXPECT_TRUE(media_channel1_->IsStreamMuted(0));
2385 EXPECT_TRUE(channel1_->SetVideoSend(0, true, nullptr)); 2385 EXPECT_TRUE(channel1_->SetVideoSend(0, true, nullptr, nullptr));
2386 EXPECT_FALSE(media_channel1_->IsStreamMuted(0)); 2386 EXPECT_FALSE(media_channel1_->IsStreamMuted(0));
2387 // Test that we can not mute an unknown SSRC. 2387 // Test that we can not mute an unknown SSRC.
2388 EXPECT_FALSE(channel1_->SetVideoSend(kSsrc1, false, nullptr)); 2388 EXPECT_FALSE(channel1_->SetVideoSend(kSsrc1, false, nullptr, nullptr));
2389 SendInitiate(); 2389 SendInitiate();
2390 // After the local session description has been set, we can mute a stream 2390 // After the local session description has been set, we can mute a stream
2391 // with its SSRC. 2391 // with its SSRC.
2392 EXPECT_TRUE(channel1_->SetVideoSend(kSsrc1, false, nullptr)); 2392 EXPECT_TRUE(channel1_->SetVideoSend(kSsrc1, false, nullptr, nullptr));
2393 EXPECT_TRUE(media_channel1_->IsStreamMuted(kSsrc1)); 2393 EXPECT_TRUE(media_channel1_->IsStreamMuted(kSsrc1));
2394 EXPECT_TRUE(channel1_->SetVideoSend(kSsrc1, true, nullptr)); 2394 EXPECT_TRUE(channel1_->SetVideoSend(kSsrc1, true, nullptr, nullptr));
2395 EXPECT_FALSE(media_channel1_->IsStreamMuted(kSsrc1)); 2395 EXPECT_FALSE(media_channel1_->IsStreamMuted(kSsrc1));
2396 } 2396 }
2397 2397
2398 TEST_F(VideoChannelTest, TestMediaContentDirection) { 2398 TEST_F(VideoChannelTest, TestMediaContentDirection) {
2399 Base::TestMediaContentDirection(); 2399 Base::TestMediaContentDirection();
2400 } 2400 }
2401 2401
2402 TEST_F(VideoChannelTest, TestCallSetup) { 2402 TEST_F(VideoChannelTest, TestCallSetup) {
2403 Base::TestCallSetup(); 2403 Base::TestCallSetup();
2404 } 2404 }
(...skipping 366 matching lines...) Expand 10 before | Expand all | Expand 10 after
2771 }; 2771 };
2772 rtc::CopyOnWriteBuffer payload(data, 3); 2772 rtc::CopyOnWriteBuffer payload(data, 3);
2773 cricket::SendDataResult result; 2773 cricket::SendDataResult result;
2774 ASSERT_TRUE(media_channel1_->SendData(params, payload, &result)); 2774 ASSERT_TRUE(media_channel1_->SendData(params, payload, &result));
2775 EXPECT_EQ(params.ssrc, 2775 EXPECT_EQ(params.ssrc,
2776 media_channel1_->last_sent_data_params().ssrc); 2776 media_channel1_->last_sent_data_params().ssrc);
2777 EXPECT_EQ("foo", media_channel1_->last_sent_data()); 2777 EXPECT_EQ("foo", media_channel1_->last_sent_data());
2778 } 2778 }
2779 2779
2780 // TODO(pthatcher): TestSetReceiver? 2780 // TODO(pthatcher): TestSetReceiver?
OLDNEW
« webrtc/media/engine/webrtcvideoengine2.cc ('K') | « webrtc/pc/channel.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698