From 67b011d22c1b343aedad667b387a6baa1cfcb796 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Mon, 22 Oct 2018 13:00:40 +0200 Subject: [PATCH] Use BitrateAllocatorInterface in AudioSendStream and VideoSendStream MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Followup to cl https://webrtc-review.googlesource.com/70880, which introduced the interface. Intended to enable tests using MockBitrateAllocator. Bug: None Change-Id: I0a784106acf37ff9aca118297233ebd2f2259ae4 Reviewed-on: https://webrtc-review.googlesource.com/c/107342 Reviewed-by: Oskar Sundbom Reviewed-by: Sebastian Jansson Reviewed-by: Erik Språng Commit-Queue: Niels Moller Cr-Commit-Position: refs/heads/master@{#25290} --- audio/audio_send_stream.cc | 4 ++-- audio/audio_send_stream.h | 6 +++--- video/video_send_stream.cc | 2 +- video/video_send_stream.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/audio/audio_send_stream.cc b/audio/audio_send_stream.cc index c2b0d1a878..f60f9208ae 100644 --- a/audio/audio_send_stream.cc +++ b/audio/audio_send_stream.cc @@ -89,7 +89,7 @@ AudioSendStream::AudioSendStream( rtc::TaskQueue* worker_queue, ProcessThread* module_process_thread, RtpTransportControllerSendInterface* transport, - BitrateAllocator* bitrate_allocator, + BitrateAllocatorInterface* bitrate_allocator, RtcEventLog* event_log, RtcpRttStats* rtcp_rtt_stats, const absl::optional& suspended_rtp_state, @@ -115,7 +115,7 @@ AudioSendStream::AudioSendStream( const rtc::scoped_refptr& audio_state, rtc::TaskQueue* worker_queue, RtpTransportControllerSendInterface* transport, - BitrateAllocator* bitrate_allocator, + BitrateAllocatorInterface* bitrate_allocator, RtcEventLog* event_log, RtcpRttStats* rtcp_rtt_stats, const absl::optional& suspended_rtp_state, diff --git a/audio/audio_send_stream.h b/audio/audio_send_stream.h index 1ea676b65d..46c68b3c75 100644 --- a/audio/audio_send_stream.h +++ b/audio/audio_send_stream.h @@ -46,7 +46,7 @@ class AudioSendStream final : public webrtc::AudioSendStream, rtc::TaskQueue* worker_queue, ProcessThread* module_process_thread, RtpTransportControllerSendInterface* transport, - BitrateAllocator* bitrate_allocator, + BitrateAllocatorInterface* bitrate_allocator, RtcEventLog* event_log, RtcpRttStats* rtcp_rtt_stats, const absl::optional& suspended_rtp_state, @@ -56,7 +56,7 @@ class AudioSendStream final : public webrtc::AudioSendStream, const rtc::scoped_refptr& audio_state, rtc::TaskQueue* worker_queue, RtpTransportControllerSendInterface* transport, - BitrateAllocator* bitrate_allocator, + BitrateAllocatorInterface* bitrate_allocator, RtcEventLog* event_log, RtcpRttStats* rtcp_rtt_stats, const absl::optional& suspended_rtp_state, @@ -140,7 +140,7 @@ class AudioSendStream final : public webrtc::AudioSendStream, size_t encoder_num_channels_ = 0; bool sending_ = false; - BitrateAllocator* const bitrate_allocator_; + BitrateAllocatorInterface* const bitrate_allocator_; RtpTransportControllerSendInterface* const transport_; rtc::CriticalSection packet_loss_tracker_cs_; diff --git a/video/video_send_stream.cc b/video/video_send_stream.cc index 054d27e421..799931235c 100644 --- a/video/video_send_stream.cc +++ b/video/video_send_stream.cc @@ -62,7 +62,7 @@ VideoSendStream::VideoSendStream( rtc::TaskQueue* worker_queue, CallStats* call_stats, RtpTransportControllerSendInterface* transport, - BitrateAllocator* bitrate_allocator, + BitrateAllocatorInterface* bitrate_allocator, SendDelayStats* send_delay_stats, RtcEventLog* event_log, VideoSendStream::Config config, diff --git a/video/video_send_stream.h b/video/video_send_stream.h index 1ff64dc777..22aa4b1c6d 100644 --- a/video/video_send_stream.h +++ b/video/video_send_stream.h @@ -59,7 +59,7 @@ class VideoSendStream : public webrtc::VideoSendStream { rtc::TaskQueue* worker_queue, CallStats* call_stats, RtpTransportControllerSendInterface* transport, - BitrateAllocator* bitrate_allocator, + BitrateAllocatorInterface* bitrate_allocator, SendDelayStats* send_delay_stats, RtcEventLog* event_log, VideoSendStream::Config config,