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 411 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
422 if (group == "Disabled") { | 422 if (group == "Disabled") { |
423 low_rate_experiment_ = kDisabled; | 423 low_rate_experiment_ = kDisabled; |
424 } else { | 424 } else { |
425 low_rate_experiment_ = kEnabled; | 425 low_rate_experiment_ = kEnabled; |
426 } | 426 } |
427 } | 427 } |
428 return low_rate_experiment_ == kEnabled ? true : false; | 428 return low_rate_experiment_ == kEnabled ? true : false; |
429 } | 429 } |
430 | 430 |
431 double VCMJitterEstimator::GetFrameRate() const { | 431 double VCMJitterEstimator::GetFrameRate() const { |
432 if (fps_counter_.count() == 0) | 432 if (fps_counter_.ComputeMean() == 0.0) |
433 return 0; | 433 return 0; |
434 | 434 |
435 double fps = 1000000.0 / fps_counter_.ComputeMean(); | 435 double fps = 1000000.0 / fps_counter_.ComputeMean(); |
436 // Sanity check. | 436 // Sanity check. |
437 assert(fps >= 0.0); | 437 assert(fps >= 0.0); |
438 if (fps > kMaxFramerateEstimate) { | 438 if (fps > kMaxFramerateEstimate) { |
439 fps = kMaxFramerateEstimate; | 439 fps = kMaxFramerateEstimate; |
440 } | 440 } |
441 return fps; | 441 return fps; |
442 } | 442 } |
443 } // namespace webrtc | 443 } // namespace webrtc |
OLD | NEW |