[Adaptation] Move VideoStreamAdapter to call/adaptation/.
This CL is part of the Call-Level Adaptation Processing design doc: https://docs.google.com/document/d/1ZyC26yOCknrrcYa839ZWLxD6o6Gig5A3lVTh4E41074/edit?usp=sharing This is a pure move CL. In the future, the Processor will live in call/adaptation/. This prevents circular dependencies. Bug: webrtc:11172 Change-Id: Ib72503cc20e27ab6425538e3d55930c65e0b4a90 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/172931 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@{#31100}
This commit is contained in:
parent
b613e3ab6b
commit
1d76654e21
@ -18,6 +18,8 @@ rtc_library("resource_adaptation") {
|
||||
"resource_adaptation_processor_interface.h",
|
||||
"video_source_restrictions.cc",
|
||||
"video_source_restrictions.h",
|
||||
"video_stream_adapter.cc",
|
||||
"video_stream_adapter.h",
|
||||
"video_stream_input_state.cc",
|
||||
"video_stream_input_state.h",
|
||||
"video_stream_input_state_provider.cc",
|
||||
@ -25,11 +27,14 @@ rtc_library("resource_adaptation") {
|
||||
]
|
||||
deps = [
|
||||
"../../api:rtp_parameters",
|
||||
"../../api/video:video_adaptation",
|
||||
"../../api/video:video_frame",
|
||||
"../../api/video:video_stream_encoder",
|
||||
"../../api/video_codecs:video_codecs_api",
|
||||
"../../modules/video_coding:video_coding_utility",
|
||||
"../../rtc_base:checks",
|
||||
"../../rtc_base:rtc_base_approved",
|
||||
"../../rtc_base/experiments:balanced_degradation_settings",
|
||||
"//third_party/abseil-cpp/absl/algorithm:container",
|
||||
"//third_party/abseil-cpp/absl/types:optional",
|
||||
]
|
||||
@ -39,12 +44,19 @@ if (rtc_include_tests) {
|
||||
rtc_library("resource_adaptation_tests") {
|
||||
testonly = true
|
||||
|
||||
sources = [ "resource_unittest.cc" ]
|
||||
sources = [
|
||||
"resource_unittest.cc",
|
||||
"video_stream_adapter_unittest.cc",
|
||||
]
|
||||
deps = [
|
||||
":resource_adaptation",
|
||||
":resource_adaptation_test_utilities",
|
||||
"../../api/video:video_adaptation",
|
||||
"../../api/video_codecs:video_codecs_api",
|
||||
"../../rtc_base:checks",
|
||||
"../../rtc_base:rtc_base_approved",
|
||||
"../../test:field_trial",
|
||||
"../../test:rtc_expect_death",
|
||||
"../../test:test_support",
|
||||
"//third_party/abseil-cpp/absl/types:optional",
|
||||
]
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
|
||||
#include "video/adaptation/video_stream_adapter.h"
|
||||
#include "call/adaptation/video_stream_adapter.h"
|
||||
|
||||
#include <algorithm>
|
||||
#include <limits>
|
||||
@ -8,8 +8,8 @@
|
||||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
|
||||
#ifndef VIDEO_ADAPTATION_VIDEO_STREAM_ADAPTER_H_
|
||||
#define VIDEO_ADAPTATION_VIDEO_STREAM_ADAPTER_H_
|
||||
#ifndef CALL_ADAPTATION_VIDEO_STREAM_ADAPTER_H_
|
||||
#define CALL_ADAPTATION_VIDEO_STREAM_ADAPTER_H_
|
||||
|
||||
#include <memory>
|
||||
|
||||
@ -191,4 +191,4 @@ class VideoStreamAdapter {
|
||||
|
||||
} // namespace webrtc
|
||||
|
||||
#endif // VIDEO_ADAPTATION_VIDEO_STREAM_ADAPTER_H_
|
||||
#endif // CALL_ADAPTATION_VIDEO_STREAM_ADAPTER_H_
|
||||
@ -8,7 +8,7 @@
|
||||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
|
||||
#include "video/adaptation/video_stream_adapter.h"
|
||||
#include "call/adaptation/video_stream_adapter.h"
|
||||
|
||||
#include <string>
|
||||
#include <utility>
|
||||
@ -18,8 +18,6 @@ rtc_library("video_adaptation") {
|
||||
"quality_scaler_resource.h",
|
||||
"resource_adaptation_processor.cc",
|
||||
"resource_adaptation_processor.h",
|
||||
"video_stream_adapter.cc",
|
||||
"video_stream_adapter.h",
|
||||
]
|
||||
|
||||
deps = [
|
||||
@ -60,7 +58,6 @@ if (rtc_include_tests) {
|
||||
sources = [
|
||||
"overuse_frame_detector_unittest.cc",
|
||||
"resource_adaptation_processor_unittest.cc",
|
||||
"video_stream_adapter_unittest.cc",
|
||||
]
|
||||
deps = [
|
||||
":video_adaptation",
|
||||
|
||||
@ -30,6 +30,7 @@
|
||||
#include "api/video_codecs/video_encoder_config.h"
|
||||
#include "call/adaptation/resource.h"
|
||||
#include "call/adaptation/resource_adaptation_processor_interface.h"
|
||||
#include "call/adaptation/video_stream_adapter.h"
|
||||
#include "call/adaptation/video_stream_input_state_provider.h"
|
||||
#include "rtc_base/experiments/quality_rampup_experiment.h"
|
||||
#include "rtc_base/experiments/quality_scaler_settings.h"
|
||||
@ -38,7 +39,6 @@
|
||||
#include "video/adaptation/encode_usage_resource.h"
|
||||
#include "video/adaptation/overuse_frame_detector.h"
|
||||
#include "video/adaptation/quality_scaler_resource.h"
|
||||
#include "video/adaptation/video_stream_adapter.h"
|
||||
|
||||
namespace webrtc {
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user