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}
51 lines
1.3 KiB
C++
51 lines
1.3 KiB
C++
/*
|
|
* Copyright (c) 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/adaptation/adaptation_counters.h"
|
|
|
|
#include "test/gtest.h"
|
|
|
|
namespace webrtc {
|
|
|
|
TEST(AdaptationCountersTest, Addition) {
|
|
AdaptationCounters a{0, 0};
|
|
AdaptationCounters b{1, 2};
|
|
AdaptationCounters total = a + b;
|
|
EXPECT_EQ(1, total.resolution_adaptations);
|
|
EXPECT_EQ(2, total.fps_adaptations);
|
|
}
|
|
|
|
TEST(AdaptationCountersTest, Subtraction) {
|
|
AdaptationCounters a{0, 1};
|
|
AdaptationCounters b{2, 1};
|
|
AdaptationCounters diff = a - b;
|
|
EXPECT_EQ(-2, diff.resolution_adaptations);
|
|
EXPECT_EQ(0, diff.fps_adaptations);
|
|
}
|
|
|
|
TEST(AdaptationCountersTest, Equality) {
|
|
AdaptationCounters a{1, 2};
|
|
AdaptationCounters b{2, 1};
|
|
EXPECT_EQ(a, a);
|
|
EXPECT_NE(a, b);
|
|
}
|
|
|
|
TEST(AdaptationCountersTest, SelfAdditionSubtraction) {
|
|
AdaptationCounters a{1, 0};
|
|
AdaptationCounters b{0, 1};
|
|
|
|
EXPECT_EQ(a, a + b - b);
|
|
EXPECT_EQ(a, b + a - b);
|
|
EXPECT_EQ(a, a - b + b);
|
|
EXPECT_EQ(a, b - b + a);
|
|
}
|
|
|
|
} // namespace webrtc
|