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

Using lambdas instead of rtc::Bind in BaseChannel.

Browse Source 
This makes it easier to follow the flow in a debugger and reduces
the number of methods.

Bug: webrtc:9883
Change-Id: If485ff08a223a3986ff24b29ebf4d37c325f0f26
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/152669
Reviewed-by: Henrik Boström <hbos@webrtc.org>
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29180}
This commit is contained in:
Sebastian Jansson 2019-09-12 17:39:18 +02:00 committed by Commit Bot
parent 262bbaee61
commit 01be33b35e
2 changed files with 15 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
pc/channel.cc
View File

@ -526,20 +526,14 @@ void BaseChannel::OnPacketReceived(bool rtcp,
}
invoker_.AsyncInvoke<void>(
RTC_FROM_HERE, worker_thread_,
Bind(&BaseChannel::ProcessPacket, this, rtcp, packet, packet_time_us));
}
void BaseChannel::ProcessPacket(bool rtcp,
const rtc::CopyOnWriteBuffer& packet,
int64_t packet_time_us) {
RTC_DCHECK(worker_thread_->IsCurrent());
if (rtcp) {
media_channel_->OnRtcpReceived(packet, packet_time_us);
} else {
media_channel_->OnPacketReceived(packet, packet_time_us);
}
RTC_FROM_HERE, worker_thread_, [this, rtcp, packet, packet_time_us] {
RTC_DCHECK(worker_thread_->IsCurrent());
if (rtcp) {
media_channel_->OnRtcpReceived(packet, packet_time_us);
} else {
media_channel_->OnPacketReceived(packet, packet_time_us);
}
});
}
void BaseChannel::EnableMedia_w() {
@ -788,14 +782,11 @@ void BaseChannel::FlushRtcpMessages_n() {
void BaseChannel::SignalSentPacket_n(const rtc::SentPacket& sent_packet) {
RTC_DCHECK(network_thread_->IsCurrent());
invoker_.AsyncInvoke<void>(
RTC_FROM_HERE, worker_thread_,
rtc::Bind(&BaseChannel::SignalSentPacket_w, this, sent_packet));
}
void BaseChannel::SignalSentPacket_w(const rtc::SentPacket& sent_packet) {
RTC_DCHECK(worker_thread_->IsCurrent());
SignalSentPacket(sent_packet);
invoker_.AsyncInvoke<void>(RTC_FROM_HERE, worker_thread_,
[this, sent_packet] {
RTC_DCHECK(worker_thread_->IsCurrent());
SignalSentPacket(sent_packet);
});
}
VoiceChannel::VoiceChannel(rtc::Thread* worker_thread,
@ -827,9 +818,8 @@ VoiceChannel::~VoiceChannel() {
void BaseChannel::UpdateMediaSendRecvState() {
RTC_DCHECK(network_thread_->IsCurrent());
invoker_.AsyncInvoke<void>(
RTC_FROM_HERE, worker_thread_,
Bind(&BaseChannel::UpdateMediaSendRecvState_w, this));
invoker_.AsyncInvoke<void>(RTC_FROM_HERE, worker_thread_,
[this] { UpdateMediaSendRecvState_w(); });
}
void BaseChannel::OnNetworkRouteChanged(

4
pc/channel.h
View File

@ -227,9 +227,6 @@ class BaseChannel : public ChannelInterface,
void OnPacketReceived(bool rtcp,
const rtc::CopyOnWriteBuffer& packet,
int64_t packet_time_us);
void ProcessPacket(bool rtcp,
const rtc::CopyOnWriteBuffer& packet,
int64_t packet_time_us);
void EnableMedia_w();
void DisableMedia_w();
@ -294,7 +291,6 @@ class BaseChannel : public ChannelInterface,
bool ConnectToRtpTransport();
void DisconnectFromRtpTransport();
void SignalSentPacket_n(const rtc::SentPacket& sent_packet);
void SignalSentPacket_w(const rtc::SentPacket& sent_packet);
bool IsReadyToSendMedia_n() const;
// MediaTransportNetworkChangeCallback override.