diff --git a/call/rtp_video_sender.cc b/call/rtp_video_sender.cc index ca8baee2b0..fd35876daa 100644 --- a/call/rtp_video_sender.cc +++ b/call/rtp_video_sender.cc @@ -282,7 +282,7 @@ std::vector CreateRtpStreamSenders( video_config.fec_overhead_bytes = fec_generator->MaxPacketOverhead(); } video_config.frame_transformer = frame_transformer; - video_config.worker_queue = transport->GetWorkerQueue()->Get(); + video_config.send_transport_queue = transport->GetWorkerQueue()->Get(); auto sender_video = std::make_unique(video_config); rtp_streams.emplace_back(std::move(rtp_rtcp), std::move(sender_video), std::move(fec_generator)); diff --git a/modules/rtp_rtcp/source/rtp_sender_video.cc b/modules/rtp_rtcp/source/rtp_sender_video.cc index 040f1b6fe5..721bc8bc07 100644 --- a/modules/rtp_rtcp/source/rtp_sender_video.cc +++ b/modules/rtp_rtcp/source/rtp_sender_video.cc @@ -145,7 +145,7 @@ RTPSenderVideo::RTPSenderVideo(const Config& config) this, config.frame_transformer, rtp_sender_->SSRC(), - config.worker_queue) + config.send_transport_queue) : nullptr) { if (frame_transformer_delegate_) frame_transformer_delegate_->Init(); diff --git a/modules/rtp_rtcp/source/rtp_sender_video.h b/modules/rtp_rtcp/source/rtp_sender_video.h index 216f16faf6..699734efa3 100644 --- a/modules/rtp_rtcp/source/rtp_sender_video.h +++ b/modules/rtp_rtcp/source/rtp_sender_video.h @@ -82,7 +82,7 @@ class RTPSenderVideo { absl::optional red_payload_type; const WebRtcKeyValueConfig* field_trials = nullptr; rtc::scoped_refptr frame_transformer; - TaskQueueBase* worker_queue = nullptr; + TaskQueueBase* send_transport_queue = nullptr; }; explicit RTPSenderVideo(const Config& config); diff --git a/modules/rtp_rtcp/source/rtp_sender_video_frame_transformer_delegate.cc b/modules/rtp_rtcp/source/rtp_sender_video_frame_transformer_delegate.cc index bae79c97ff..a4cacef520 100644 --- a/modules/rtp_rtcp/source/rtp_sender_video_frame_transformer_delegate.cc +++ b/modules/rtp_rtcp/source/rtp_sender_video_frame_transformer_delegate.cc @@ -110,11 +110,11 @@ RTPSenderVideoFrameTransformerDelegate::RTPSenderVideoFrameTransformerDelegate( RTPSenderVideo* sender, rtc::scoped_refptr frame_transformer, uint32_t ssrc, - TaskQueueBase* worker_queue) + TaskQueueBase* send_transport_queue) : sender_(sender), frame_transformer_(std::move(frame_transformer)), ssrc_(ssrc), - worker_queue_(worker_queue) {} + send_transport_queue_(send_transport_queue) {} void RTPSenderVideoFrameTransformerDelegate::Init() { frame_transformer_->RegisterTransformedFrameSinkCallback( @@ -133,9 +133,9 @@ bool RTPSenderVideoFrameTransformerDelegate::TransformFrame( // Save the current task queue to post the transformed frame for sending // once it is transformed. When there is no current task queue, i.e. // encoding is done on an external thread (for example in the case of - // hardware encoders), use the worker queue instead. + // hardware encoders), use the send transport queue instead. TaskQueueBase* current = TaskQueueBase::Current(); - encoder_queue_ = current ? current : worker_queue_; + encoder_queue_ = current ? current : send_transport_queue_; } frame_transformer_->Transform(std::make_unique( encoded_image, video_header, payload_type, codec_type, rtp_timestamp, 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 bea5ba7b65..5beba7770b 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 @@ -31,7 +31,7 @@ class RTPSenderVideoFrameTransformerDelegate : public TransformedFrameCallback { RTPSenderVideo* sender, rtc::scoped_refptr frame_transformer, uint32_t ssrc, - TaskQueueBase* worker_queue); + TaskQueueBase* send_transport_queue); void Init(); @@ -70,7 +70,7 @@ class RTPSenderVideoFrameTransformerDelegate : public TransformedFrameCallback { rtc::scoped_refptr frame_transformer_; const uint32_t ssrc_; TaskQueueBase* encoder_queue_ = nullptr; - TaskQueueBase* worker_queue_; + TaskQueueBase* send_transport_queue_; }; } // namespace webrtc