admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename worker_queue to send_transport_queue.

Browse Source 
worker_queue is used in many places and it can be confusing. This queue
is the send transport's worker queue. Rename to send_transport_queue to
reflect that.

Bug: none
Change-Id: I43c5c4cbddaee3dae1ff75aa38dc3ddee6585902
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/176362
Commit-Queue: Tommi <tommi@webrtc.org>
Reviewed-by: Tommi <tommi@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31396}
This commit is contained in:
Marina Ciocea 2020-06-01 12:03:09 +02:00 committed by Commit Bot
parent 8a0284e2a8
commit f1c5b95e51
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
call/rtp_video_sender.cc
View File

@ -282,7 +282,7 @@ std::vector<RtpStreamSender> 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<RTPSenderVideo>(video_config);
rtp_streams.emplace_back(std::move(rtp_rtcp), std::move(sender_video),
std::move(fec_generator));

2
modules/rtp_rtcp/source/rtp_sender_video.cc
View File

@ -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();

2
modules/rtp_rtcp/source/rtp_sender_video.h
View File

@ -82,7 +82,7 @@ class RTPSenderVideo {
absl::optional<int> red_payload_type;
const WebRtcKeyValueConfig* field_trials = nullptr;
rtc::scoped_refptr<FrameTransformerInterface> frame_transformer;
TaskQueueBase* worker_queue = nullptr;
TaskQueueBase* send_transport_queue = nullptr;
};
explicit RTPSenderVideo(const Config& config);

8
modules/rtp_rtcp/source/rtp_sender_video_frame_transformer_delegate.cc
View File

@ -110,11 +110,11 @@ RTPSenderVideoFrameTransformerDelegate::RTPSenderVideoFrameTransformerDelegate(
RTPSenderVideo* sender,
rtc::scoped_refptr<FrameTransformerInterface> 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<TransformableVideoSenderFrame>(
encoded_image, video_header, payload_type, codec_type, rtp_timestamp,

4
modules/rtp_rtcp/source/rtp_sender_video_frame_transformer_delegate.h
View File

@ -31,7 +31,7 @@ class RTPSenderVideoFrameTransformerDelegate : public TransformedFrameCallback {
RTPSenderVideo* sender,
rtc::scoped_refptr<FrameTransformerInterface> 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<FrameTransformerInterface> frame_transformer_;
const uint32_t ssrc_;
TaskQueueBase* encoder_queue_ = nullptr;
TaskQueueBase* worker_queue_;
TaskQueueBase* send_transport_queue_;
};
} // namespace webrtc