OLD | NEW |
---|---|
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 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
112 EXPECT_CALL(*channel_proxy_, GetAudioDecoderFactory()) | 112 EXPECT_CALL(*channel_proxy_, GetAudioDecoderFactory()) |
113 .WillOnce(ReturnRef(decoder_factory_)); | 113 .WillOnce(ReturnRef(decoder_factory_)); |
114 testing::Expectation expect_set = | 114 testing::Expectation expect_set = |
115 EXPECT_CALL(*channel_proxy_, SetRtcEventLog(&event_log_)) | 115 EXPECT_CALL(*channel_proxy_, SetRtcEventLog(&event_log_)) |
116 .Times(1); | 116 .Times(1); |
117 EXPECT_CALL(*channel_proxy_, SetRtcEventLog(testing::IsNull())) | 117 EXPECT_CALL(*channel_proxy_, SetRtcEventLog(testing::IsNull())) |
118 .Times(1) | 118 .Times(1) |
119 .After(expect_set); | 119 .After(expect_set); |
120 return channel_proxy_; | 120 return channel_proxy_; |
121 })); | 121 })); |
122 EXPECT_CALL(voice_engine_, StopPlayout(kChannelId)).WillOnce(Return(0)); | |
ossu
2016/10/25 14:13:33
Why won't StopPlayout be called after this change?
the sun
2016/10/27 10:06:45
Because it is called from the dtor, but now the ca
aleloi
2016/11/01 15:17:35
Thanks, sorry for being late!
| |
123 stream_config_.voe_channel_id = kChannelId; | 122 stream_config_.voe_channel_id = kChannelId; |
124 stream_config_.rtp.local_ssrc = kLocalSsrc; | 123 stream_config_.rtp.local_ssrc = kLocalSsrc; |
125 stream_config_.rtp.remote_ssrc = kRemoteSsrc; | 124 stream_config_.rtp.remote_ssrc = kRemoteSsrc; |
126 stream_config_.rtp.nack.rtp_history_ms = 300; | 125 stream_config_.rtp.nack.rtp_history_ms = 300; |
127 stream_config_.rtp.extensions.push_back( | 126 stream_config_.rtp.extensions.push_back( |
128 RtpExtension(RtpExtension::kAbsSendTimeUri, kAbsSendTimeId)); | 127 RtpExtension(RtpExtension::kAbsSendTimeUri, kAbsSendTimeId)); |
129 stream_config_.rtp.extensions.push_back( | 128 stream_config_.rtp.extensions.push_back( |
130 RtpExtension(RtpExtension::kAudioLevelUri, kAudioLevelId)); | 129 RtpExtension(RtpExtension::kAudioLevelUri, kAudioLevelId)); |
131 stream_config_.rtp.extensions.push_back(RtpExtension( | 130 stream_config_.rtp.extensions.push_back(RtpExtension( |
132 RtpExtension::kTransportSequenceNumberUri, kTransportSequenceNumberId)); | 131 RtpExtension::kTransportSequenceNumberUri, kTransportSequenceNumberId)); |
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
367 ConfigHelper helper; | 366 ConfigHelper helper; |
368 internal::AudioReceiveStream recv_stream( | 367 internal::AudioReceiveStream recv_stream( |
369 helper.congestion_controller(), helper.config(), helper.audio_state(), | 368 helper.congestion_controller(), helper.config(), helper.audio_state(), |
370 helper.event_log()); | 369 helper.event_log()); |
371 EXPECT_CALL(*helper.channel_proxy(), | 370 EXPECT_CALL(*helper.channel_proxy(), |
372 SetChannelOutputVolumeScaling(FloatEq(0.765f))); | 371 SetChannelOutputVolumeScaling(FloatEq(0.765f))); |
373 recv_stream.SetGain(0.765f); | 372 recv_stream.SetGain(0.765f); |
374 } | 373 } |
375 } // namespace test | 374 } // namespace test |
376 } // namespace webrtc | 375 } // namespace webrtc |
OLD | NEW |