efbec9a304
This CL simply moves the VideoSourceRestrictor from being an inner class of OveruseFrameDetectorResourceAdaptationModule to a new class, VideoStreamAdapter. In follow-up CLs, the responsibility of determining what the next step for adapting up or down should also be moved to the VideoStreamAdapter. The end-goal is that the VideoStreamAdapter takes care of "can adapt?" and "do adapt!" type of logic so that a multi-stream aware adaptation module can decide which stream (adapter) to adapt, and the adapter can take care of the nitty gritty details of doing so. In this CL the "can?"/"do!" part is realized but not the logic for determining what the next step up or down is, and the class interface needs improvement. This CL also sets up the video/adaptation/ subdirectory and moves the AdaptationCounters class here. Other adaptation-related classes (e.g. the module and its resources) should move into this directory as well in the future. Bug: webrtc:11393 Change-Id: I2c12c1281eca854c62791abb65f0aca47a119726 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/169542 Reviewed-by: Evan Shrubsole <eshr@google.com> Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org> Reviewed-by: Henrik Andreassson <henrika@webrtc.org> Commit-Queue: Henrik Boström <hbos@webrtc.org> Cr-Commit-Position: refs/heads/master@{#30705}
39 lines
1.3 KiB
C++
39 lines
1.3 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 VIDEO_ADAPTATION_ADAPTATION_COUNTERS_H_
|
|
#define VIDEO_ADAPTATION_ADAPTATION_COUNTERS_H_
|
|
|
|
namespace webrtc {
|
|
|
|
// Counts the number of adaptations have resulted due to resource overuse.
|
|
// Today we can adapt resolution and fps.
|
|
struct AdaptationCounters {
|
|
AdaptationCounters() : resolution_adaptations(0), fps_adaptations(0) {}
|
|
AdaptationCounters(int resolution_adaptations, int fps_adaptations)
|
|
: resolution_adaptations(resolution_adaptations),
|
|
fps_adaptations(fps_adaptations) {}
|
|
|
|
int Total() const { return fps_adaptations + resolution_adaptations; }
|
|
|
|
bool operator==(const AdaptationCounters& rhs) const;
|
|
bool operator!=(const AdaptationCounters& rhs) const;
|
|
|
|
AdaptationCounters operator+(const AdaptationCounters& other) const;
|
|
AdaptationCounters operator-(const AdaptationCounters& other) const;
|
|
|
|
int resolution_adaptations;
|
|
int fps_adaptations;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // VIDEO_ADAPTATION_ADAPTATION_COUNTERS_H_
|