OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2011 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 270 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
281 int VCMTiming::TargetVideoDelay() const { | 281 int VCMTiming::TargetVideoDelay() const { |
282 CriticalSectionScoped cs(crit_sect_); | 282 CriticalSectionScoped cs(crit_sect_); |
283 return TargetDelayInternal(); | 283 return TargetDelayInternal(); |
284 } | 284 } |
285 | 285 |
286 int VCMTiming::TargetDelayInternal() const { | 286 int VCMTiming::TargetDelayInternal() const { |
287 return std::max(min_playout_delay_ms_, | 287 return std::max(min_playout_delay_ms_, |
288 jitter_delay_ms_ + RequiredDecodeTimeMs() + render_delay_ms_); | 288 jitter_delay_ms_ + RequiredDecodeTimeMs() + render_delay_ms_); |
289 } | 289 } |
290 | 290 |
291 void VCMTiming::GetTimings(int* decode_ms, | 291 bool VCMTiming::GetTimings(int* decode_ms, |
292 int* max_decode_ms, | 292 int* max_decode_ms, |
293 int* current_delay_ms, | 293 int* current_delay_ms, |
294 int* target_delay_ms, | 294 int* target_delay_ms, |
295 int* jitter_buffer_ms, | 295 int* jitter_buffer_ms, |
296 int* min_playout_delay_ms, | 296 int* min_playout_delay_ms, |
297 int* render_delay_ms) const { | 297 int* render_delay_ms) const { |
298 CriticalSectionScoped cs(crit_sect_); | 298 CriticalSectionScoped cs(crit_sect_); |
299 *decode_ms = last_decode_ms_; | 299 *decode_ms = last_decode_ms_; |
300 *max_decode_ms = RequiredDecodeTimeMs(); | 300 *max_decode_ms = RequiredDecodeTimeMs(); |
301 *current_delay_ms = current_delay_ms_; | 301 *current_delay_ms = current_delay_ms_; |
302 *target_delay_ms = TargetDelayInternal(); | 302 *target_delay_ms = TargetDelayInternal(); |
303 *jitter_buffer_ms = jitter_delay_ms_; | 303 *jitter_buffer_ms = jitter_delay_ms_; |
304 *min_playout_delay_ms = min_playout_delay_ms_; | 304 *min_playout_delay_ms = min_playout_delay_ms_; |
305 *render_delay_ms = render_delay_ms_; | 305 *render_delay_ms = render_delay_ms_; |
| 306 return (num_decoded_frames_ > 0); |
306 } | 307 } |
307 | 308 |
308 } // namespace webrtc | 309 } // namespace webrtc |
OLD | NEW |