91aa73255e
This CL is part of the Call-Level Adaptation Processing design doc: https://docs.google.com/document/d/1ZyC26yOCknrrcYa839ZWLxD6o6Gig5A3lVTh4E41074/edit?usp=sharing The ResourceListenerResponse was used to make the QualityScaler not clear QP samples and instead increase its frequency of checking for QP under certain circumstances, see enum description: https://webrtc.googlesource.com/src.git/+/c70b1028d47c1aee4892545190cd66e97d09cd55/call/adaptation/resource.h#33 Because the QualityScaler depends on whether and how adaptation happened it should listen to adaptation happening. This CL moves the logic that was previously in VideoStreamAdapter closer to the QualityScaler: QualityScalerResource::OnAdaptationApplied(). This would allow the VideoStreamAdapter to operate on a separate task queue in the future, with no dependencies on any stream-specific resources that might operate on other task queues. Bug: webrtc:11172, webrtc:11521 Change-Id: I07971a8a5fab5715f4ccb7d2c63f1b92bd47170f Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/173090 Commit-Queue: Henrik Boström <hbos@webrtc.org> Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org> Reviewed-by: Evan Shrubsole <eshr@google.com> Cr-Commit-Position: refs/heads/master@{#31143}
89 lines
3.1 KiB
C++
89 lines
3.1 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 "call/adaptation/video_source_restrictions.h"
|
|
|
|
#include <limits>
|
|
|
|
#include "rtc_base/checks.h"
|
|
|
|
namespace webrtc {
|
|
|
|
VideoSourceRestrictions::VideoSourceRestrictions()
|
|
: max_pixels_per_frame_(absl::nullopt),
|
|
target_pixels_per_frame_(absl::nullopt),
|
|
max_frame_rate_(absl::nullopt) {}
|
|
|
|
VideoSourceRestrictions::VideoSourceRestrictions(
|
|
absl::optional<size_t> max_pixels_per_frame,
|
|
absl::optional<size_t> target_pixels_per_frame,
|
|
absl::optional<double> max_frame_rate)
|
|
: max_pixels_per_frame_(std::move(max_pixels_per_frame)),
|
|
target_pixels_per_frame_(std::move(target_pixels_per_frame)),
|
|
max_frame_rate_(std::move(max_frame_rate)) {
|
|
RTC_DCHECK(!max_pixels_per_frame_.has_value() ||
|
|
max_pixels_per_frame_.value() <
|
|
static_cast<size_t>(std::numeric_limits<int>::max()));
|
|
RTC_DCHECK(!max_frame_rate_.has_value() ||
|
|
max_frame_rate_.value() < std::numeric_limits<int>::max());
|
|
RTC_DCHECK(!max_frame_rate_.has_value() || max_frame_rate_.value() > 0.0);
|
|
}
|
|
|
|
const absl::optional<size_t>& VideoSourceRestrictions::max_pixels_per_frame()
|
|
const {
|
|
return max_pixels_per_frame_;
|
|
}
|
|
|
|
const absl::optional<size_t>& VideoSourceRestrictions::target_pixels_per_frame()
|
|
const {
|
|
return target_pixels_per_frame_;
|
|
}
|
|
|
|
const absl::optional<double>& VideoSourceRestrictions::max_frame_rate() const {
|
|
return max_frame_rate_;
|
|
}
|
|
|
|
void VideoSourceRestrictions::set_max_pixels_per_frame(
|
|
absl::optional<size_t> max_pixels_per_frame) {
|
|
max_pixels_per_frame_ = std::move(max_pixels_per_frame);
|
|
}
|
|
|
|
void VideoSourceRestrictions::set_target_pixels_per_frame(
|
|
absl::optional<size_t> target_pixels_per_frame) {
|
|
target_pixels_per_frame_ = std::move(target_pixels_per_frame);
|
|
}
|
|
|
|
void VideoSourceRestrictions::set_max_frame_rate(
|
|
absl::optional<double> max_frame_rate) {
|
|
max_frame_rate_ = std::move(max_frame_rate);
|
|
}
|
|
|
|
bool DidIncreaseResolution(VideoSourceRestrictions restrictions_before,
|
|
VideoSourceRestrictions restrictions_after) {
|
|
if (!restrictions_before.max_pixels_per_frame().has_value())
|
|
return false;
|
|
if (!restrictions_after.max_pixels_per_frame().has_value())
|
|
return true;
|
|
return restrictions_after.max_pixels_per_frame().value() >
|
|
restrictions_before.max_pixels_per_frame().value();
|
|
}
|
|
|
|
bool DidDecreaseFrameRate(VideoSourceRestrictions restrictions_before,
|
|
VideoSourceRestrictions restrictions_after) {
|
|
if (!restrictions_after.max_frame_rate().has_value())
|
|
return false;
|
|
if (!restrictions_before.max_frame_rate().has_value())
|
|
return true;
|
|
return restrictions_after.max_frame_rate().value() <
|
|
restrictions_before.max_frame_rate().value();
|
|
}
|
|
|
|
} // namespace webrtc
|