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

Side by Side Diff: webrtc/audio/audio_receive_stream_unittest.cc

Issue 2383143002: Restarting channel when swapping AudioReceiveStreams in WebrtcVoE. (Closed)
Patch Set: Minor changes in response to comments. Created 4 years, 2 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
« no previous file with comments | « webrtc/audio/audio_receive_stream.cc ('k') | webrtc/media/engine/webrtcvoiceengine.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) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 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 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 EXPECT_CALL(*channel_proxy_, GetAudioDecoderFactory()) 113 EXPECT_CALL(*channel_proxy_, GetAudioDecoderFactory())
114 .WillOnce(ReturnRef(decoder_factory_)); 114 .WillOnce(ReturnRef(decoder_factory_));
115 testing::Expectation expect_set = 115 testing::Expectation expect_set =
116 EXPECT_CALL(*channel_proxy_, SetRtcEventLog(&event_log_)) 116 EXPECT_CALL(*channel_proxy_, SetRtcEventLog(&event_log_))
117 .Times(1); 117 .Times(1);
118 EXPECT_CALL(*channel_proxy_, SetRtcEventLog(testing::IsNull())) 118 EXPECT_CALL(*channel_proxy_, SetRtcEventLog(testing::IsNull()))
119 .Times(1) 119 .Times(1)
120 .After(expect_set); 120 .After(expect_set);
121 return channel_proxy_; 121 return channel_proxy_;
122 })); 122 }));
123 EXPECT_CALL(voice_engine_, StopPlayout(kChannelId)).WillOnce(Return(0));
123 stream_config_.voe_channel_id = kChannelId; 124 stream_config_.voe_channel_id = kChannelId;
124 stream_config_.rtp.local_ssrc = kLocalSsrc; 125 stream_config_.rtp.local_ssrc = kLocalSsrc;
125 stream_config_.rtp.remote_ssrc = kRemoteSsrc; 126 stream_config_.rtp.remote_ssrc = kRemoteSsrc;
126 stream_config_.rtp.nack.rtp_history_ms = 300; 127 stream_config_.rtp.nack.rtp_history_ms = 300;
127 stream_config_.rtp.extensions.push_back( 128 stream_config_.rtp.extensions.push_back(
128 RtpExtension(RtpExtension::kAbsSendTimeUri, kAbsSendTimeId)); 129 RtpExtension(RtpExtension::kAbsSendTimeUri, kAbsSendTimeId));
129 stream_config_.rtp.extensions.push_back( 130 stream_config_.rtp.extensions.push_back(
130 RtpExtension(RtpExtension::kAudioLevelUri, kAudioLevelId)); 131 RtpExtension(RtpExtension::kAudioLevelUri, kAudioLevelId));
131 stream_config_.rtp.extensions.push_back(RtpExtension( 132 stream_config_.rtp.extensions.push_back(RtpExtension(
132 RtpExtension::kTransportSequenceNumberUri, kTransportSequenceNumberId)); 133 RtpExtension::kTransportSequenceNumberUri, kTransportSequenceNumberId));
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 ConfigHelper helper; 368 ConfigHelper helper;
368 internal::AudioReceiveStream recv_stream( 369 internal::AudioReceiveStream recv_stream(
369 helper.congestion_controller(), helper.config(), helper.audio_state(), 370 helper.congestion_controller(), helper.config(), helper.audio_state(),
370 helper.event_log()); 371 helper.event_log());
371 EXPECT_CALL(*helper.channel_proxy(), 372 EXPECT_CALL(*helper.channel_proxy(),
372 SetChannelOutputVolumeScaling(FloatEq(0.765f))); 373 SetChannelOutputVolumeScaling(FloatEq(0.765f)));
373 recv_stream.SetGain(0.765f); 374 recv_stream.SetGain(0.765f);
374 } 375 }
375 } // namespace test 376 } // namespace test
376 } // namespace webrtc 377 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/audio/audio_receive_stream.cc ('k') | webrtc/media/engine/webrtcvoiceengine.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698