diff --git a/call/adaptation/BUILD.gn b/call/adaptation/BUILD.gn index 4a41e60e0c..24dee6a0f0 100644 --- a/call/adaptation/BUILD.gn +++ b/call/adaptation/BUILD.gn @@ -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", ] diff --git a/video/adaptation/video_stream_adapter.cc b/call/adaptation/video_stream_adapter.cc similarity index 99% rename from video/adaptation/video_stream_adapter.cc rename to call/adaptation/video_stream_adapter.cc index 28fdcfe279..b720de3074 100644 --- a/video/adaptation/video_stream_adapter.cc +++ b/call/adaptation/video_stream_adapter.cc @@ -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 #include diff --git a/video/adaptation/video_stream_adapter.h b/call/adaptation/video_stream_adapter.h similarity index 98% rename from video/adaptation/video_stream_adapter.h rename to call/adaptation/video_stream_adapter.h index a73394d085..80ea869e17 100644 --- a/video/adaptation/video_stream_adapter.h +++ b/call/adaptation/video_stream_adapter.h @@ -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 @@ -191,4 +191,4 @@ class VideoStreamAdapter { } // namespace webrtc -#endif // VIDEO_ADAPTATION_VIDEO_STREAM_ADAPTER_H_ +#endif // CALL_ADAPTATION_VIDEO_STREAM_ADAPTER_H_ diff --git a/video/adaptation/video_stream_adapter_unittest.cc b/call/adaptation/video_stream_adapter_unittest.cc similarity index 99% rename from video/adaptation/video_stream_adapter_unittest.cc rename to call/adaptation/video_stream_adapter_unittest.cc index a0f1603693..6bf2a35a80 100644 --- a/video/adaptation/video_stream_adapter_unittest.cc +++ b/call/adaptation/video_stream_adapter_unittest.cc @@ -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 #include diff --git a/video/adaptation/BUILD.gn b/video/adaptation/BUILD.gn index 2e3a8ce25b..e9fbbdb80a 100644 --- a/video/adaptation/BUILD.gn +++ b/video/adaptation/BUILD.gn @@ -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", diff --git a/video/adaptation/resource_adaptation_processor.h b/video/adaptation/resource_adaptation_processor.h index c276ad7810..b91f8a0673 100644 --- a/video/adaptation/resource_adaptation_processor.h +++ b/video/adaptation/resource_adaptation_processor.h @@ -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 {