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 |
11 #include "webrtc/audio/audio_receive_stream.h" | 11 #include "webrtc/audio/audio_receive_stream.h" |
12 | 12 |
13 #include <string> | 13 #include <string> |
14 #include <utility> | 14 #include <utility> |
15 | 15 |
16 #include "webrtc/audio_sink.h" | 16 #include "webrtc/audio_sink.h" |
17 #include "webrtc/audio/audio_state.h" | 17 #include "webrtc/audio/audio_state.h" |
18 #include "webrtc/audio/conversion.h" | 18 #include "webrtc/audio/conversion.h" |
19 #include "webrtc/base/checks.h" | 19 #include "webrtc/base/checks.h" |
20 #include "webrtc/base/logging.h" | 20 #include "webrtc/base/logging.h" |
| 21 #include "webrtc/base/timeutils.h" |
21 #include "webrtc/modules/congestion_controller/include/congestion_controller.h" | 22 #include "webrtc/modules/congestion_controller/include/congestion_controller.h" |
22 #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimat
or.h" | 23 #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimat
or.h" |
23 #include "webrtc/system_wrappers/include/tick_util.h" | |
24 #include "webrtc/voice_engine/channel_proxy.h" | 24 #include "webrtc/voice_engine/channel_proxy.h" |
25 #include "webrtc/voice_engine/include/voe_base.h" | 25 #include "webrtc/voice_engine/include/voe_base.h" |
26 #include "webrtc/voice_engine/include/voe_codec.h" | 26 #include "webrtc/voice_engine/include/voe_codec.h" |
27 #include "webrtc/voice_engine/include/voe_neteq_stats.h" | 27 #include "webrtc/voice_engine/include/voe_neteq_stats.h" |
28 #include "webrtc/voice_engine/include/voe_rtp_rtcp.h" | 28 #include "webrtc/voice_engine/include/voe_rtp_rtcp.h" |
29 #include "webrtc/voice_engine/include/voe_video_sync.h" | 29 #include "webrtc/voice_engine/include/voe_video_sync.h" |
30 #include "webrtc/voice_engine/include/voe_volume_control.h" | 30 #include "webrtc/voice_engine/include/voe_volume_control.h" |
31 #include "webrtc/voice_engine/voice_engine_impl.h" | 31 #include "webrtc/voice_engine/voice_engine_impl.h" |
32 | 32 |
33 namespace webrtc { | 33 namespace webrtc { |
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
223 RTPHeader header; | 223 RTPHeader header; |
224 if (!rtp_header_parser_->Parse(packet, length, &header)) { | 224 if (!rtp_header_parser_->Parse(packet, length, &header)) { |
225 return false; | 225 return false; |
226 } | 226 } |
227 | 227 |
228 // Only forward if the parsed header has one of the headers necessary for | 228 // Only forward if the parsed header has one of the headers necessary for |
229 // bandwidth estimation. RTP timestamps has different rates for audio and | 229 // bandwidth estimation. RTP timestamps has different rates for audio and |
230 // video and shouldn't be mixed. | 230 // video and shouldn't be mixed. |
231 if (remote_bitrate_estimator_ && | 231 if (remote_bitrate_estimator_ && |
232 header.extension.hasTransportSequenceNumber) { | 232 header.extension.hasTransportSequenceNumber) { |
233 int64_t arrival_time_ms = TickTime::MillisecondTimestamp(); | 233 int64_t arrival_time_ms = rtc::TimeMillis(); |
234 if (packet_time.timestamp >= 0) | 234 if (packet_time.timestamp >= 0) |
235 arrival_time_ms = (packet_time.timestamp + 500) / 1000; | 235 arrival_time_ms = (packet_time.timestamp + 500) / 1000; |
236 size_t payload_size = length - header.headerLength; | 236 size_t payload_size = length - header.headerLength; |
237 remote_bitrate_estimator_->IncomingPacket(arrival_time_ms, payload_size, | 237 remote_bitrate_estimator_->IncomingPacket(arrival_time_ms, payload_size, |
238 header, false); | 238 header, false); |
239 } | 239 } |
240 | 240 |
241 return channel_proxy_->ReceivedRTPPacket(packet, length, packet_time); | 241 return channel_proxy_->ReceivedRTPPacket(packet, length, packet_time); |
242 } | 242 } |
243 | 243 |
244 VoiceEngine* AudioReceiveStream::voice_engine() const { | 244 VoiceEngine* AudioReceiveStream::voice_engine() const { |
245 internal::AudioState* audio_state = | 245 internal::AudioState* audio_state = |
246 static_cast<internal::AudioState*>(audio_state_.get()); | 246 static_cast<internal::AudioState*>(audio_state_.get()); |
247 VoiceEngine* voice_engine = audio_state->voice_engine(); | 247 VoiceEngine* voice_engine = audio_state->voice_engine(); |
248 RTC_DCHECK(voice_engine); | 248 RTC_DCHECK(voice_engine); |
249 return voice_engine; | 249 return voice_engine; |
250 } | 250 } |
251 } // namespace internal | 251 } // namespace internal |
252 } // namespace webrtc | 252 } // namespace webrtc |
OLD | NEW |