diff --git a/video/video_send_stream.cc b/video/video_send_stream.cc index 497db28c0f..bc9a0cd5f3 100644 --- a/video/video_send_stream.cc +++ b/video/video_send_stream.cc @@ -71,7 +71,7 @@ VideoSendStream::VideoSendStream( int num_cpu_cores, ProcessThread* module_process_thread, TaskQueueFactory* task_queue_factory, - CallStats* call_stats, + RtcpRttStats* call_stats, RtpTransportControllerSendInterface* transport, BitrateAllocatorInterface* bitrate_allocator, SendDelayStats* send_delay_stats, diff --git a/video/video_send_stream.h b/video/video_send_stream.h index 9466c74699..addaee49c2 100644 --- a/video/video_send_stream.h +++ b/video/video_send_stream.h @@ -58,7 +58,7 @@ class VideoSendStream : public webrtc::VideoSendStream { int num_cpu_cores, ProcessThread* module_process_thread, TaskQueueFactory* task_queue_factory, - CallStats* call_stats, + RtcpRttStats* call_stats, RtpTransportControllerSendInterface* transport, BitrateAllocatorInterface* bitrate_allocator, SendDelayStats* send_delay_stats, diff --git a/video/video_send_stream_impl.cc b/video/video_send_stream_impl.cc index bfd6216892..03c9613ab4 100644 --- a/video/video_send_stream_impl.cc +++ b/video/video_send_stream_impl.cc @@ -123,7 +123,7 @@ RtpSenderFrameEncryptionConfig CreateFrameEncryptionConfig( return frame_encryption_config; } -RtpSenderObservers CreateObservers(CallStats* call_stats, +RtpSenderObservers CreateObservers(RtcpRttStats* call_stats, EncoderRtcpFeedback* encoder_feedback, SendStatisticsProxy* stats_proxy, SendDelayStats* send_delay_stats) { @@ -179,7 +179,7 @@ VideoSendStreamImpl::VideoSendStreamImpl( Clock* clock, SendStatisticsProxy* stats_proxy, rtc::TaskQueue* worker_queue, - CallStats* call_stats, + RtcpRttStats* call_stats, RtpTransportControllerSendInterface* transport, BitrateAllocatorInterface* bitrate_allocator, SendDelayStats* send_delay_stats, @@ -200,7 +200,6 @@ VideoSendStreamImpl::VideoSendStreamImpl( config_(config), worker_queue_(worker_queue), timed_out_(false), - call_stats_(call_stats), transport_(transport), bitrate_allocator_(bitrate_allocator), disable_padding_(true), @@ -235,7 +234,6 @@ VideoSendStreamImpl::VideoSendStreamImpl( encoder_feedback_.SetRtpVideoSender(rtp_video_sender_); RTC_DCHECK(!config_->rtp.ssrcs.empty()); - RTC_DCHECK(call_stats_); RTC_DCHECK(transport_); RTC_DCHECK_NE(initial_encoder_max_bitrate, 0); diff --git a/video/video_send_stream_impl.h b/video/video_send_stream_impl.h index d3f87e3bf3..8f30b630be 100644 --- a/video/video_send_stream_impl.h +++ b/video/video_send_stream_impl.h @@ -41,7 +41,6 @@ #include "rtc_base/task_utils/repeating_task.h" #include "rtc_base/thread_annotations.h" #include "rtc_base/weak_ptr.h" -#include "video/call_stats.h" #include "video/encoder_rtcp_feedback.h" #include "video/send_delay_stats.h" #include "video/send_statistics_proxy.h" @@ -75,7 +74,7 @@ class VideoSendStreamImpl : public webrtc::BitrateAllocatorObserver, Clock* clock, SendStatisticsProxy* stats_proxy, rtc::TaskQueue* worker_queue, - CallStats* call_stats, + RtcpRttStats* call_stats, RtpTransportControllerSendInterface* transport, BitrateAllocatorInterface* bitrate_allocator, SendDelayStats* send_delay_stats, @@ -162,7 +161,6 @@ class VideoSendStreamImpl : public webrtc::BitrateAllocatorObserver, std::atomic_bool activity_; bool timed_out_ RTC_GUARDED_BY(worker_queue_); - CallStats* const call_stats_; RtpTransportControllerSendInterface* const transport_; BitrateAllocatorInterface* const bitrate_allocator_; diff --git a/video/video_send_stream_impl_unittest.cc b/video/video_send_stream_impl_unittest.cc index 24519b118f..5c5ca1eaee 100644 --- a/video/video_send_stream_impl_unittest.cc +++ b/video/video_send_stream_impl_unittest.cc @@ -28,6 +28,7 @@ #include "test/gmock.h" #include "test/gtest.h" #include "test/mock_transport.h" +#include "video/call_stats.h" #include "video/test/mock_video_stream_encoder.h" namespace webrtc {