mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-29 05:16:33 +01:00
02956feb2d
Adapting up or down is currently a "Maybe Adapt" method. In the future we will want to be able to decide which stream to adapt, and as such we need to be able to tell if a stream is able to do so. This takes us one step in that direction, by refactoring OveruseFrameDetectorResourceAdaptationModule::VideoSourceRestrictor's methods to follow a simple pattern: - What is the next step? GetHigherFrameRateThan, GetLowerFrameRateThan, GetHigherResolutionThan, GetLowerResolutionThan - Can we adapt? CanIncreaseFrameRate, CanDecreaseFrameRate, CanIncreaseResolution, CanDecreaseResolution - Do adapt! IncreaseFrameRateTo, DecreaseFrameRateTo, IncreaseResolutionTo, DecreaseResolutionTo Hopefully this makes the code easier to follow. This CL changes the "Request Higher/Lower" methods to take the target as input instead of implicitly calculating the target from the current input resolution or frame rate. Bug: webrtc:11222 Change-Id: If625834e921a24a872145105f5d553fb8f9f1795 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/168966 Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org> Reviewed-by: Evan Shrubsole <eshr@google.com> Commit-Queue: Henrik Boström <hbos@webrtc.org> Cr-Commit-Position: refs/heads/master@{#30600}
70 lines
2.8 KiB
C++
70 lines
2.8 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.
|
|
*/
|
|
|
|
#ifndef CALL_ADAPTATION_VIDEO_SOURCE_RESTRICTIONS_H_
|
|
#define CALL_ADAPTATION_VIDEO_SOURCE_RESTRICTIONS_H_
|
|
|
|
#include <utility>
|
|
|
|
#include "absl/types/optional.h"
|
|
|
|
namespace webrtc {
|
|
|
|
// Describes optional restrictions to the resolution and frame rate of a video
|
|
// source.
|
|
class VideoSourceRestrictions {
|
|
public:
|
|
// Constructs without any restrictions.
|
|
VideoSourceRestrictions();
|
|
// All values must be positive or nullopt.
|
|
// TODO(hbos): Support expressing "disable this stream"?
|
|
VideoSourceRestrictions(absl::optional<size_t> max_pixels_per_frame,
|
|
absl::optional<size_t> target_pixels_per_frame,
|
|
absl::optional<double> max_frame_rate);
|
|
|
|
bool operator==(const VideoSourceRestrictions& rhs) const {
|
|
return max_pixels_per_frame_ == rhs.max_pixels_per_frame_ &&
|
|
target_pixels_per_frame_ == rhs.target_pixels_per_frame_ &&
|
|
max_frame_rate_ == rhs.max_frame_rate_;
|
|
}
|
|
bool operator!=(const VideoSourceRestrictions& rhs) const {
|
|
return !(*this == rhs);
|
|
}
|
|
|
|
// The source must produce a resolution less than or equal to
|
|
// max_pixels_per_frame().
|
|
const absl::optional<size_t>& max_pixels_per_frame() const;
|
|
// The source should produce a resolution as close to the
|
|
// target_pixels_per_frame() as possible, provided this does not exceed
|
|
// max_pixels_per_frame().
|
|
// The actual pixel count selected depends on the capabilities of the source.
|
|
// TODO(hbos): Clarify how "target" is used. One possible implementation: open
|
|
// the camera in the smallest resolution that is greater than or equal to the
|
|
// target and scale it down to the target if it is greater. Is this an
|
|
// accurate description of what this does today, or do we do something else?
|
|
const absl::optional<size_t>& target_pixels_per_frame() const;
|
|
const absl::optional<double>& max_frame_rate() const;
|
|
|
|
void set_max_pixels_per_frame(absl::optional<size_t> max_pixels_per_frame);
|
|
void set_target_pixels_per_frame(
|
|
absl::optional<size_t> target_pixels_per_frame);
|
|
void set_max_frame_rate(absl::optional<double> max_frame_rate);
|
|
|
|
private:
|
|
// These map to rtc::VideoSinkWants's |max_pixel_count| and
|
|
// |target_pixel_count|.
|
|
absl::optional<size_t> max_pixels_per_frame_;
|
|
absl::optional<size_t> target_pixels_per_frame_;
|
|
absl::optional<double> max_frame_rate_;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // CALL_ADAPTATION_VIDEO_SOURCE_RESTRICTIONS_H_
|