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

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

Issue 2453243003: Remove voe::Channel::StopReceive() and associated logic. (Closed)
Patch Set: comment 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
« no previous file with comments | « webrtc/call/call_perf_tests.cc ('k') | webrtc/video/video_quality_test.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 if (audio_send_stream_) { 121 if (audio_send_stream_) {
122 fake_send_audio_device_->Start(); 122 fake_send_audio_device_->Start();
123 audio_send_stream_->Start(); 123 audio_send_stream_->Start();
124 EXPECT_EQ(0, voe_send_.base->StartSend(voe_send_.channel_id)); 124 EXPECT_EQ(0, voe_send_.base->StartSend(voe_send_.channel_id));
125 } 125 }
126 for (AudioReceiveStream* audio_recv_stream : audio_receive_streams_) 126 for (AudioReceiveStream* audio_recv_stream : audio_receive_streams_)
127 audio_recv_stream->Start(); 127 audio_recv_stream->Start();
128 if (!audio_receive_streams_.empty()) { 128 if (!audio_receive_streams_.empty()) {
129 fake_recv_audio_device_->Start(); 129 fake_recv_audio_device_->Start();
130 EXPECT_EQ(0, voe_recv_.base->StartPlayout(voe_recv_.channel_id)); 130 EXPECT_EQ(0, voe_recv_.base->StartPlayout(voe_recv_.channel_id));
131 EXPECT_EQ(0, voe_recv_.base->StartReceive(voe_recv_.channel_id));
132 } 131 }
133 if (frame_generator_capturer_.get() != NULL) 132 if (frame_generator_capturer_.get() != NULL)
134 frame_generator_capturer_->Start(); 133 frame_generator_capturer_->Start();
135 } 134 }
136 135
137 void CallTest::Stop() { 136 void CallTest::Stop() {
138 if (frame_generator_capturer_.get() != NULL) 137 if (frame_generator_capturer_.get() != NULL)
139 frame_generator_capturer_->Stop(); 138 frame_generator_capturer_->Stop();
140 if (!audio_receive_streams_.empty()) { 139 if (!audio_receive_streams_.empty()) {
141 fake_recv_audio_device_->Stop(); 140 fake_recv_audio_device_->Stop();
142 EXPECT_EQ(0, voe_recv_.base->StopReceive(voe_recv_.channel_id));
143 EXPECT_EQ(0, voe_recv_.base->StopPlayout(voe_recv_.channel_id)); 141 EXPECT_EQ(0, voe_recv_.base->StopPlayout(voe_recv_.channel_id));
144 } 142 }
145 for (AudioReceiveStream* audio_recv_stream : audio_receive_streams_) 143 for (AudioReceiveStream* audio_recv_stream : audio_receive_streams_)
146 audio_recv_stream->Stop(); 144 audio_recv_stream->Stop();
147 if (audio_send_stream_) { 145 if (audio_send_stream_) {
148 fake_send_audio_device_->Stop(); 146 fake_send_audio_device_->Stop();
149 EXPECT_EQ(0, voe_send_.base->StopSend(voe_send_.channel_id)); 147 EXPECT_EQ(0, voe_send_.base->StopSend(voe_send_.channel_id));
150 audio_send_stream_->Stop(); 148 audio_send_stream_->Stop();
151 } 149 }
152 for (VideoReceiveStream* video_recv_stream : video_receive_streams_) 150 for (VideoReceiveStream* video_recv_stream : video_receive_streams_)
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
437 435
438 EndToEndTest::EndToEndTest(unsigned int timeout_ms) : BaseTest(timeout_ms) { 436 EndToEndTest::EndToEndTest(unsigned int timeout_ms) : BaseTest(timeout_ms) {
439 } 437 }
440 438
441 bool EndToEndTest::ShouldCreateReceivers() const { 439 bool EndToEndTest::ShouldCreateReceivers() const {
442 return true; 440 return true;
443 } 441 }
444 442
445 } // namespace test 443 } // namespace test
446 } // namespace webrtc 444 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/call/call_perf_tests.cc ('k') | webrtc/video/video_quality_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698