OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2012 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 14 matching lines...) Expand all Loading... |
25 | 25 |
26 namespace webrtc { | 26 namespace webrtc { |
27 | 27 |
28 enum { kMaxReceiverDelayMs = 10000 }; | 28 enum { kMaxReceiverDelayMs = 10000 }; |
29 | 29 |
30 VCMReceiver::VCMReceiver(VCMTiming* timing, | 30 VCMReceiver::VCMReceiver(VCMTiming* timing, |
31 Clock* clock, | 31 Clock* clock, |
32 EventFactory* event_factory) | 32 EventFactory* event_factory) |
33 : VCMReceiver(timing, | 33 : VCMReceiver(timing, |
34 clock, | 34 clock, |
35 rtc::scoped_ptr<EventWrapper>(event_factory->CreateEvent()), | 35 std::unique_ptr<EventWrapper>(event_factory->CreateEvent()), |
36 rtc::scoped_ptr<EventWrapper>(event_factory->CreateEvent())) { | 36 std::unique_ptr<EventWrapper>(event_factory->CreateEvent())) { |
37 } | 37 } |
38 | 38 |
39 VCMReceiver::VCMReceiver(VCMTiming* timing, | 39 VCMReceiver::VCMReceiver(VCMTiming* timing, |
40 Clock* clock, | 40 Clock* clock, |
41 rtc::scoped_ptr<EventWrapper> receiver_event, | 41 std::unique_ptr<EventWrapper> receiver_event, |
42 rtc::scoped_ptr<EventWrapper> jitter_buffer_event) | 42 std::unique_ptr<EventWrapper> jitter_buffer_event) |
43 : crit_sect_(CriticalSectionWrapper::CreateCriticalSection()), | 43 : crit_sect_(CriticalSectionWrapper::CreateCriticalSection()), |
44 clock_(clock), | 44 clock_(clock), |
45 jitter_buffer_(clock_, std::move(jitter_buffer_event)), | 45 jitter_buffer_(clock_, std::move(jitter_buffer_event)), |
46 timing_(timing), | 46 timing_(timing), |
47 render_wait_event_(std::move(receiver_event)), | 47 render_wait_event_(std::move(receiver_event)), |
48 max_video_delay_ms_(kMaxVideoDelayMs) { | 48 max_video_delay_ms_(kMaxVideoDelayMs) { |
49 Reset(); | 49 Reset(); |
50 } | 50 } |
51 | 51 |
52 VCMReceiver::~VCMReceiver() { | 52 VCMReceiver::~VCMReceiver() { |
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
260 uint32_t render_end = timing_->RenderTimeMs(timestamp_end, now_ms); | 260 uint32_t render_end = timing_->RenderTimeMs(timestamp_end, now_ms); |
261 return render_end - render_start; | 261 return render_end - render_start; |
262 } | 262 } |
263 | 263 |
264 void VCMReceiver::RegisterStatsCallback( | 264 void VCMReceiver::RegisterStatsCallback( |
265 VCMReceiveStatisticsCallback* callback) { | 265 VCMReceiveStatisticsCallback* callback) { |
266 jitter_buffer_.RegisterStatsCallback(callback); | 266 jitter_buffer_.RegisterStatsCallback(callback); |
267 } | 267 } |
268 | 268 |
269 } // namespace webrtc | 269 } // namespace webrtc |
OLD | NEW |