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

Migrate RtcpTransceiver to use webrtc::TaskQueueBase instead of rtc::TaskQueue

Browse Source 
This changes removes an extra layer of indirection
since RtcpTransceiver doesn't own TaskQueue it uses.

Bug: None
Change-Id: Ie1ef4cd8c3fb18a8e0b7ddaf0d6a319392b9e9f7
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/126040
Reviewed-by: Per Kjellander <perkj@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30704}
This commit is contained in:
Danil Chapovalov
2020-03-05 15:43:24 +01:00
committed by Commit Bot
parent 8e9fd4857e
commit f351cfffe2
8 changed files with 53 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
modules/rtp_rtcp/source/rtcp_transceiver.cc
View File

@ -32,9 +32,10 @@ RtcpTransceiver::~RtcpTransceiver() {
if (!rtcp_transceiver_)
return;
auto rtcp_transceiver = std::move(rtcp_transceiver_);
task_queue_->PostTask([rtcp_transceiver = std::move(rtcp_transceiver)] {
rtcp_transceiver->StopPeriodicTask();
});
task_queue_->PostTask(
ToQueuedTask([rtcp_transceiver = std::move(rtcp_transceiver)] {
rtcp_transceiver->StopPeriodicTask();
}));
RTC_DCHECK(!rtcp_transceiver_);
}
@ -54,9 +55,9 @@ void RtcpTransceiver::AddMediaReceiverRtcpObserver(
MediaReceiverRtcpObserver* observer) {
RTC_CHECK(rtcp_transceiver_);
RtcpTransceiverImpl* ptr = rtcp_transceiver_.get();
task_queue_->PostTask([ptr, remote_ssrc, observer] {
task_queue_->PostTask(ToQueuedTask([ptr, remote_ssrc, observer] {
ptr->AddMediaReceiverRtcpObserver(remote_ssrc, observer);
});
}));
}
void RtcpTransceiver::RemoveMediaReceiverRtcpObserver(
@ -74,36 +75,38 @@ void RtcpTransceiver::RemoveMediaReceiverRtcpObserver(
void RtcpTransceiver::SetReadyToSend(bool ready) {
RTC_CHECK(rtcp_transceiver_);
RtcpTransceiverImpl* ptr = rtcp_transceiver_.get();
task_queue_->PostTask([ptr, ready] { ptr->SetReadyToSend(ready); });
task_queue_->PostTask(
ToQueuedTask([ptr, ready] { ptr->SetReadyToSend(ready); }));
}
void RtcpTransceiver::ReceivePacket(rtc::CopyOnWriteBuffer packet) {
RTC_CHECK(rtcp_transceiver_);
RtcpTransceiverImpl* ptr = rtcp_transceiver_.get();
int64_t now_us = rtc::TimeMicros();
task_queue_->PostTask(
[ptr, packet, now_us] { ptr->ReceivePacket(packet, now_us); });
task_queue_->PostTask(ToQueuedTask(
[ptr, packet, now_us] { ptr->ReceivePacket(packet, now_us); }));
}
void RtcpTransceiver::SendCompoundPacket() {
RTC_CHECK(rtcp_transceiver_);
RtcpTransceiverImpl* ptr = rtcp_transceiver_.get();
task_queue_->PostTask([ptr] { ptr->SendCompoundPacket(); });
task_queue_->PostTask(ToQueuedTask([ptr] { ptr->SendCompoundPacket(); }));
}
void RtcpTransceiver::SetRemb(int64_t bitrate_bps,
std::vector<uint32_t> ssrcs) {
RTC_CHECK(rtcp_transceiver_);
RtcpTransceiverImpl* ptr = rtcp_transceiver_.get();
task_queue_->PostTask([ptr, bitrate_bps, ssrcs = std::move(ssrcs)]() mutable {
ptr->SetRemb(bitrate_bps, std::move(ssrcs));
});
task_queue_->PostTask(
ToQueuedTask([ptr, bitrate_bps, ssrcs = std::move(ssrcs)]() mutable {
ptr->SetRemb(bitrate_bps, std::move(ssrcs));
}));
}
void RtcpTransceiver::UnsetRemb() {
RTC_CHECK(rtcp_transceiver_);
RtcpTransceiverImpl* ptr = rtcp_transceiver_.get();
task_queue_->PostTask([ptr] { ptr->UnsetRemb(); });
task_queue_->PostTask(ToQueuedTask([ptr] { ptr->UnsetRemb(); }));
}
void RtcpTransceiver::SendCombinedRtcpPacket(
@ -111,25 +114,26 @@ void RtcpTransceiver::SendCombinedRtcpPacket(
RTC_CHECK(rtcp_transceiver_);
RtcpTransceiverImpl* ptr = rtcp_transceiver_.get();
task_queue_->PostTask(
[ptr, rtcp_packets = std::move(rtcp_packets)]() mutable {
ToQueuedTask([ptr, rtcp_packets = std::move(rtcp_packets)]() mutable {
ptr->SendCombinedRtcpPacket(std::move(rtcp_packets));
});
}));
}
void RtcpTransceiver::SendNack(uint32_t ssrc,
std::vector<uint16_t> sequence_numbers) {
RTC_CHECK(rtcp_transceiver_);
RtcpTransceiverImpl* ptr = rtcp_transceiver_.get();
task_queue_->PostTask(
task_queue_->PostTask(ToQueuedTask(
[ptr, ssrc, sequence_numbers = std::move(sequence_numbers)]() mutable {
ptr->SendNack(ssrc, std::move(sequence_numbers));
});
}));
}
void RtcpTransceiver::SendPictureLossIndication(uint32_t ssrc) {
RTC_CHECK(rtcp_transceiver_);
RtcpTransceiverImpl* ptr = rtcp_transceiver_.get();
task_queue_->PostTask([ptr, ssrc] { ptr->SendPictureLossIndication(ssrc); });
task_queue_->PostTask(
ToQueuedTask([ptr, ssrc] { ptr->SendPictureLossIndication(ssrc); }));
}
void RtcpTransceiver::SendFullIntraRequest(std::vector<uint32_t> ssrcs) {
@ -140,9 +144,10 @@ void RtcpTransceiver::SendFullIntraRequest(std::vector<uint32_t> ssrcs,
bool new_request) {
RTC_CHECK(rtcp_transceiver_);
RtcpTransceiverImpl* ptr = rtcp_transceiver_.get();
task_queue_->PostTask([ptr, ssrcs = std::move(ssrcs), new_request] {
ptr->SendFullIntraRequest(ssrcs, new_request);
});
task_queue_->PostTask(
ToQueuedTask([ptr, ssrcs = std::move(ssrcs), new_request] {
ptr->SendFullIntraRequest(ssrcs, new_request);
}));
}
} // namespace webrtc