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

Side by Side Diff: webrtc/test/call_test.cc

Issue 2453243003: Remove voe::Channel::StopReceive() and associated logic. (Closed)
Patch Set: Created 4 years, 1 month 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) 2014 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2014 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 #include "webrtc/base/checks.h" 10 #include "webrtc/base/checks.h"
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 if (audio_send_stream_) { 122 if (audio_send_stream_) {
123 fake_send_audio_device_->Start(); 123 fake_send_audio_device_->Start();
124 audio_send_stream_->Start(); 124 audio_send_stream_->Start();
125 EXPECT_EQ(0, voe_send_.base->StartSend(voe_send_.channel_id)); 125 EXPECT_EQ(0, voe_send_.base->StartSend(voe_send_.channel_id));
126 } 126 }
127 for (AudioReceiveStream* audio_recv_stream : audio_receive_streams_) 127 for (AudioReceiveStream* audio_recv_stream : audio_receive_streams_)
128 audio_recv_stream->Start(); 128 audio_recv_stream->Start();
129 if (!audio_receive_streams_.empty()) { 129 if (!audio_receive_streams_.empty()) {
130 fake_recv_audio_device_->Start(); 130 fake_recv_audio_device_->Start();
131 EXPECT_EQ(0, voe_recv_.base->StartPlayout(voe_recv_.channel_id)); 131 EXPECT_EQ(0, voe_recv_.base->StartPlayout(voe_recv_.channel_id));
132 EXPECT_EQ(0, voe_recv_.base->StartReceive(voe_recv_.channel_id));
133 } 132 }
134 if (frame_generator_capturer_.get() != NULL) 133 if (frame_generator_capturer_.get() != NULL)
135 frame_generator_capturer_->Start(); 134 frame_generator_capturer_->Start();
136 } 135 }
137 136
138 void CallTest::Stop() { 137 void CallTest::Stop() {
139 if (frame_generator_capturer_.get() != NULL) 138 if (frame_generator_capturer_.get() != NULL)
140 frame_generator_capturer_->Stop(); 139 frame_generator_capturer_->Stop();
141 if (!audio_receive_streams_.empty()) { 140 if (!audio_receive_streams_.empty()) {
142 fake_recv_audio_device_->Stop(); 141 fake_recv_audio_device_->Stop();
143 EXPECT_EQ(0, voe_recv_.base->StopReceive(voe_recv_.channel_id));
144 EXPECT_EQ(0, voe_recv_.base->StopPlayout(voe_recv_.channel_id)); 142 EXPECT_EQ(0, voe_recv_.base->StopPlayout(voe_recv_.channel_id));
145 } 143 }
146 for (AudioReceiveStream* audio_recv_stream : audio_receive_streams_) 144 for (AudioReceiveStream* audio_recv_stream : audio_receive_streams_)
147 audio_recv_stream->Stop(); 145 audio_recv_stream->Stop();
148 if (audio_send_stream_) { 146 if (audio_send_stream_) {
149 fake_send_audio_device_->Stop(); 147 fake_send_audio_device_->Stop();
150 EXPECT_EQ(0, voe_send_.base->StopSend(voe_send_.channel_id)); 148 EXPECT_EQ(0, voe_send_.base->StopSend(voe_send_.channel_id));
151 audio_send_stream_->Stop(); 149 audio_send_stream_->Stop();
152 } 150 }
153 for (VideoReceiveStream* video_recv_stream : video_receive_streams_) 151 for (VideoReceiveStream* video_recv_stream : video_receive_streams_)
(...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after
444 442
445 EndToEndTest::EndToEndTest(unsigned int timeout_ms) : BaseTest(timeout_ms) { 443 EndToEndTest::EndToEndTest(unsigned int timeout_ms) : BaseTest(timeout_ms) {
446 } 444 }
447 445
448 bool EndToEndTest::ShouldCreateReceivers() const { 446 bool EndToEndTest::ShouldCreateReceivers() const {
449 return true; 447 return true;
450 } 448 }
451 449
452 } // namespace test 450 } // namespace test
453 } // namespace webrtc 451 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698