Extract video writing into separate target

Bug: None
Change-Id: I3af192606eb623e21a4d648fb69bb62c14ab8b0d
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/355560
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Artem Titov <titovartem@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42541}
This commit is contained in:
Artem Titov 2024-06-26 13:23:44 +02:00 committed by WebRTC LUCI CQ
parent 0592d2b3c4
commit eb3da2b1ec
9 changed files with 36 additions and 25 deletions

View File

@ -39,7 +39,7 @@ rtc_source_set("media_configuration") {
"../../../rtc_base:stringutils", "../../../rtc_base:stringutils",
"../../../rtc_base:threading", "../../../rtc_base:threading",
"../../../test:fileutils", "../../../test:fileutils",
"../../../test:video_test_support", "../../../test:video_frame_writer",
"../../../test/pc/e2e/analyzer/video:video_dumping", "../../../test/pc/e2e/analyzer/video:video_dumping",
"../../audio:audio_mixer_api", "../../audio:audio_mixer_api",
"../../audio:audio_processing", "../../audio:audio_processing",

View File

@ -25,7 +25,6 @@ rtc_library("function_video_factory") {
rtc_library("video_frame_writer") { rtc_library("video_frame_writer") {
visibility = [ "*" ] visibility = [ "*" ]
testonly = true
sources = [ "video_frame_writer.h" ] sources = [ "video_frame_writer.h" ]
deps = [ "../../video:video_frame" ] deps = [ "../../video:video_frame" ]

View File

@ -381,6 +381,7 @@ rtc_library("libaom_av1_encoder_factory_test") {
"../../rtc_base:logging", "../../rtc_base:logging",
"../../test:fileutils", "../../test:fileutils",
"../../test:test_support", "../../test:test_support",
"../../test:video_frame_writer",
"../../test:video_test_support", "../../test:video_test_support",
"//third_party/abseil-cpp/absl/types:variant", "//third_party/abseil-cpp/absl/types:variant",
] ]

View File

@ -67,7 +67,6 @@ if (rtc_include_tests) {
"../../rtc_base/third_party/base64", "../../rtc_base/third_party/base64",
"../../system_wrappers", "../../system_wrappers",
"../../test:test_support", "../../test:test_support",
"../../test:video_test_support",
] ]
sources += [ sources += [
"screen_capturer_integration_test.cc", "screen_capturer_integration_test.cc",

View File

@ -838,6 +838,7 @@ if (rtc_include_tests) {
"../../rtc_base/synchronization:mutex", "../../rtc_base/synchronization:mutex",
"../../rtc_base/system:no_unique_address", "../../rtc_base/system:no_unique_address",
"../../test:test_support", "../../test:test_support",
"../../test:video_frame_writer",
"../../test:video_test_common", "../../test:video_test_common",
"../../test:video_test_support", "../../test:video_test_support",
"../rtp_rtcp:rtp_rtcp_format", "../rtp_rtcp:rtp_rtcp_format",
@ -925,6 +926,7 @@ if (rtc_include_tests) {
"../../system_wrappers", "../../system_wrappers",
"../../test:fileutils", "../../test:fileutils",
"../../test:test_support", "../../test:test_support",
"../../test:video_frame_writer",
"../../test:video_test_common", "../../test:video_test_common",
"../../test:video_test_support", "../../test:video_test_support",
"../../video/config:encoder_config", "../../video/config:encoder_config",

View File

@ -261,9 +261,9 @@ if (!is_component_build) {
"../test:test_renderer", "../test:test_renderer",
"../test:test_support", "../test:test_support",
"../test:test_video_capturer", "../test:test_video_capturer",
"../test:video_frame_writer",
"../test:video_test_common", "../test:video_test_common",
"../test:video_test_constants", "../test:video_test_constants",
"../test:video_test_support",
"../test/time_controller:time_controller", "../test/time_controller:time_controller",
"//third_party/abseil-cpp/absl/flags:flag", "//third_party/abseil-cpp/absl/flags:flag",
"//third_party/abseil-cpp/absl/flags:parse", "//third_party/abseil-cpp/absl/flags:parse",

View File

@ -484,14 +484,12 @@ rtc_source_set("test_support") {
rtc_library("fixed_fps_video_frame_writer_adapter") { rtc_library("fixed_fps_video_frame_writer_adapter") {
visibility = [ "*" ] visibility = [ "*" ]
testonly = true
sources = [ sources = [
"testsupport/fixed_fps_video_frame_writer_adapter.cc", "testsupport/fixed_fps_video_frame_writer_adapter.cc",
"testsupport/fixed_fps_video_frame_writer_adapter.h", "testsupport/fixed_fps_video_frame_writer_adapter.h",
] ]
deps = [ deps = [
":video_frame_writer", ":video_frame_writer",
":video_test_support",
"../api/test/video:video_frame_writer", "../api/test/video:video_frame_writer",
"../api/units:time_delta", "../api/units:time_delta",
"../api/video:video_frame", "../api/video:video_frame",
@ -502,9 +500,30 @@ rtc_library("fixed_fps_video_frame_writer_adapter") {
} }
rtc_library("video_frame_writer") { rtc_library("video_frame_writer") {
sources = [] sources = [
"testsupport/frame_writer.h",
"testsupport/video_frame_writer.cc",
"testsupport/video_frame_writer.h",
"testsupport/y4m_frame_writer.cc",
"testsupport/yuv_frame_writer.cc",
]
deps = [] deps = [
"../api:scoped_refptr",
"../api/test/video:video_frame_writer",
"../api/video:video_frame",
"../common_video",
"../rtc_base:buffer",
"../rtc_base:checks",
"../rtc_base:logging",
]
if (!is_ios) {
deps += [ "//third_party:jpeg" ]
sources += [ "testsupport/jpeg_frame_writer.cc" ]
} else {
sources += [ "testsupport/jpeg_frame_writer_ios.cc" ]
}
} }
rtc_library("video_test_support") { rtc_library("video_test_support") {
@ -512,14 +531,9 @@ rtc_library("video_test_support") {
sources = [ sources = [
"testsupport/frame_reader.h", "testsupport/frame_reader.h",
"testsupport/frame_writer.h",
"testsupport/mock/mock_frame_reader.h", "testsupport/mock/mock_frame_reader.h",
"testsupport/video_frame_writer.cc",
"testsupport/video_frame_writer.h",
"testsupport/y4m_frame_reader.cc", "testsupport/y4m_frame_reader.cc",
"testsupport/y4m_frame_writer.cc",
"testsupport/yuv_frame_reader.cc", "testsupport/yuv_frame_reader.cc",
"testsupport/yuv_frame_writer.cc",
] ]
deps = [ deps = [
@ -549,13 +563,6 @@ rtc_library("video_test_support") {
"../rtc_base/system:file_wrapper", "../rtc_base/system:file_wrapper",
"//third_party/abseil-cpp/absl/types:optional", "//third_party/abseil-cpp/absl/types:optional",
] ]
if (!is_ios) {
deps += [ "//third_party:jpeg" ]
sources += [ "testsupport/jpeg_frame_writer.cc" ]
} else {
sources += [ "testsupport/jpeg_frame_writer_ios.cc" ]
}
} }
if (rtc_include_tests) { if (rtc_include_tests) {
@ -675,7 +682,7 @@ if (rtc_include_tests) {
deps = [ deps = [
":fixed_fps_video_frame_writer_adapter", ":fixed_fps_video_frame_writer_adapter",
":test_support", ":test_support",
":video_test_support", ":video_frame_writer",
"../api/units:time_delta", "../api/units:time_delta",
"../api/units:timestamp", "../api/units:timestamp",
"../api/video:video_frame", "../api/video:video_frame",
@ -705,6 +712,7 @@ if (rtc_include_tests) {
":test_support", ":test_support",
":test_support_test_artifacts", ":test_support_test_artifacts",
":video_codec_tester", ":video_codec_tester",
":video_frame_writer",
":video_test_common", ":video_test_common",
":video_test_support", ":video_test_support",
":y4m_frame_generator", ":y4m_frame_generator",
@ -1346,6 +1354,8 @@ rtc_library("video_codec_tester") {
] ]
deps = [ deps = [
":scoped_key_value_config", ":scoped_key_value_config",
":video_frame_writer",
":video_test_support",
"../api:array_view", "../api:array_view",
"../api:create_frame_generator", "../api:create_frame_generator",
"../api:frame_generator_api", "../api:frame_generator_api",
@ -1381,7 +1391,6 @@ rtc_library("video_codec_tester") {
"../rtc_base/synchronization:mutex", "../rtc_base/synchronization:mutex",
"../system_wrappers", "../system_wrappers",
"../test:fileutils", "../test:fileutils",
"../test:video_test_support",
"../video/config:streams_config", "../video/config:streams_config",
"//third_party/abseil-cpp/absl/strings", "//third_party/abseil-cpp/absl/strings",
"//third_party/abseil-cpp/absl/types:optional", "//third_party/abseil-cpp/absl/types:optional",

View File

@ -63,7 +63,7 @@ rtc_library("video_dumping") {
"video_dumping.h", "video_dumping.h",
] ]
deps = [ deps = [
"../../../..:video_test_support", "../../../..:video_frame_writer",
"../../../../../api/test/video:video_frame_writer", "../../../../../api/test/video:video_frame_writer",
"../../../../../api/video:video_frame", "../../../../../api/video:video_frame",
"../../../../../rtc_base:logging", "../../../../../rtc_base:logging",
@ -383,8 +383,8 @@ rtc_library("video_quality_analyzer_injection_helper") {
"../../../..:fixed_fps_video_frame_writer_adapter", "../../../..:fixed_fps_video_frame_writer_adapter",
"../../../..:test_renderer", "../../../..:test_renderer",
"../../../..:test_video_capturer", "../../../..:test_video_capturer",
"../../../..:video_frame_writer",
"../../../..:video_test_common", "../../../..:video_test_common",
"../../../..:video_test_support",
"../../../../../api:array_view", "../../../../../api:array_view",
"../../../../../api:stats_observer_interface", "../../../../../api:stats_observer_interface",
"../../../../../api:video_quality_analyzer_api", "../../../../../api:video_quality_analyzer_api",
@ -543,6 +543,7 @@ if (rtc_include_tests) {
":video_dumping", ":video_dumping",
"../../../..:fileutils", "../../../..:fileutils",
"../../../..:test_support", "../../../..:test_support",
"../../../..:video_frame_writer",
"../../../..:video_test_support", "../../../..:video_test_support",
"../../../../../api:scoped_refptr", "../../../../../api:scoped_refptr",
"../../../../../api/video:video_frame", "../../../../../api/video:video_frame",

View File

@ -555,9 +555,9 @@ if (rtc_include_tests) {
"../test:test_renderer", "../test:test_renderer",
"../test:test_support", "../test:test_support",
"../test:test_support_test_artifacts", "../test:test_support_test_artifacts",
"../test:video_frame_writer",
"../test:video_test_common", "../test:video_test_common",
"../test:video_test_constants", "../test:video_test_constants",
"../test:video_test_support",
"config:streams_config", "config:streams_config",
"//third_party/abseil-cpp/absl/algorithm:container", "//third_party/abseil-cpp/absl/algorithm:container",
"//third_party/abseil-cpp/absl/flags:flag", "//third_party/abseil-cpp/absl/flags:flag",