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 24 matching lines...) Expand all Loading... |
35 event_factory, | 35 event_factory, |
36 nullptr, // NackSender | 36 nullptr, // NackSender |
37 nullptr) // KeyframeRequestSender | 37 nullptr) // KeyframeRequestSender |
38 {} | 38 {} |
39 | 39 |
40 VCMReceiver::VCMReceiver(VCMTiming* timing, | 40 VCMReceiver::VCMReceiver(VCMTiming* timing, |
41 Clock* clock, | 41 Clock* clock, |
42 EventFactory* event_factory, | 42 EventFactory* event_factory, |
43 NackSender* nack_sender, | 43 NackSender* nack_sender, |
44 KeyFrameRequestSender* keyframe_request_sender) | 44 KeyFrameRequestSender* keyframe_request_sender) |
45 : VCMReceiver(timing, | 45 : VCMReceiver( |
46 clock, | 46 timing, |
47 std::unique_ptr<EventWrapper>(event_factory->CreateEvent()), | 47 clock, |
48 std::unique_ptr<EventWrapper>(event_factory->CreateEvent()), | 48 std::unique_ptr<EventWrapper>(event_factory |
49 nack_sender, | 49 ? event_factory->CreateEvent() |
50 keyframe_request_sender) {} | 50 : EventWrapper::Create()), |
| 51 std::unique_ptr<EventWrapper>(event_factory |
| 52 ? event_factory->CreateEvent() |
| 53 : EventWrapper::Create()), |
| 54 nack_sender, |
| 55 keyframe_request_sender) {} |
51 | 56 |
52 VCMReceiver::VCMReceiver(VCMTiming* timing, | 57 VCMReceiver::VCMReceiver(VCMTiming* timing, |
53 Clock* clock, | 58 Clock* clock, |
54 std::unique_ptr<EventWrapper> receiver_event, | 59 std::unique_ptr<EventWrapper> receiver_event, |
55 std::unique_ptr<EventWrapper> jitter_buffer_event) | 60 std::unique_ptr<EventWrapper> jitter_buffer_event) |
56 : VCMReceiver::VCMReceiver(timing, | 61 : VCMReceiver::VCMReceiver(timing, |
57 clock, | 62 clock, |
58 std::move(receiver_event), | 63 std::move(receiver_event), |
59 std::move(jitter_buffer_event), | 64 std::move(jitter_buffer_event), |
60 nullptr, // NackSender | 65 nullptr, // NackSender |
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
298 uint32_t render_end = timing_->RenderTimeMs(timestamp_end, now_ms); | 303 uint32_t render_end = timing_->RenderTimeMs(timestamp_end, now_ms); |
299 return render_end - render_start; | 304 return render_end - render_start; |
300 } | 305 } |
301 | 306 |
302 void VCMReceiver::RegisterStatsCallback( | 307 void VCMReceiver::RegisterStatsCallback( |
303 VCMReceiveStatisticsCallback* callback) { | 308 VCMReceiveStatisticsCallback* callback) { |
304 jitter_buffer_.RegisterStatsCallback(callback); | 309 jitter_buffer_.RegisterStatsCallback(callback); |
305 } | 310 } |
306 | 311 |
307 } // namespace webrtc | 312 } // namespace webrtc |
OLD | NEW |