OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2013 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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
67 } | 67 } |
68 | 68 |
69 if (_decoderTimingCallback != nullptr) { | 69 if (_decoderTimingCallback != nullptr) { |
70 int decode_ms; | 70 int decode_ms; |
71 int max_decode_ms; | 71 int max_decode_ms; |
72 int current_delay_ms; | 72 int current_delay_ms; |
73 int target_delay_ms; | 73 int target_delay_ms; |
74 int jitter_buffer_ms; | 74 int jitter_buffer_ms; |
75 int min_playout_delay_ms; | 75 int min_playout_delay_ms; |
76 int render_delay_ms; | 76 int render_delay_ms; |
77 _timing->GetTimings(&decode_ms, &max_decode_ms, ¤t_delay_ms, | 77 if (_timing->GetTimings(&decode_ms, &max_decode_ms, ¤t_delay_ms, |
78 &target_delay_ms, &jitter_buffer_ms, | 78 &target_delay_ms, &jitter_buffer_ms, |
79 &min_playout_delay_ms, &render_delay_ms); | 79 &min_playout_delay_ms, &render_delay_ms)) { |
80 _decoderTimingCallback->OnDecoderTiming( | 80 _decoderTimingCallback->OnDecoderTiming( |
81 decode_ms, max_decode_ms, current_delay_ms, target_delay_ms, | 81 decode_ms, max_decode_ms, current_delay_ms, target_delay_ms, |
82 jitter_buffer_ms, min_playout_delay_ms, render_delay_ms); | 82 jitter_buffer_ms, min_playout_delay_ms, render_delay_ms); |
| 83 } |
83 } | 84 } |
84 } | 85 } |
85 | 86 |
86 // Key frame requests | 87 // Key frame requests |
87 if (_keyRequestTimer.TimeUntilProcess() == 0) { | 88 if (_keyRequestTimer.TimeUntilProcess() == 0) { |
88 _keyRequestTimer.Processed(); | 89 _keyRequestTimer.Processed(); |
89 bool request_key_frame = false; | 90 bool request_key_frame = false; |
90 { | 91 { |
91 rtc::CritScope cs(&process_crit_); | 92 rtc::CritScope cs(&process_crit_); |
92 request_key_frame = _scheduleKeyRequest && _frameTypeCallback != nullptr; | 93 request_key_frame = _scheduleKeyRequest && _frameTypeCallback != nullptr; |
(...skipping 421 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
514 _receiver.SetNackSettings(max_nack_list_size, max_packet_age_to_nack, | 515 _receiver.SetNackSettings(max_nack_list_size, max_packet_age_to_nack, |
515 max_incomplete_time_ms); | 516 max_incomplete_time_ms); |
516 } | 517 } |
517 | 518 |
518 int VideoReceiver::SetMinReceiverDelay(int desired_delay_ms) { | 519 int VideoReceiver::SetMinReceiverDelay(int desired_delay_ms) { |
519 return _receiver.SetMinReceiverDelay(desired_delay_ms); | 520 return _receiver.SetMinReceiverDelay(desired_delay_ms); |
520 } | 521 } |
521 | 522 |
522 } // namespace vcm | 523 } // namespace vcm |
523 } // namespace webrtc | 524 } // namespace webrtc |
OLD | NEW |