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 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
101 EXPECT_CALL(*channel_proxy_, RegisterExternalTransport(nullptr)) | 101 EXPECT_CALL(*channel_proxy_, RegisterExternalTransport(nullptr)) |
102 .Times(1); | 102 .Times(1); |
103 EXPECT_CALL(*channel_proxy_, DeRegisterExternalTransport()) | 103 EXPECT_CALL(*channel_proxy_, DeRegisterExternalTransport()) |
104 .Times(1); | 104 .Times(1); |
105 return channel_proxy_; | 105 return channel_proxy_; |
106 })); | 106 })); |
107 stream_config_.voe_channel_id = kChannelId; | 107 stream_config_.voe_channel_id = kChannelId; |
108 stream_config_.rtp.local_ssrc = kLocalSsrc; | 108 stream_config_.rtp.local_ssrc = kLocalSsrc; |
109 stream_config_.rtp.remote_ssrc = kRemoteSsrc; | 109 stream_config_.rtp.remote_ssrc = kRemoteSsrc; |
110 stream_config_.rtp.extensions.push_back( | 110 stream_config_.rtp.extensions.push_back( |
111 RtpExtension(RtpExtension::kAbsSendTime, kAbsSendTimeId)); | 111 RtpExtension(RtpExtension::kAbsSendTimeUri, kAbsSendTimeId)); |
112 stream_config_.rtp.extensions.push_back( | 112 stream_config_.rtp.extensions.push_back( |
113 RtpExtension(RtpExtension::kAudioLevel, kAudioLevelId)); | 113 RtpExtension(RtpExtension::kAudioLevelUri, kAudioLevelId)); |
114 stream_config_.rtp.extensions.push_back(RtpExtension( | 114 stream_config_.rtp.extensions.push_back(RtpExtension( |
115 RtpExtension::kTransportSequenceNumber, kTransportSequenceNumberId)); | 115 RtpExtension::kTransportSequenceNumberUri, kTransportSequenceNumberId)); |
116 } | 116 } |
117 | 117 |
118 MockCongestionController* congestion_controller() { | 118 MockCongestionController* congestion_controller() { |
119 return &congestion_controller_; | 119 return &congestion_controller_; |
120 } | 120 } |
121 MockRemoteBitrateEstimator* remote_bitrate_estimator() { | 121 MockRemoteBitrateEstimator* remote_bitrate_estimator() { |
122 return &remote_bitrate_estimator_; | 122 return &remote_bitrate_estimator_; |
123 } | 123 } |
124 AudioReceiveStream::Config& config() { return stream_config_; } | 124 AudioReceiveStream::Config& config() { return stream_config_; } |
125 rtc::scoped_refptr<AudioState> audio_state() { return audio_state_; } | 125 rtc::scoped_refptr<AudioState> audio_state() { return audio_state_; } |
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
217 ByteWriter<uint32_t>::WriteBigEndian(&packet[4], kLocalSsrc); | 217 ByteWriter<uint32_t>::WriteBigEndian(&packet[4], kLocalSsrc); |
218 return packet; | 218 return packet; |
219 } | 219 } |
220 } // namespace | 220 } // namespace |
221 | 221 |
222 TEST(AudioReceiveStreamTest, ConfigToString) { | 222 TEST(AudioReceiveStreamTest, ConfigToString) { |
223 AudioReceiveStream::Config config; | 223 AudioReceiveStream::Config config; |
224 config.rtp.remote_ssrc = kRemoteSsrc; | 224 config.rtp.remote_ssrc = kRemoteSsrc; |
225 config.rtp.local_ssrc = kLocalSsrc; | 225 config.rtp.local_ssrc = kLocalSsrc; |
226 config.rtp.extensions.push_back( | 226 config.rtp.extensions.push_back( |
227 RtpExtension(RtpExtension::kAbsSendTime, kAbsSendTimeId)); | 227 RtpExtension(RtpExtension::kAbsSendTimeUri, kAbsSendTimeId)); |
228 config.voe_channel_id = kChannelId; | 228 config.voe_channel_id = kChannelId; |
229 EXPECT_EQ( | 229 EXPECT_EQ( |
230 "{rtp: {remote_ssrc: 1234, local_ssrc: 5678, extensions: [{name: " | 230 "{rtp: {remote_ssrc: 1234, local_ssrc: 5678, extensions: [{uri: " |
231 "http://www.webrtc.org/experiments/rtp-hdrext/abs-send-time, id: 2}], " | 231 "http://www.webrtc.org/experiments/rtp-hdrext/abs-send-time, id: 2}], " |
232 "transport_cc: off}, " | 232 "transport_cc: off}, " |
233 "rtcp_send_transport: nullptr, " | 233 "rtcp_send_transport: nullptr, " |
234 "voe_channel_id: 2}", | 234 "voe_channel_id: 2}", |
235 config.ToString()); | 235 config.ToString()); |
236 } | 236 } |
237 | 237 |
238 TEST(AudioReceiveStreamTest, ConstructDestruct) { | 238 TEST(AudioReceiveStreamTest, ConstructDestruct) { |
239 ConfigHelper helper; | 239 ConfigHelper helper; |
240 internal::AudioReceiveStream recv_stream( | 240 internal::AudioReceiveStream recv_stream( |
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
331 EXPECT_EQ(kAudioDecodeStats.calls_to_neteq, stats.decoding_calls_to_neteq); | 331 EXPECT_EQ(kAudioDecodeStats.calls_to_neteq, stats.decoding_calls_to_neteq); |
332 EXPECT_EQ(kAudioDecodeStats.decoded_normal, stats.decoding_normal); | 332 EXPECT_EQ(kAudioDecodeStats.decoded_normal, stats.decoding_normal); |
333 EXPECT_EQ(kAudioDecodeStats.decoded_plc, stats.decoding_plc); | 333 EXPECT_EQ(kAudioDecodeStats.decoded_plc, stats.decoding_plc); |
334 EXPECT_EQ(kAudioDecodeStats.decoded_cng, stats.decoding_cng); | 334 EXPECT_EQ(kAudioDecodeStats.decoded_cng, stats.decoding_cng); |
335 EXPECT_EQ(kAudioDecodeStats.decoded_plc_cng, stats.decoding_plc_cng); | 335 EXPECT_EQ(kAudioDecodeStats.decoded_plc_cng, stats.decoding_plc_cng); |
336 EXPECT_EQ(kCallStats.capture_start_ntp_time_ms_, | 336 EXPECT_EQ(kCallStats.capture_start_ntp_time_ms_, |
337 stats.capture_start_ntp_time_ms); | 337 stats.capture_start_ntp_time_ms); |
338 } | 338 } |
339 } // namespace test | 339 } // namespace test |
340 } // namespace webrtc | 340 } // namespace webrtc |
OLD | NEW |