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

Side by Side Diff: webrtc/call/call_perf_tests.cc

Issue 2436033002: Replace AudioConferenceMixer with AudioMixer. (Closed)
Patch Set: Added errors and logs to AudioTransport. 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) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 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 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 EXPECT_EQ(1u, video_receive_streams_.size()); 265 EXPECT_EQ(1u, video_receive_streams_.size());
266 observer.set_receive_stream(video_receive_streams_[0]); 266 observer.set_receive_stream(video_receive_streams_[0]);
267 DriftingClock drifting_clock(clock_, video_ntp_speed); 267 DriftingClock drifting_clock(clock_, video_ntp_speed);
268 CreateFrameGeneratorCapturerWithDrift(&drifting_clock, video_rtp_speed, 268 CreateFrameGeneratorCapturerWithDrift(&drifting_clock, video_rtp_speed,
269 kDefaultFramerate, kDefaultWidth, 269 kDefaultFramerate, kDefaultWidth,
270 kDefaultHeight); 270 kDefaultHeight);
271 271
272 Start(); 272 Start();
273 273
274 fake_audio_device.Start(); 274 fake_audio_device.Start();
275 EXPECT_EQ(0, voe_base->StartPlayout(recv_channel_id)); 275 audio_receive_stream->Start();
276 EXPECT_EQ(0, voe_base->StartReceive(recv_channel_id)); 276 EXPECT_EQ(0, voe_base->StartReceive(recv_channel_id));
277 EXPECT_EQ(0, voe_base->StartSend(send_channel_id)); 277 EXPECT_EQ(0, voe_base->StartSend(send_channel_id));
278 278
279 EXPECT_TRUE(observer.Wait()) 279 EXPECT_TRUE(observer.Wait())
280 << "Timed out while waiting for audio and video to be synchronized."; 280 << "Timed out while waiting for audio and video to be synchronized.";
281 281
282 EXPECT_EQ(0, voe_base->StopSend(send_channel_id)); 282 EXPECT_EQ(0, voe_base->StopSend(send_channel_id));
283 EXPECT_EQ(0, voe_base->StopReceive(recv_channel_id)); 283 EXPECT_EQ(0, voe_base->StopReceive(recv_channel_id));
284 EXPECT_EQ(0, voe_base->StopPlayout(recv_channel_id)); 284 EXPECT_EQ(0, voe_base->StopPlayout(recv_channel_id));
the sun 2016/10/27 10:06:46 audio_receive_stream->Stop();
285 fake_audio_device.Stop(); 285 fake_audio_device.Stop();
286 286
287 Stop(); 287 Stop();
288 video_send_transport.StopSending(); 288 video_send_transport.StopSending();
289 audio_send_transport.StopSending(); 289 audio_send_transport.StopSending();
290 receive_transport.StopSending(); 290 receive_transport.StopSending();
291 291
292 DestroyStreams(); 292 DestroyStreams();
293 293
294 sender_call_->DestroyAudioSendStream(audio_send_stream); 294 sender_call_->DestroyAudioSendStream(audio_send_stream);
(...skipping 434 matching lines...) Expand 10 before | Expand all | Expand 10 after
729 uint32_t last_set_bitrate_; 729 uint32_t last_set_bitrate_;
730 VideoSendStream* send_stream_; 730 VideoSendStream* send_stream_;
731 test::FrameGeneratorCapturer* frame_generator_; 731 test::FrameGeneratorCapturer* frame_generator_;
732 VideoEncoderConfig encoder_config_; 732 VideoEncoderConfig encoder_config_;
733 } test; 733 } test;
734 734
735 RunBaseTest(&test); 735 RunBaseTest(&test);
736 } 736 }
737 737
738 } // namespace webrtc 738 } // namespace webrtc
OLDNEW
« webrtc/audio/audio_transport_proxy.h ('K') | « webrtc/audio/webrtc_audio.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698