
The DegradationPreference logic is moved into OveruseFrameDetectorResourceAdaptationModule. This makes the adaptation module solely responsible for degradation preference, and the VideoStreamEncoder the only bridge between the adaptation module and the VideoSourceSinkController. The adaptation module is now unaware of the existence of a controller. It only "speaks" VideoSourceRestrictions, which is a big milestone in making adaptation modules injectable. A follow-up CL will explore the possibility of reconfiguring the controller's source and which degradation preference to use to the encoder queue. This would allow us to make several classes single-threaded, but it is a change in behavior and should be done in a separate CL. Bug: webrtc:11222 Change-Id: Ib7f640e12789da5f801177926c2072a51818f261 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/165684 Commit-Queue: Henrik Boström <hbos@webrtc.org> Reviewed-by: Evan Shrubsole <eshr@google.com> Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org> Cr-Commit-Position: refs/heads/master@{#30237}
140 lines
4.4 KiB
C++
140 lines
4.4 KiB
C++
/*
|
|
* Copyright 2020 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 "video/video_source_sink_controller.h"
|
|
|
|
#include <algorithm>
|
|
#include <limits>
|
|
#include <utility>
|
|
|
|
#include "rtc_base/numerics/safe_conversions.h"
|
|
|
|
namespace webrtc {
|
|
|
|
VideoSourceSinkController::VideoSourceSinkController(
|
|
rtc::VideoSinkInterface<VideoFrame>* sink,
|
|
rtc::VideoSourceInterface<VideoFrame>* source)
|
|
: sink_(sink), source_(source) {
|
|
RTC_DCHECK(sink_);
|
|
}
|
|
|
|
void VideoSourceSinkController::SetSource(
|
|
rtc::VideoSourceInterface<VideoFrame>* source) {
|
|
rtc::VideoSourceInterface<VideoFrame>* old_source;
|
|
rtc::VideoSinkWants wants;
|
|
{
|
|
rtc::CritScope lock(&crit_);
|
|
old_source = source_;
|
|
source_ = source;
|
|
wants = CurrentSettingsToSinkWants();
|
|
}
|
|
if (old_source != source && old_source)
|
|
old_source->RemoveSink(sink_);
|
|
if (!source)
|
|
return;
|
|
source->AddOrUpdateSink(sink_, wants);
|
|
}
|
|
|
|
void VideoSourceSinkController::PushSourceSinkSettings() {
|
|
rtc::CritScope lock(&crit_);
|
|
if (!source_)
|
|
return;
|
|
source_->AddOrUpdateSink(sink_, CurrentSettingsToSinkWants());
|
|
}
|
|
|
|
VideoSourceRestrictions VideoSourceSinkController::restrictions() const {
|
|
rtc::CritScope lock(&crit_);
|
|
return restrictions_;
|
|
}
|
|
|
|
absl::optional<size_t> VideoSourceSinkController::pixels_per_frame_upper_limit()
|
|
const {
|
|
rtc::CritScope lock(&crit_);
|
|
return pixels_per_frame_upper_limit_;
|
|
}
|
|
|
|
absl::optional<double> VideoSourceSinkController::frame_rate_upper_limit()
|
|
const {
|
|
rtc::CritScope lock(&crit_);
|
|
return frame_rate_upper_limit_;
|
|
}
|
|
|
|
bool VideoSourceSinkController::rotation_applied() const {
|
|
rtc::CritScope lock(&crit_);
|
|
return rotation_applied_;
|
|
}
|
|
|
|
int VideoSourceSinkController::resolution_alignment() const {
|
|
rtc::CritScope lock(&crit_);
|
|
return resolution_alignment_;
|
|
}
|
|
|
|
void VideoSourceSinkController::SetRestrictions(
|
|
VideoSourceRestrictions restrictions) {
|
|
rtc::CritScope lock(&crit_);
|
|
restrictions_ = std::move(restrictions);
|
|
}
|
|
|
|
void VideoSourceSinkController::SetPixelsPerFrameUpperLimit(
|
|
absl::optional<size_t> pixels_per_frame_upper_limit) {
|
|
rtc::CritScope lock(&crit_);
|
|
pixels_per_frame_upper_limit_ = std::move(pixels_per_frame_upper_limit);
|
|
}
|
|
|
|
void VideoSourceSinkController::SetFrameRateUpperLimit(
|
|
absl::optional<double> frame_rate_upper_limit) {
|
|
rtc::CritScope lock(&crit_);
|
|
frame_rate_upper_limit_ = std::move(frame_rate_upper_limit);
|
|
}
|
|
|
|
void VideoSourceSinkController::SetRotationApplied(bool rotation_applied) {
|
|
rtc::CritScope lock(&crit_);
|
|
rotation_applied_ = rotation_applied;
|
|
}
|
|
|
|
void VideoSourceSinkController::SetResolutionAlignment(
|
|
int resolution_alignment) {
|
|
rtc::CritScope lock(&crit_);
|
|
resolution_alignment_ = resolution_alignment;
|
|
}
|
|
|
|
// RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_)
|
|
rtc::VideoSinkWants VideoSourceSinkController::CurrentSettingsToSinkWants()
|
|
const {
|
|
rtc::VideoSinkWants wants;
|
|
wants.rotation_applied = rotation_applied_;
|
|
// |wants.black_frames| is not used, it always has its default value false.
|
|
wants.max_pixel_count =
|
|
rtc::dchecked_cast<int>(restrictions_.max_pixels_per_frame().value_or(
|
|
std::numeric_limits<int>::max()));
|
|
wants.target_pixel_count =
|
|
restrictions_.target_pixels_per_frame().has_value()
|
|
? absl::optional<int>(rtc::dchecked_cast<int>(
|
|
restrictions_.target_pixels_per_frame().value()))
|
|
: absl::nullopt;
|
|
wants.max_framerate_fps =
|
|
restrictions_.max_frame_rate().has_value()
|
|
? static_cast<int>(restrictions_.max_frame_rate().value())
|
|
: std::numeric_limits<int>::max();
|
|
wants.resolution_alignment = resolution_alignment_;
|
|
wants.max_pixel_count =
|
|
std::min(wants.max_pixel_count,
|
|
rtc::dchecked_cast<int>(pixels_per_frame_upper_limit_.value_or(
|
|
std::numeric_limits<int>::max())));
|
|
wants.max_framerate_fps =
|
|
std::min(wants.max_framerate_fps,
|
|
frame_rate_upper_limit_.has_value()
|
|
? static_cast<int>(frame_rate_upper_limit_.value())
|
|
: std::numeric_limits<int>::max());
|
|
return wants;
|
|
}
|
|
|
|
} // namespace webrtc
|