Move frame drop functionality in VideoAdapter into a separate class.
This class will replace modules/video_coding/utility/framerate_controller.h Bug: webrtc:13031 Change-Id: I8faa9c3c158b7c5ab0618e3504224c7e00f8e0b1 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/227350 Reviewed-by: Harald Alvestrand <hta@webrtc.org> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Reviewed-by: Erik Språng <sprang@webrtc.org> Commit-Queue: Åsa Persson <asapersson@webrtc.org> Cr-Commit-Position: refs/heads/master@{#34802}
This commit is contained in:
committed by
WebRTC LUCI CQ
parent
0ca62e3752
commit
062acd9eb4
@ -0,0 +1,85 @@
|
||||
/*
|
||||
* Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
|
||||
*
|
||||
* Use of this source code is governed by a BSD-style license
|
||||
* that can be found in the LICENSE file in the root of the source
|
||||
* tree. An additional intellectual property rights grant can be found
|
||||
* in the file PATENTS. All contributing project authors may
|
||||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
|
||||
#include "modules/video_coding/utility/framerate_controller_deprecated.h"
|
||||
|
||||
#include <stddef.h>
|
||||
|
||||
#include <cstdint>
|
||||
|
||||
namespace webrtc {
|
||||
|
||||
FramerateControllerDeprecated::FramerateControllerDeprecated(
|
||||
float target_framerate_fps)
|
||||
: min_frame_interval_ms_(0), framerate_estimator_(1000.0, 1000.0) {
|
||||
SetTargetRate(target_framerate_fps);
|
||||
}
|
||||
|
||||
void FramerateControllerDeprecated::SetTargetRate(float target_framerate_fps) {
|
||||
if (target_framerate_fps_ != target_framerate_fps) {
|
||||
framerate_estimator_.Reset();
|
||||
if (last_timestamp_ms_) {
|
||||
framerate_estimator_.Update(1, *last_timestamp_ms_);
|
||||
}
|
||||
|
||||
const size_t target_frame_interval_ms = 1000 / target_framerate_fps;
|
||||
target_framerate_fps_ = target_framerate_fps;
|
||||
min_frame_interval_ms_ = 85 * target_frame_interval_ms / 100;
|
||||
}
|
||||
}
|
||||
|
||||
float FramerateControllerDeprecated::GetTargetRate() {
|
||||
return *target_framerate_fps_;
|
||||
}
|
||||
|
||||
void FramerateControllerDeprecated::Reset() {
|
||||
framerate_estimator_.Reset();
|
||||
last_timestamp_ms_.reset();
|
||||
}
|
||||
|
||||
bool FramerateControllerDeprecated::DropFrame(uint32_t timestamp_ms) const {
|
||||
if (timestamp_ms < last_timestamp_ms_) {
|
||||
// Timestamp jumps backward. We can't make adequate drop decision. Don't
|
||||
// drop this frame. Stats will be reset in AddFrame().
|
||||
return false;
|
||||
}
|
||||
|
||||
if (Rate(timestamp_ms).value_or(*target_framerate_fps_) >
|
||||
target_framerate_fps_) {
|
||||
return true;
|
||||
}
|
||||
|
||||
if (last_timestamp_ms_) {
|
||||
const int64_t diff_ms =
|
||||
static_cast<int64_t>(timestamp_ms) - *last_timestamp_ms_;
|
||||
if (diff_ms < min_frame_interval_ms_) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
void FramerateControllerDeprecated::AddFrame(uint32_t timestamp_ms) {
|
||||
if (timestamp_ms < last_timestamp_ms_) {
|
||||
// Timestamp jumps backward.
|
||||
Reset();
|
||||
}
|
||||
|
||||
framerate_estimator_.Update(1, timestamp_ms);
|
||||
last_timestamp_ms_ = timestamp_ms;
|
||||
}
|
||||
|
||||
absl::optional<float> FramerateControllerDeprecated::Rate(
|
||||
uint32_t timestamp_ms) const {
|
||||
return framerate_estimator_.Rate(timestamp_ms);
|
||||
}
|
||||
|
||||
} // namespace webrtc
|
||||
Reference in New Issue
Block a user