Move tests of legacy video code to its own target.
To ensure that tests of non-legacy code doesn't depend on legacy classes and headers. Bug: None Change-Id: Ief63fd77e412892b6f0923530d2317bde4937585 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/242364 Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Reviewed-by: Erik Språng <sprang@webrtc.org> Commit-Queue: Niels Moller <nisse@webrtc.org> Cr-Commit-Position: refs/heads/main@{#35569}
This commit is contained in:
committed by
WebRTC LUCI CQ
parent
34aba3cefd
commit
679f1cb90c
1
BUILD.gn
1
BUILD.gn
@ -625,6 +625,7 @@ if (rtc_include_tests && !build_with_chromium) {
|
|||||||
"test:test_common",
|
"test:test_common",
|
||||||
"test:test_main",
|
"test:test_main",
|
||||||
"test:video_test_common",
|
"test:video_test_common",
|
||||||
|
"video:video_legacy_tests",
|
||||||
"video:video_tests",
|
"video:video_tests",
|
||||||
"video/adaptation:video_adaptation_tests",
|
"video/adaptation:video_adaptation_tests",
|
||||||
]
|
]
|
||||||
|
|||||||
@ -618,7 +618,6 @@ if (rtc_include_tests) {
|
|||||||
"alignment_adjuster_unittest.cc",
|
"alignment_adjuster_unittest.cc",
|
||||||
"buffered_frame_decryptor_unittest.cc",
|
"buffered_frame_decryptor_unittest.cc",
|
||||||
"call_stats2_unittest.cc",
|
"call_stats2_unittest.cc",
|
||||||
"call_stats_unittest.cc",
|
|
||||||
"cpu_scaling_tests.cc",
|
"cpu_scaling_tests.cc",
|
||||||
"encoder_bitrate_adjuster_unittest.cc",
|
"encoder_bitrate_adjuster_unittest.cc",
|
||||||
"encoder_overshoot_detector_unittest.cc",
|
"encoder_overshoot_detector_unittest.cc",
|
||||||
@ -649,11 +648,9 @@ if (rtc_include_tests) {
|
|||||||
"quality_scaling_tests.cc",
|
"quality_scaling_tests.cc",
|
||||||
"quality_threshold_unittest.cc",
|
"quality_threshold_unittest.cc",
|
||||||
"receive_statistics_proxy2_unittest.cc",
|
"receive_statistics_proxy2_unittest.cc",
|
||||||
"receive_statistics_proxy_unittest.cc",
|
|
||||||
"report_block_stats_unittest.cc",
|
"report_block_stats_unittest.cc",
|
||||||
"rtp_video_stream_receiver2_unittest.cc",
|
"rtp_video_stream_receiver2_unittest.cc",
|
||||||
"rtp_video_stream_receiver_frame_transformer_delegate_unittest.cc",
|
"rtp_video_stream_receiver_frame_transformer_delegate_unittest.cc",
|
||||||
"rtp_video_stream_receiver_unittest.cc",
|
|
||||||
"send_delay_stats_unittest.cc",
|
"send_delay_stats_unittest.cc",
|
||||||
"send_statistics_proxy_unittest.cc",
|
"send_statistics_proxy_unittest.cc",
|
||||||
"stats_counter_unittest.cc",
|
"stats_counter_unittest.cc",
|
||||||
@ -668,7 +665,6 @@ if (rtc_include_tests) {
|
|||||||
deps = [
|
deps = [
|
||||||
":frame_cadence_adapter",
|
":frame_cadence_adapter",
|
||||||
":video",
|
":video",
|
||||||
":video_legacy",
|
|
||||||
":video_mocks",
|
":video_mocks",
|
||||||
":video_stream_decoder_impl",
|
":video_stream_decoder_impl",
|
||||||
":video_stream_encoder_impl",
|
":video_stream_encoder_impl",
|
||||||
@ -787,4 +783,37 @@ if (rtc_include_tests) {
|
|||||||
deps += [ "../media:rtc_media_base" ]
|
deps += [ "../media:rtc_media_base" ]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
rtc_library("video_legacy_tests") {
|
||||||
|
testonly = true
|
||||||
|
sources = [
|
||||||
|
"call_stats_unittest.cc",
|
||||||
|
"receive_statistics_proxy_unittest.cc",
|
||||||
|
"rtp_video_stream_receiver_unittest.cc",
|
||||||
|
]
|
||||||
|
deps = [
|
||||||
|
":video_legacy",
|
||||||
|
"../api:scoped_refptr",
|
||||||
|
"../api/video:video_frame",
|
||||||
|
"../api/video:video_frame_type",
|
||||||
|
"../api/video:video_rtp_headers",
|
||||||
|
"../call:mock_rtp_interfaces",
|
||||||
|
"../common_video",
|
||||||
|
"../media:rtc_media_base",
|
||||||
|
"../modules/rtp_rtcp",
|
||||||
|
"../modules/rtp_rtcp:rtp_rtcp_format",
|
||||||
|
"../modules/utility",
|
||||||
|
"../modules/video_coding",
|
||||||
|
"../modules/video_coding:video_codec_interface",
|
||||||
|
"../rtc_base:rtc_base_approved",
|
||||||
|
"../rtc_base/task_utils:to_queued_task",
|
||||||
|
"../system_wrappers",
|
||||||
|
"../system_wrappers:field_trial",
|
||||||
|
"../system_wrappers:metrics",
|
||||||
|
"../test:field_trial",
|
||||||
|
"../test:mock_frame_transformer",
|
||||||
|
"../test:mock_transport",
|
||||||
|
"../test:test_support",
|
||||||
|
]
|
||||||
|
absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -60,6 +60,7 @@ class CallStats2Test : public ::testing::Test {
|
|||||||
}
|
}
|
||||||
|
|
||||||
test::RunLoop loop_;
|
test::RunLoop loop_;
|
||||||
|
// TODO(nisse): Don't use process thread.
|
||||||
std::unique_ptr<ProcessThread> process_thread_{
|
std::unique_ptr<ProcessThread> process_thread_{
|
||||||
ProcessThread::Create("CallStats")};
|
ProcessThread::Create("CallStats")};
|
||||||
// Note: Since rtc::Thread doesn't support injecting a Clock, we're going
|
// Note: Since rtc::Thread doesn't support injecting a Clock, we're going
|
||||||
|
|||||||
@ -27,7 +27,6 @@
|
|||||||
#include "modules/rtp_rtcp/source/rtp_header_extensions.h"
|
#include "modules/rtp_rtcp/source/rtp_header_extensions.h"
|
||||||
#include "modules/rtp_rtcp/source/rtp_packet_received.h"
|
#include "modules/rtp_rtcp/source/rtp_packet_received.h"
|
||||||
#include "modules/rtp_rtcp/source/rtp_packet_to_send.h"
|
#include "modules/rtp_rtcp/source/rtp_packet_to_send.h"
|
||||||
#include "modules/utility/include/process_thread.h"
|
|
||||||
#include "modules/video_coding/frame_object.h"
|
#include "modules/video_coding/frame_object.h"
|
||||||
#include "modules/video_coding/include/video_coding_defines.h"
|
#include "modules/video_coding/include/video_coding_defines.h"
|
||||||
#include "modules/video_coding/rtp_frame_reference_finder.h"
|
#include "modules/video_coding/rtp_frame_reference_finder.h"
|
||||||
|
|||||||
@ -19,7 +19,6 @@
|
|||||||
#include "api/call/transport.h"
|
#include "api/call/transport.h"
|
||||||
#include "call/video_receive_stream.h"
|
#include "call/video_receive_stream.h"
|
||||||
#include "modules/rtp_rtcp/source/rtp_descriptor_authentication.h"
|
#include "modules/rtp_rtcp/source/rtp_descriptor_authentication.h"
|
||||||
#include "modules/utility/include/process_thread.h"
|
|
||||||
#include "rtc_base/event.h"
|
#include "rtc_base/event.h"
|
||||||
#include "rtc_base/ref_counted_object.h"
|
#include "rtc_base/ref_counted_object.h"
|
||||||
#include "rtc_base/task_utils/to_queued_task.h"
|
#include "rtc_base/task_utils/to_queued_task.h"
|
||||||
|
|||||||
@ -28,7 +28,6 @@
|
|||||||
#include "media/engine/fake_webrtc_call.h"
|
#include "media/engine/fake_webrtc_call.h"
|
||||||
#include "modules/pacing/packet_router.h"
|
#include "modules/pacing/packet_router.h"
|
||||||
#include "modules/rtp_rtcp/source/rtp_packet_to_send.h"
|
#include "modules/rtp_rtcp/source/rtp_packet_to_send.h"
|
||||||
#include "modules/utility/include/process_thread.h"
|
|
||||||
#include "modules/video_coding/encoded_frame.h"
|
#include "modules/video_coding/encoded_frame.h"
|
||||||
#include "rtc_base/event.h"
|
#include "rtc_base/event.h"
|
||||||
#include "system_wrappers/include/clock.h"
|
#include "system_wrappers/include/clock.h"
|
||||||
|
|||||||
Reference in New Issue
Block a user