admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move deprecated code to their own build targets.

Browse Source 
Moves the deprecated version of RtpRtcp module, and related classes
in video/.

Bug: webrtc:11581
Change-Id: Icc4cedb844fcd7c7372e8a907e5252f5b4fd955e
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/196904
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Tommi <tommi@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#33025}
This commit is contained in:
Niels Möller 2021-01-14 12:00:57 +01:00 committed by Commit Bot
parent 844c759766
commit 3e9cb2cbf2
5 changed files with 99 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
call/BUILD.gn
View File

@ -427,6 +427,7 @@ if (rtc_include_tests) {
"../api/video:video_frame", "../api/video:video_frame",
"../api/video:video_rtp_headers", "../api/video:video_rtp_headers",
"../audio", "../audio",
"../modules:module_api",
"../modules/audio_device:mock_audio_device", "../modules/audio_device:mock_audio_device",
"../modules/audio_mixer", "../modules/audio_mixer",
"../modules/audio_mixer:audio_mixer_impl", "../modules/audio_mixer:audio_mixer_impl",

1
call/call_unittest.cc
View File

@ -30,6 +30,7 @@
#include "call/audio_state.h" #include "call/audio_state.h"
#include "modules/audio_device/include/mock_audio_device.h" #include "modules/audio_device/include/mock_audio_device.h"
#include "modules/audio_processing/include/mock_audio_processing.h" #include "modules/audio_processing/include/mock_audio_processing.h"
#include "modules/include/module.h"
#include "modules/rtp_rtcp/source/rtp_rtcp_interface.h" #include "modules/rtp_rtcp/source/rtp_rtcp_interface.h"
#include "test/fake_encoder.h" #include "test/fake_encoder.h"
#include "test/gtest.h" #include "test/gtest.h"

38
modules/rtp_rtcp/BUILD.gn
View File

@ -135,7 +135,6 @@ rtc_library("rtp_rtcp") {
"include/flexfec_sender.h", "include/flexfec_sender.h",
"include/receive_statistics.h", "include/receive_statistics.h",
"include/remote_ntp_time_estimator.h", "include/remote_ntp_time_estimator.h",
"include/rtp_rtcp.h", # deprecated
"include/ulpfec_receiver.h", "include/ulpfec_receiver.h",
"source/absolute_capture_time_receiver.cc", "source/absolute_capture_time_receiver.cc",
"source/absolute_capture_time_receiver.h", "source/absolute_capture_time_receiver.h",
@ -145,8 +144,6 @@ rtc_library("rtp_rtcp") {
"source/active_decode_targets_helper.h", "source/active_decode_targets_helper.h",
"source/create_video_rtp_depacketizer.cc", "source/create_video_rtp_depacketizer.cc",
"source/create_video_rtp_depacketizer.h", "source/create_video_rtp_depacketizer.h",
"source/deprecated/deprecated_rtp_sender_egress.cc",
"source/deprecated/deprecated_rtp_sender_egress.h",
"source/dtmf_queue.cc", "source/dtmf_queue.cc",
"source/dtmf_queue.h", "source/dtmf_queue.h",
"source/fec_private_tables_bursty.cc", "source/fec_private_tables_bursty.cc",
@ -191,8 +188,6 @@ rtc_library("rtp_rtcp") {
"source/rtp_packetizer_av1.cc", "source/rtp_packetizer_av1.cc",
"source/rtp_packetizer_av1.h", "source/rtp_packetizer_av1.h",
"source/rtp_rtcp_config.h", "source/rtp_rtcp_config.h",
"source/rtp_rtcp_impl.cc",
"source/rtp_rtcp_impl.h",
"source/rtp_rtcp_impl2.cc", "source/rtp_rtcp_impl2.cc",
"source/rtp_rtcp_impl2.h", "source/rtp_rtcp_impl2.h",
"source/rtp_rtcp_interface.h", "source/rtp_rtcp_interface.h",
@ -248,7 +243,6 @@ rtc_library("rtp_rtcp") {
deps = [ deps = [
":rtp_rtcp_format", ":rtp_rtcp_format",
":rtp_video_header", ":rtp_video_header",
"..:module_api",
"..:module_api_public", "..:module_api_public",
"..:module_fec_api", "..:module_fec_api",
"../../api:array_view", "../../api:array_view",
@ -319,8 +313,36 @@ rtc_library("rtp_rtcp") {
} }
rtc_source_set("rtp_rtcp_legacy") { rtc_source_set("rtp_rtcp_legacy") {
# TODO(bugs.webrtc.org/11581): The files "source/rtp_rtcp_impl.cc" sources = [
# and "source/rtp_rtcp_impl.h" should be moved to this target. "include/rtp_rtcp.h",
"source/deprecated/deprecated_rtp_sender_egress.cc",
"source/deprecated/deprecated_rtp_sender_egress.h",
"source/rtp_rtcp_impl.cc",
"source/rtp_rtcp_impl.h",
]
deps = [
":rtp_rtcp",
":rtp_rtcp_format",
"..:module_api",
"..:module_fec_api",
"../../api:rtp_headers",
"../../api:transport_api",
"../../api/rtc_event_log",
"../../api/transport:field_trial_based_config",
"../../api/units:data_rate",
"../../api/video:video_bitrate_allocation",
"../../logging:rtc_event_rtp_rtcp",
"../../rtc_base:checks",
"../../rtc_base:deprecation",
"../../rtc_base:gtest_prod",
"../../rtc_base:rtc_base_approved",
"../../rtc_base/synchronization:mutex",
"../remote_bitrate_estimator",
]
absl_deps = [
"//third_party/abseil-cpp/absl/strings",
"//third_party/abseil-cpp/absl/types:optional",
]
} }
rtc_library("rtcp_transceiver") { rtc_library("rtcp_transceiver") {

1
modules/rtp_rtcp/include/receive_statistics.h
View File

@ -17,7 +17,6 @@
#include "absl/types/optional.h" #include "absl/types/optional.h"
#include "call/rtp_packet_sink_interface.h" #include "call/rtp_packet_sink_interface.h"
#include "modules/include/module.h"
#include "modules/rtp_rtcp/include/rtcp_statistics.h" #include "modules/rtp_rtcp/include/rtcp_statistics.h"
#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
#include "modules/rtp_rtcp/source/rtcp_packet/report_block.h" #include "modules/rtp_rtcp/source/rtcp_packet/report_block.h"

98
video/BUILD.gn
View File

@ -12,8 +12,6 @@ rtc_library("video") {
sources = [ sources = [
"buffered_frame_decryptor.cc", "buffered_frame_decryptor.cc",
"buffered_frame_decryptor.h", "buffered_frame_decryptor.h",
"call_stats.cc",
"call_stats.h",
"call_stats2.cc", "call_stats2.cc",
"call_stats2.h", "call_stats2.h",
"encoder_rtcp_feedback.cc", "encoder_rtcp_feedback.cc",
@ -22,18 +20,12 @@ rtc_library("video") {
"quality_limitation_reason_tracker.h", "quality_limitation_reason_tracker.h",
"quality_threshold.cc", "quality_threshold.cc",
"quality_threshold.h", "quality_threshold.h",
"receive_statistics_proxy.cc",
"receive_statistics_proxy.h",
"receive_statistics_proxy2.cc", "receive_statistics_proxy2.cc",
"receive_statistics_proxy2.h", "receive_statistics_proxy2.h",
"report_block_stats.cc", "report_block_stats.cc",
"report_block_stats.h", "report_block_stats.h",
"rtp_streams_synchronizer.cc",
"rtp_streams_synchronizer.h",
"rtp_streams_synchronizer2.cc", "rtp_streams_synchronizer2.cc",
"rtp_streams_synchronizer2.h", "rtp_streams_synchronizer2.h",
"rtp_video_stream_receiver.cc",
"rtp_video_stream_receiver.h",
"rtp_video_stream_receiver2.cc", "rtp_video_stream_receiver2.cc",
"rtp_video_stream_receiver2.h", "rtp_video_stream_receiver2.h",
"rtp_video_stream_receiver_frame_transformer_delegate.cc", "rtp_video_stream_receiver_frame_transformer_delegate.cc",
@ -48,20 +40,14 @@ rtc_library("video") {
"stream_synchronization.h", "stream_synchronization.h",
"transport_adapter.cc", "transport_adapter.cc",
"transport_adapter.h", "transport_adapter.h",
"video_quality_observer.cc",
"video_quality_observer.h",
"video_quality_observer2.cc", "video_quality_observer2.cc",
"video_quality_observer2.h", "video_quality_observer2.h",
"video_receive_stream.cc",
"video_receive_stream.h",
"video_receive_stream2.cc", "video_receive_stream2.cc",
"video_receive_stream2.h", "video_receive_stream2.h",
"video_send_stream.cc", "video_send_stream.cc",
"video_send_stream.h", "video_send_stream.h",
"video_send_stream_impl.cc", "video_send_stream_impl.cc",
"video_send_stream_impl.h", "video_send_stream_impl.h",
"video_stream_decoder.cc",
"video_stream_decoder.h",
"video_stream_decoder2.cc", "video_stream_decoder2.cc",
"video_stream_decoder2.h", "video_stream_decoder2.h",
] ]
@ -111,7 +97,6 @@ rtc_library("video") {
"../modules/video_coding:nack_module", "../modules/video_coding:nack_module",
"../modules/video_coding:video_codec_interface", "../modules/video_coding:video_codec_interface",
"../modules/video_coding:video_coding_utility", "../modules/video_coding:video_coding_utility",
"../modules/video_coding/deprecated:nack_module",
"../modules/video_processing", "../modules/video_processing",
"../rtc_base:checks", "../rtc_base:checks",
"../rtc_base:rate_limiter", "../rtc_base:rate_limiter",
@ -155,22 +140,73 @@ rtc_library("video") {
} }
rtc_source_set("video_legacy") { rtc_source_set("video_legacy") {
# TODO(bugs.webrtc.org/11581): These files should be moved to this target: sources = [
# "call_stats.cc",
# "call_stats.cc", "call_stats.h",
# "call_stats.h", "receive_statistics_proxy.cc",
# "receive_statistics_proxy.cc", "receive_statistics_proxy.h",
# "receive_statistics_proxy.h", "rtp_streams_synchronizer.cc",
# "rtp_streams_synchronizer.cc", "rtp_streams_synchronizer.h",
# "rtp_streams_synchronizer.h", "rtp_video_stream_receiver.cc",
# "rtp_video_stream_receiver.cc", "rtp_video_stream_receiver.h",
# "rtp_video_stream_receiver.h", "video_quality_observer.cc",
# "video_quality_observer.cc", "video_quality_observer.h",
# "video_quality_observer.h", "video_receive_stream.cc",
# "video_receive_stream.cc", "video_receive_stream.h",
# "video_receive_stream.h", "video_stream_decoder.cc",
# "video_stream_decoder.cc", "video_stream_decoder.h",
# "video_stream_decoder.h", ]
deps = [
":frame_dumping_decoder",
":video",
"../api:array_view",
"../api:scoped_refptr",
"../api/crypto:frame_decryptor_interface",
"../api/task_queue",
"../api/video:encoded_image",
"../api/video:recordable_encoded_frame",
"../api/video:video_frame",
"../api/video:video_rtp_headers",
"../api/video_codecs:video_codecs_api",
"../call:call_interfaces",
"../call:rtp_interfaces",
"../call:rtp_receiver", # For RtxReceiveStream.
"../call:video_stream_api",
"../common_video",
"../media:rtc_h264_profile_id",
"../modules:module_api",
"../modules/pacing",
"../modules/remote_bitrate_estimator",
"../modules/rtp_rtcp",
"../modules/rtp_rtcp:rtp_rtcp_format",
"../modules/rtp_rtcp:rtp_rtcp_legacy",
"../modules/rtp_rtcp:rtp_video_header",
"../modules/utility",
"../modules/video_coding",
"../modules/video_coding:video_codec_interface",
"../modules/video_coding:video_coding_utility",
"../modules/video_coding/deprecated:nack_module",
"../rtc_base:checks",
"../rtc_base:rtc_base_approved",
"../rtc_base:rtc_numerics",
"../rtc_base:rtc_task_queue",
"../rtc_base/experiments:field_trial_parser",
"../rtc_base/experiments:keyframe_interval_settings_experiment",
"../rtc_base/synchronization:mutex",
"../rtc_base/system:no_unique_address",
"../rtc_base/system:thread_registry",
"../rtc_base/task_utils:to_queued_task",
"../system_wrappers",
"../system_wrappers:field_trial",
"../system_wrappers:metrics",
]
if (!build_with_mozilla) {
deps += [ "../media:rtc_media_base" ]
}
absl_deps = [
"//third_party/abseil-cpp/absl/algorithm:container",
"//third_party/abseil-cpp/absl/types:optional",
]
} }
rtc_library("video_stream_decoder_impl") { rtc_library("video_stream_decoder_impl") {