zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unneeded dependency on CallStats.

Browse Source 
Bug: none
Change-Id: I348ec88b3d978dac9813fb96368570f647e1e785
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/174280
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Tommi <tommi@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31150}
This commit is contained in:
Tommi
2020-05-03 22:45:02 +02:00
committed by Commit Bot
parent 14a23a32c4
commit 8ae18adb66
5 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
video/video_send_stream.cc
View File

@ -71,7 +71,7 @@ VideoSendStream::VideoSendStream(
int num_cpu_cores, int num_cpu_cores,
ProcessThread* module_process_thread, ProcessThread* module_process_thread,
TaskQueueFactory* task_queue_factory, TaskQueueFactory* task_queue_factory,
CallStats* call_stats, RtcpRttStats* call_stats,
RtpTransportControllerSendInterface* transport, RtpTransportControllerSendInterface* transport,
BitrateAllocatorInterface* bitrate_allocator, BitrateAllocatorInterface* bitrate_allocator,
SendDelayStats* send_delay_stats, SendDelayStats* send_delay_stats,

2
video/video_send_stream.h
View File

@ -58,7 +58,7 @@ class VideoSendStream : public webrtc::VideoSendStream {
int num_cpu_cores, int num_cpu_cores,
ProcessThread* module_process_thread, ProcessThread* module_process_thread,
TaskQueueFactory* task_queue_factory, TaskQueueFactory* task_queue_factory,
CallStats* call_stats, RtcpRttStats* call_stats,
RtpTransportControllerSendInterface* transport, RtpTransportControllerSendInterface* transport,
BitrateAllocatorInterface* bitrate_allocator, BitrateAllocatorInterface* bitrate_allocator,
SendDelayStats* send_delay_stats, SendDelayStats* send_delay_stats,

6
video/video_send_stream_impl.cc
View File

@ -123,7 +123,7 @@ RtpSenderFrameEncryptionConfig CreateFrameEncryptionConfig(
return frame_encryption_config; return frame_encryption_config;
} }
RtpSenderObservers CreateObservers(CallStats* call_stats, RtpSenderObservers CreateObservers(RtcpRttStats* call_stats,
EncoderRtcpFeedback* encoder_feedback, EncoderRtcpFeedback* encoder_feedback,
SendStatisticsProxy* stats_proxy, SendStatisticsProxy* stats_proxy,
SendDelayStats* send_delay_stats) { SendDelayStats* send_delay_stats) {
@ -179,7 +179,7 @@ VideoSendStreamImpl::VideoSendStreamImpl(
Clock* clock, Clock* clock,
SendStatisticsProxy* stats_proxy, SendStatisticsProxy* stats_proxy,
rtc::TaskQueue* worker_queue, rtc::TaskQueue* worker_queue,
CallStats* call_stats, RtcpRttStats* call_stats,
RtpTransportControllerSendInterface* transport, RtpTransportControllerSendInterface* transport,
BitrateAllocatorInterface* bitrate_allocator, BitrateAllocatorInterface* bitrate_allocator,
SendDelayStats* send_delay_stats, SendDelayStats* send_delay_stats,
@ -200,7 +200,6 @@ VideoSendStreamImpl::VideoSendStreamImpl(
config_(config), config_(config),
worker_queue_(worker_queue), worker_queue_(worker_queue),
timed_out_(false), timed_out_(false),
call_stats_(call_stats),
transport_(transport), transport_(transport),
bitrate_allocator_(bitrate_allocator), bitrate_allocator_(bitrate_allocator),
disable_padding_(true), disable_padding_(true),
@ -235,7 +234,6 @@ VideoSendStreamImpl::VideoSendStreamImpl(
encoder_feedback_.SetRtpVideoSender(rtp_video_sender_); encoder_feedback_.SetRtpVideoSender(rtp_video_sender_);
RTC_DCHECK(!config_->rtp.ssrcs.empty()); RTC_DCHECK(!config_->rtp.ssrcs.empty());
RTC_DCHECK(call_stats_);
RTC_DCHECK(transport_); RTC_DCHECK(transport_);
RTC_DCHECK_NE(initial_encoder_max_bitrate, 0); RTC_DCHECK_NE(initial_encoder_max_bitrate, 0);

4
video/video_send_stream_impl.h
View File

@ -41,7 +41,6 @@
#include "rtc_base/task_utils/repeating_task.h" #include "rtc_base/task_utils/repeating_task.h"
#include "rtc_base/thread_annotations.h" #include "rtc_base/thread_annotations.h"
#include "rtc_base/weak_ptr.h" #include "rtc_base/weak_ptr.h"
#include "video/call_stats.h"
#include "video/encoder_rtcp_feedback.h" #include "video/encoder_rtcp_feedback.h"
#include "video/send_delay_stats.h" #include "video/send_delay_stats.h"
#include "video/send_statistics_proxy.h" #include "video/send_statistics_proxy.h"
@ -75,7 +74,7 @@ class VideoSendStreamImpl : public webrtc::BitrateAllocatorObserver,
Clock* clock, Clock* clock,
SendStatisticsProxy* stats_proxy, SendStatisticsProxy* stats_proxy,
rtc::TaskQueue* worker_queue, rtc::TaskQueue* worker_queue,
CallStats* call_stats, RtcpRttStats* call_stats,
RtpTransportControllerSendInterface* transport, RtpTransportControllerSendInterface* transport,
BitrateAllocatorInterface* bitrate_allocator, BitrateAllocatorInterface* bitrate_allocator,
SendDelayStats* send_delay_stats, SendDelayStats* send_delay_stats,
@ -162,7 +161,6 @@ class VideoSendStreamImpl : public webrtc::BitrateAllocatorObserver,
std::atomic_bool activity_; std::atomic_bool activity_;
bool timed_out_ RTC_GUARDED_BY(worker_queue_); bool timed_out_ RTC_GUARDED_BY(worker_queue_);
CallStats* const call_stats_;
RtpTransportControllerSendInterface* const transport_; RtpTransportControllerSendInterface* const transport_;
BitrateAllocatorInterface* const bitrate_allocator_; BitrateAllocatorInterface* const bitrate_allocator_;

1
video/video_send_stream_impl_unittest.cc
View File

@ -28,6 +28,7 @@
#include "test/gmock.h" #include "test/gmock.h"
#include "test/gtest.h" #include "test/gtest.h"
#include "test/mock_transport.h" #include "test/mock_transport.h"
#include "video/call_stats.h"
#include "video/test/mock_video_stream_encoder.h" #include "video/test/mock_video_stream_encoder.h"
namespace webrtc { namespace webrtc {