From c1bda7a6f00252d106213ab29ba394d51f6da7f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Terelius?= Date: Wed, 19 Feb 2025 16:51:25 +0100 Subject: [PATCH] Clang-tidy fixes and other nits in rtp_rtcp/ sender/receiver classes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: None Change-Id: I17e6bd9eb1485f6c13dcf195893f81942f170b3e Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/377742 Commit-Queue: Björn Terelius Reviewed-by: Danil Chapovalov Cr-Commit-Position: refs/heads/main@{#43938} --- modules/rtp_rtcp/BUILD.gn | 5 +++ modules/rtp_rtcp/source/rtcp_receiver.cc | 1 - .../rtp_rtcp/source/rtcp_receiver_unittest.cc | 1 - modules/rtp_rtcp/source/rtcp_sender.cc | 3 +- modules/rtp_rtcp/source/rtcp_sender.h | 3 +- modules/rtp_rtcp/source/rtcp_transceiver.cc | 8 +++-- modules/rtp_rtcp/source/rtcp_transceiver.h | 4 ++- .../rtp_rtcp/source/rtcp_transceiver_config.h | 3 ++ .../rtp_rtcp/source/rtcp_transceiver_impl.cc | 25 ++++++++++++-- .../source/rtp_sender_egress_unittest.cc | 1 - .../rtp_rtcp/source/rtp_sender_unittest.cc | 33 ++++++++----------- modules/rtp_rtcp/source/rtp_sender_video.h | 14 +++++--- ..._sender_video_frame_transformer_delegate.h | 7 ++++ ...deo_frame_transformer_delegate_unittest.cc | 19 +++++++++++ .../source/rtp_sender_video_unittest.cc | 24 ++++++++++++-- 15 files changed, 112 insertions(+), 39 deletions(-) diff --git a/modules/rtp_rtcp/BUILD.gn b/modules/rtp_rtcp/BUILD.gn index 72552fc920..41d4deec67 100644 --- a/modules/rtp_rtcp/BUILD.gn +++ b/modules/rtp_rtcp/BUILD.gn @@ -438,6 +438,7 @@ rtc_library("rtcp_transceiver") { "../../api/units:time_delta", "../../api/units:timestamp", "../../api/video:video_bitrate_allocation", + "../../api/video:video_codec_constants", "../../rtc_base:checks", "../../rtc_base:copy_on_write_buffer", "../../rtc_base:divide_round", @@ -670,11 +671,13 @@ if (rtc_include_tests) { ":rtp_rtcp", ":rtp_rtcp_format", ":rtp_rtcp_legacy", + ":rtp_video_header", ":rtp_video_header_unittest", "../../api:array_view", "../../api:create_time_controller", "../../api:field_trials_registry", "../../api:frame_transformer_factory", + "../../api:frame_transformer_interface", "../../api:function_view", "../../api:make_ref_counted", "../../api:mock_frame_encryptor", @@ -704,6 +707,7 @@ if (rtc_include_tests) { "../../api/video:video_bitrate_allocator", "../../api/video:video_codec_constants", "../../api/video:video_frame", + "../../api/video:video_frame_metadata", "../../api/video:video_frame_type", "../../api/video:video_layers_allocation", "../../api/video:video_rtp_headers", @@ -740,6 +744,7 @@ if (rtc_include_tests) { "../../test:test_support", "../../test/time_controller:time_controller", "../video_coding:codec_globals_headers", + "//testing/gtest", "//third_party/abseil-cpp/absl/algorithm:container", "//third_party/abseil-cpp/absl/base:core_headers", "//third_party/abseil-cpp/absl/memory", diff --git a/modules/rtp_rtcp/source/rtcp_receiver.cc b/modules/rtp_rtcp/source/rtcp_receiver.cc index 21b6c9552f..3e710dfc1d 100644 --- a/modules/rtp_rtcp/source/rtcp_receiver.cc +++ b/modules/rtp_rtcp/source/rtcp_receiver.cc @@ -67,7 +67,6 @@ #include "rtc_base/containers/flat_map.h" #include "rtc_base/logging.h" #include "rtc_base/synchronization/mutex.h" -#include "rtc_base/time_utils.h" #include "rtc_base/trace_event.h" #include "system_wrappers/include/ntp_time.h" diff --git a/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc b/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc index 75d268d0e7..2fcdce050d 100644 --- a/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc +++ b/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc @@ -58,7 +58,6 @@ #include "rtc_base/arraysize.h" #include "rtc_base/buffer.h" #include "rtc_base/random.h" -#include "rtc_base/time_utils.h" #include "system_wrappers/include/clock.h" #include "system_wrappers/include/ntp_time.h" #include "test/explicit_key_value_config.h" diff --git a/modules/rtp_rtcp/source/rtcp_sender.cc b/modules/rtp_rtcp/source/rtcp_sender.cc index 8b8b88cb27..55724a850d 100644 --- a/modules/rtp_rtcp/source/rtcp_sender.cc +++ b/modules/rtp_rtcp/source/rtcp_sender.cc @@ -53,7 +53,6 @@ #include "modules/rtp_rtcp/source/rtcp_packet/tmmbn.h" #include "modules/rtp_rtcp/source/rtcp_packet/tmmbr.h" #include "modules/rtp_rtcp/source/rtp_rtcp_config.h" -#include "modules/rtp_rtcp/source/rtp_rtcp_impl2.h" #include "modules/rtp_rtcp/source/rtp_rtcp_interface.h" #include "modules/rtp_rtcp/source/tmmbr_help.h" #include "rtc_base/checks.h" @@ -467,7 +466,7 @@ void RTCPSender::BuildTMMBR(const RtcpContext& ctx, PacketSender& sender) { bool tmmbr_owner = false; // holding mutex_rtcp_sender_ while calling RTCPreceiver which - // will accuire criticalSectionRTCPReceiver_ is a potental deadlock but + // will acquire criticalSectionRTCPReceiver_ is a potential deadlock but // since RTCPreceiver is not doing the reverse we should be fine std::vector candidates = ctx.feedback_state_.receiver->BoundingSet(&tmmbr_owner); diff --git a/modules/rtp_rtcp/source/rtcp_sender.h b/modules/rtp_rtcp/source/rtcp_sender.h index f3fc2634f3..307228134d 100644 --- a/modules/rtp_rtcp/source/rtcp_sender.h +++ b/modules/rtp_rtcp/source/rtcp_sender.h @@ -38,6 +38,7 @@ #include "modules/rtp_rtcp/source/rtcp_packet/loss_notification.h" #include "modules/rtp_rtcp/source/rtcp_packet/report_block.h" #include "modules/rtp_rtcp/source/rtcp_packet/tmmb_item.h" +#include "modules/rtp_rtcp/source/rtcp_receiver.h" #include "modules/rtp_rtcp/source/rtp_rtcp_interface.h" #include "rtc_base/random.h" #include "rtc_base/synchronization/mutex.h" @@ -46,8 +47,6 @@ namespace webrtc { -class RTCPReceiver; - class RTCPSender final { public: struct Configuration { diff --git a/modules/rtp_rtcp/source/rtcp_transceiver.cc b/modules/rtp_rtcp/source/rtcp_transceiver.cc index f265bd5825..4a77837f29 100644 --- a/modules/rtp_rtcp/source/rtcp_transceiver.cc +++ b/modules/rtp_rtcp/source/rtcp_transceiver.cc @@ -10,15 +10,19 @@ #include "modules/rtp_rtcp/source/rtcp_transceiver.h" +#include #include #include #include #include "absl/cleanup/cleanup.h" +#include "absl/functional/any_invocable.h" #include "api/units/timestamp.h" -#include "modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" +#include "modules/rtp_rtcp/source/rtcp_packet.h" +#include "modules/rtp_rtcp/source/rtcp_transceiver_config.h" +#include "modules/rtp_rtcp/source/rtcp_transceiver_impl.h" #include "rtc_base/checks.h" -#include "rtc_base/event.h" +#include "rtc_base/copy_on_write_buffer.h" #include "system_wrappers/include/clock.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtcp_transceiver.h b/modules/rtp_rtcp/source/rtcp_transceiver.h index 22fcc73337..d2037f456e 100644 --- a/modules/rtp_rtcp/source/rtcp_transceiver.h +++ b/modules/rtp_rtcp/source/rtcp_transceiver.h @@ -11,12 +11,14 @@ #ifndef MODULES_RTP_RTCP_SOURCE_RTCP_TRANSCEIVER_H_ #define MODULES_RTP_RTCP_SOURCE_RTCP_TRANSCEIVER_H_ +#include #include -#include #include #include "absl/functional/any_invocable.h" #include "api/task_queue/task_queue_base.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +#include "modules/rtp_rtcp/source/rtcp_packet.h" #include "modules/rtp_rtcp/source/rtcp_transceiver_config.h" #include "modules/rtp_rtcp/source/rtcp_transceiver_impl.h" #include "rtc_base/copy_on_write_buffer.h" diff --git a/modules/rtp_rtcp/source/rtcp_transceiver_config.h b/modules/rtp_rtcp/source/rtcp_transceiver_config.h index 3b61c94eaf..684cedfe7a 100644 --- a/modules/rtp_rtcp/source/rtcp_transceiver_config.h +++ b/modules/rtp_rtcp/source/rtcp_transceiver_config.h @@ -11,6 +11,9 @@ #ifndef MODULES_RTP_RTCP_SOURCE_RTCP_TRANSCEIVER_CONFIG_H_ #define MODULES_RTP_RTCP_SOURCE_RTCP_TRANSCEIVER_CONFIG_H_ +#include +#include +#include #include #include "api/array_view.h" diff --git a/modules/rtp_rtcp/source/rtcp_transceiver_impl.cc b/modules/rtp_rtcp/source/rtcp_transceiver_impl.cc index df6e625d41..38f77ed517 100644 --- a/modules/rtp_rtcp/source/rtcp_transceiver_impl.cc +++ b/modules/rtp_rtcp/source/rtcp_transceiver_impl.cc @@ -11,35 +11,56 @@ #include "modules/rtp_rtcp/source/rtcp_transceiver_impl.h" #include +#include +#include +#include +#include +#include #include +#include #include +#include #include "absl/algorithm/container.h" -#include "absl/memory/memory.h" +#include "api/array_view.h" +#include "api/rtp_headers.h" +#include "api/task_queue/task_queue_base.h" +#include "api/units/data_rate.h" +#include "api/units/time_delta.h" +#include "api/units/timestamp.h" #include "api/video/video_bitrate_allocation.h" +#include "api/video/video_codec_constants.h" #include "modules/rtp_rtcp/include/receive_statistics.h" +#include "modules/rtp_rtcp/include/report_block_data.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "modules/rtp_rtcp/source/ntp_time_util.h" #include "modules/rtp_rtcp/source/rtcp_packet.h" #include "modules/rtp_rtcp/source/rtcp_packet/bye.h" #include "modules/rtp_rtcp/source/rtcp_packet/common_header.h" #include "modules/rtp_rtcp/source/rtcp_packet/congestion_control_feedback.h" +#include "modules/rtp_rtcp/source/rtcp_packet/dlrr.h" #include "modules/rtp_rtcp/source/rtcp_packet/extended_reports.h" #include "modules/rtp_rtcp/source/rtcp_packet/fir.h" #include "modules/rtp_rtcp/source/rtcp_packet/nack.h" #include "modules/rtp_rtcp/source/rtcp_packet/pli.h" +#include "modules/rtp_rtcp/source/rtcp_packet/psfb.h" #include "modules/rtp_rtcp/source/rtcp_packet/receiver_report.h" +#include "modules/rtp_rtcp/source/rtcp_packet/remb.h" #include "modules/rtp_rtcp/source/rtcp_packet/report_block.h" +#include "modules/rtp_rtcp/source/rtcp_packet/rrtr.h" +#include "modules/rtp_rtcp/source/rtcp_packet/rtpfb.h" #include "modules/rtp_rtcp/source/rtcp_packet/sdes.h" #include "modules/rtp_rtcp/source/rtcp_packet/sender_report.h" +#include "modules/rtp_rtcp/source/rtcp_packet/target_bitrate.h" #include "modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" +#include "modules/rtp_rtcp/source/rtcp_transceiver_config.h" #include "rtc_base/checks.h" #include "rtc_base/containers/flat_map.h" #include "rtc_base/logging.h" #include "rtc_base/numerics/divide_round.h" #include "rtc_base/task_utils/repeating_task.h" -#include "rtc_base/time_utils.h" #include "system_wrappers/include/clock.h" +#include "system_wrappers/include/ntp_time.h" namespace webrtc { namespace { diff --git a/modules/rtp_rtcp/source/rtp_sender_egress_unittest.cc b/modules/rtp_rtcp/source/rtp_sender_egress_unittest.cc index 28e146d960..327edeae1c 100644 --- a/modules/rtp_rtcp/source/rtp_sender_egress_unittest.cc +++ b/modules/rtp_rtcp/source/rtp_sender_egress_unittest.cc @@ -48,7 +48,6 @@ using ::testing::Eq; using ::testing::Field; using ::testing::InSequence; using ::testing::NiceMock; -using ::testing::StrictMock; constexpr Timestamp kStartTime = Timestamp::Millis(123456789); constexpr int kDefaultPayloadType = 100; diff --git a/modules/rtp_rtcp/source/rtp_sender_unittest.cc b/modules/rtp_rtcp/source/rtp_sender_unittest.cc index 2b9a2c6428..0771cd51a8 100644 --- a/modules/rtp_rtcp/source/rtp_sender_unittest.cc +++ b/modules/rtp_rtcp/source/rtp_sender_unittest.cc @@ -10,39 +10,38 @@ #include "modules/rtp_rtcp/source/rtp_sender.h" +#include +#include #include +#include +#include #include #include #include "absl/strings/string_view.h" #include "api/environment/environment.h" #include "api/environment/environment_factory.h" -#include "api/rtc_event_log/rtc_event.h" #include "api/rtp_packet_sender.h" +#include "api/rtp_parameters.h" #include "api/units/frequency.h" #include "api/units/time_delta.h" #include "api/units/timestamp.h" -#include "api/video/video_codec_constants.h" -#include "api/video/video_timing.h" -#include "modules/rtp_rtcp/include/rtp_cvo.h" -#include "modules/rtp_rtcp/include/rtp_header_extension_map.h" +#include "api/video/video_codec_type.h" +#include "api/video/video_frame_type.h" +#include "modules/rtp_rtcp/include/flexfec_sender.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "modules/rtp_rtcp/source/packet_sequencer.h" #include "modules/rtp_rtcp/source/rtp_format_video_generic.h" -#include "modules/rtp_rtcp/source/rtp_generic_frame_descriptor.h" -#include "modules/rtp_rtcp/source/rtp_generic_frame_descriptor_extension.h" +#include "modules/rtp_rtcp/source/rtp_header_extension_size.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_history.h" #include "modules/rtp_rtcp/source/rtp_packet_to_send.h" +#include "modules/rtp_rtcp/source/rtp_rtcp_interface.h" #include "modules/rtp_rtcp/source/rtp_sender_video.h" #include "modules/rtp_rtcp/source/video_fec_generator.h" -#include "rtc_base/arraysize.h" -#include "rtc_base/logging.h" #include "rtc_base/rate_limiter.h" -#include "rtc_base/strings/string_builder.h" #include "test/gmock.h" #include "test/gtest.h" -#include "test/mock_transport.h" #include "test/time_controller/simulated_time_controller.h" namespace webrtc { @@ -76,18 +75,14 @@ constexpr absl::string_view kMid = "mid"; constexpr absl::string_view kRid = "f"; constexpr bool kMarkerBit = true; -using ::testing::_; using ::testing::AllOf; using ::testing::AtLeast; -using ::testing::Contains; using ::testing::Each; using ::testing::ElementsAre; using ::testing::ElementsAreArray; using ::testing::Eq; -using ::testing::Field; using ::testing::Gt; using ::testing::IsEmpty; -using ::testing::NiceMock; using ::testing::Not; using ::testing::Pointee; using ::testing::Property; @@ -376,7 +371,7 @@ TEST_F(RtpSenderTest, SendPadding) { EXPECT_CALL(mock_paced_sender_, EnqueuePackets); std::unique_ptr media_packet = SendPacket(/*capture_time=*/env_.clock().CurrentTime(), - /*payload_size=*/100); + /*payload_length=*/100); sequencer_->Sequence(*media_packet); // Wait 50 ms before generating each padding packet. @@ -409,7 +404,7 @@ TEST_F(RtpSenderTest, SendPadding) { std::unique_ptr next_media_packet = SendPacket(/*capture_time=*/env_.clock().CurrentTime(), - /*payload_size=*/100); + /*payload_length=*/100); } TEST_F(RtpSenderTest, NoPaddingAsFirstPacketWithoutBweExtensions) { @@ -520,7 +515,7 @@ TEST_F(RtpSenderTest, UpdatesTimestampsOnPlainRtxPadding) { Pointee(Property(&RtpPacketToSend::Timestamp, start_timestamp)), Pointee(Property(&RtpPacketToSend::capture_time, start_time)))))); std::unique_ptr media_packet = - SendPacket(start_time, /*payload_size=*/600); + SendPacket(start_time, /*payload_length=*/600); sequencer_->Sequence(*media_packet); // Advance time before sending padding. diff --git a/modules/rtp_rtcp/source/rtp_sender_video.h b/modules/rtp_rtcp/source/rtp_sender_video.h index 4e8abf83f1..d12d417d10 100644 --- a/modules/rtp_rtcp/source/rtp_sender_video.h +++ b/modules/rtp_rtcp/source/rtp_sender_video.h @@ -11,28 +11,31 @@ #ifndef MODULES_RTP_RTCP_SOURCE_RTP_SENDER_VIDEO_H_ #define MODULES_RTP_RTCP_SOURCE_RTP_SENDER_VIDEO_H_ +#include +#include #include #include #include #include -#include "absl/strings/string_view.h" #include "api/array_view.h" +#include "api/environment/environment.h" #include "api/frame_transformer_interface.h" #include "api/scoped_refptr.h" -#include "api/sequence_checker.h" -#include "api/task_queue/task_queue_base.h" #include "api/task_queue/task_queue_factory.h" #include "api/transport/rtp/dependency_descriptor.h" +#include "api/units/data_rate.h" #include "api/units/time_delta.h" #include "api/units/timestamp.h" +#include "api/video/color_space.h" +#include "api/video/encoded_image.h" #include "api/video/video_codec_type.h" -#include "api/video/video_frame_type.h" #include "api/video/video_layers_allocation.h" +#include "api/video/video_rotation.h" +#include "api/video/video_timing.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "modules/rtp_rtcp/source/absolute_capture_time_sender.h" #include "modules/rtp_rtcp/source/active_decode_targets_helper.h" -#include "modules/rtp_rtcp/source/rtp_rtcp_config.h" #include "modules/rtp_rtcp/source/rtp_sender.h" #include "modules/rtp_rtcp/source/rtp_sender_video_frame_transformer_delegate.h" #include "modules/rtp_rtcp/source/rtp_video_header.h" @@ -43,6 +46,7 @@ #include "rtc_base/race_checker.h" #include "rtc_base/synchronization/mutex.h" #include "rtc_base/thread_annotations.h" +#include "system_wrappers/include/clock.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtp_sender_video_frame_transformer_delegate.h b/modules/rtp_rtcp/source/rtp_sender_video_frame_transformer_delegate.h index 3580d84402..e44a62685e 100644 --- a/modules/rtp_rtcp/source/rtp_sender_video_frame_transformer_delegate.h +++ b/modules/rtp_rtcp/source/rtp_sender_video_frame_transformer_delegate.h @@ -11,20 +11,27 @@ #ifndef MODULES_RTP_RTCP_SOURCE_RTP_SENDER_VIDEO_FRAME_TRANSFORMER_DELEGATE_H_ #define MODULES_RTP_RTCP_SOURCE_RTP_SENDER_VIDEO_FRAME_TRANSFORMER_DELEGATE_H_ +#include +#include #include +#include #include +#include "api/array_view.h" #include "api/frame_transformer_interface.h" #include "api/scoped_refptr.h" #include "api/sequence_checker.h" #include "api/task_queue/task_queue_base.h" #include "api/task_queue/task_queue_factory.h" +#include "api/transport/rtp/dependency_descriptor.h" #include "api/units/time_delta.h" #include "api/units/timestamp.h" #include "api/video/encoded_image.h" +#include "api/video/video_codec_type.h" #include "api/video/video_layers_allocation.h" #include "modules/rtp_rtcp/source/rtp_video_header.h" #include "rtc_base/synchronization/mutex.h" +#include "rtc_base/thread_annotations.h" namespace webrtc { diff --git a/modules/rtp_rtcp/source/rtp_sender_video_frame_transformer_delegate_unittest.cc b/modules/rtp_rtcp/source/rtp_sender_video_frame_transformer_delegate_unittest.cc index 4224b8cca7..472c8cc6d7 100644 --- a/modules/rtp_rtcp/source/rtp_sender_video_frame_transformer_delegate_unittest.cc +++ b/modules/rtp_rtcp/source/rtp_sender_video_frame_transformer_delegate_unittest.cc @@ -10,10 +10,29 @@ #include "modules/rtp_rtcp/source/rtp_sender_video_frame_transformer_delegate.h" +#include +#include +#include +#include #include +#include +#include "api/array_view.h" +#include "api/frame_transformer_interface.h" +#include "api/make_ref_counted.h" +#include "api/scoped_refptr.h" #include "api/test/mock_frame_transformer.h" #include "api/test/mock_transformable_video_frame.h" +#include "api/transport/rtp/dependency_descriptor.h" +#include "api/units/time_delta.h" +#include "api/units/timestamp.h" +#include "api/video/encoded_image.h" +#include "api/video/video_codec_type.h" +#include "api/video/video_frame_metadata.h" +#include "api/video/video_frame_type.h" +#include "api/video/video_layers_allocation.h" +#include "modules/rtp_rtcp/source/rtp_video_header.h" +#include "modules/video_coding/codecs/vp8/include/vp8_globals.h" #include "rtc_base/event.h" #include "test/gmock.h" #include "test/gtest.h" diff --git a/modules/rtp_rtcp/source/rtp_sender_video_unittest.cc b/modules/rtp_rtcp/source/rtp_sender_video_unittest.cc index ecf8e909e3..054ed9a343 100644 --- a/modules/rtp_rtcp/source/rtp_sender_video_unittest.cc +++ b/modules/rtp_rtcp/source/rtp_sender_video_unittest.cc @@ -10,30 +10,43 @@ #include "modules/rtp_rtcp/source/rtp_sender_video.h" +#include #include #include -#include +#include #include #include #include "absl/memory/memory.h" +#include "api/array_view.h" +#include "api/call/transport.h" #include "api/environment/environment.h" #include "api/environment/environment_factory.h" #include "api/frame_transformer_factory.h" +#include "api/frame_transformer_interface.h" +#include "api/make_ref_counted.h" #include "api/rtp_headers.h" +#include "api/scoped_refptr.h" #include "api/task_queue/task_queue_base.h" #include "api/task_queue/task_queue_factory.h" #include "api/test/mock_frame_encryptor.h" #include "api/test/mock_frame_transformer.h" #include "api/transport/rtp/corruption_detection_message.h" #include "api/transport/rtp/dependency_descriptor.h" +#include "api/units/data_rate.h" +#include "api/units/time_delta.h" #include "api/units/timestamp.h" +#include "api/video/encoded_image.h" #include "api/video/video_codec_constants.h" +#include "api/video/video_codec_type.h" #include "api/video/video_frame_type.h" +#include "api/video/video_layers_allocation.h" +#include "api/video/video_rotation.h" #include "api/video/video_timing.h" #include "common_video/frame_instrumentation_data.h" #include "modules/rtp_rtcp/include/rtp_cvo.h" #include "modules/rtp_rtcp/include/rtp_header_extension_map.h" +#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "modules/rtp_rtcp/source/corruption_detection_extension.h" #include "modules/rtp_rtcp/source/rtcp_packet/nack.h" #include "modules/rtp_rtcp/source/rtcp_packet/receiver_report.h" @@ -43,14 +56,20 @@ #include "modules/rtp_rtcp/source/rtp_generic_frame_descriptor.h" #include "modules/rtp_rtcp/source/rtp_generic_frame_descriptor_extension.h" #include "modules/rtp_rtcp/source/rtp_header_extensions.h" +#include "modules/rtp_rtcp/source/rtp_packet.h" #include "modules/rtp_rtcp/source/rtp_packet_received.h" #include "modules/rtp_rtcp/source/rtp_rtcp_impl2.h" +#include "modules/rtp_rtcp/source/rtp_sender.h" #include "modules/rtp_rtcp/source/rtp_video_layers_allocation_extension.h" +#include "modules/video_coding/codecs/h264/include/h264_globals.h" +#include "modules/video_coding/codecs/vp8/include/vp8_globals.h" +#include "modules/video_coding/codecs/vp9/include/vp9_globals.h" #include "rtc_base/arraysize.h" #include "rtc_base/checks.h" -#include "rtc_base/logging.h" #include "rtc_base/rate_limiter.h" #include "rtc_base/thread.h" +#include "system_wrappers/include/clock.h" +#include "system_wrappers/include/ntp_time.h" #include "test/gmock.h" #include "test/gtest.h" #include "test/time_controller/simulated_time_controller.h" @@ -66,7 +85,6 @@ using ::testing::ElementsAreArray; using ::testing::IsEmpty; using ::testing::NiceMock; using ::testing::Not; -using ::testing::Return; using ::testing::ReturnArg; using ::testing::SaveArg; using ::testing::SizeIs;