Renaming BaseChannel methods and adding comments for added clarity.
There were 3 different meanings for "ReadyToSend", for example, so it
was difficult to understand the meaning at first glance.
Also switching ASSERTs to RTC_DCHECKs.
Review URL: https://codereview.webrtc.org/2269173004 .
Cr-Commit-Position: refs/heads/master@{#13926}
diff --git a/webrtc/pc/channel.cc b/webrtc/pc/channel.cc
index 1312d63..7ec536d 100644
--- a/webrtc/pc/channel.cc
+++ b/webrtc/pc/channel.cc
@@ -15,6 +15,7 @@
#include "webrtc/audio_sink.h"
#include "webrtc/base/bind.h"
#include "webrtc/base/byteorder.h"
+#include "webrtc/base/checks.h"
#include "webrtc/base/common.h"
#include "webrtc/base/copyonwritebuffer.h"
#include "webrtc/base/dscp.h"
@@ -171,7 +172,7 @@
transport_controller_(transport_controller),
rtcp_enabled_(rtcp),
media_channel_(media_channel) {
- ASSERT(worker_thread_ == rtc::Thread::Current());
+ RTC_DCHECK(worker_thread_ == rtc::Thread::Current());
if (transport_controller) {
RTC_DCHECK_EQ(network_thread, transport_controller->network_thread());
}
@@ -180,7 +181,7 @@
BaseChannel::~BaseChannel() {
TRACE_EVENT0("webrtc", "BaseChannel::~BaseChannel");
- ASSERT(worker_thread_ == rtc::Thread::Current());
+ RTC_DCHECK(worker_thread_ == rtc::Thread::Current());
Deinit();
StopConnectionMonitor();
// Eats any outstanding messages or packets.
@@ -280,7 +281,7 @@
RTC_DCHECK(network_thread_->IsCurrent());
if (transport_name == transport_name_) {
- // Nothing to do if transport name isn't changing
+ // Nothing to do if transport name isn't changing.
return true;
}
@@ -289,7 +290,7 @@
// negotiated parameters.
if (ShouldSetupDtlsSrtp_n()) {
// Set |writable_| to false such that UpdateWritableState_w can set up
- // DTLS-SRTP when the writable_ becomes true again.
+ // DTLS-SRTP when |writable_| becomes true again.
writable_ = false;
srtp_filter_.ResetParams();
}
@@ -320,7 +321,7 @@
if (rtcp_transport_channel_) {
// We can only update the RTCP ready to send after set_transport_channel has
// handled channel writability.
- SetReadyToSend(true, rtcp_transport_channel_->writable());
+ SetTransportChannelReadyToSend(true, rtcp_transport_channel_->writable());
}
transport_name_ = transport_name;
return true;
@@ -331,10 +332,10 @@
TransportChannel* old_tc = transport_channel_;
if (!old_tc && !new_tc) {
- // Nothing to do
+ // Nothing to do.
return;
}
- ASSERT(old_tc != new_tc);
+ RTC_DCHECK(old_tc != new_tc);
if (old_tc) {
DisconnectFromTransportChannel(old_tc);
@@ -352,9 +353,16 @@
}
// Update aggregate writable/ready-to-send state between RTP and RTCP upon
- // setting new channel
+ // setting new transport channels.
UpdateWritableState_n();
- SetReadyToSend(false, new_tc && new_tc->writable());
+ // On setting a new channel, assume it's ready to send if it's writable,
+ // because we have no way of knowing otherwise (the channel doesn't give us
+ // "was last send successful?").
+ //
+ // This won't always be accurate (the last SendPacket call from another
+ // BaseChannel could have resulted in an error), but even so, we'll just
+ // encounter the error again and update "ready to send" accordingly.
+ SetTransportChannelReadyToSend(false, new_tc && new_tc->writable());
}
void BaseChannel::SetRtcpTransportChannel_n(TransportChannel* new_tc,
@@ -363,10 +371,10 @@
TransportChannel* old_tc = rtcp_transport_channel_;
if (!old_tc && !new_tc) {
- // Nothing to do
+ // Nothing to do.
return;
}
- ASSERT(old_tc != new_tc);
+ RTC_DCHECK(old_tc != new_tc);
if (old_tc) {
DisconnectFromTransportChannel(old_tc);
@@ -390,7 +398,14 @@
// Update aggregate writable/ready-to-send state between RTP and RTCP upon
// setting new channel
UpdateWritableState_n();
- SetReadyToSend(true, new_tc && new_tc->writable());
+ // On setting a new channel, assume it's ready to send if it's writable,
+ // because we have no way of knowing otherwise (the channel doesn't give us
+ // "was last send successful?").
+ //
+ // This won't always be accurate (the last SendPacket call from another
+ // BaseChannel could have resulted in an error), but even so, we'll just
+ // encounter the error again and update "ready to send" accordingly.
+ SetTransportChannelReadyToSend(true, new_tc && new_tc->writable());
}
}
@@ -487,22 +502,23 @@
return transport_channel_->GetStats(infos);
}
-bool BaseChannel::IsReadyToReceive_w() const {
+bool BaseChannel::IsReadyToReceiveMedia_w() const {
// Receive data if we are enabled and have local content,
return enabled() && IsReceiveContentDirection(local_content_direction_);
}
-bool BaseChannel::IsReadyToSend_w() const {
+bool BaseChannel::IsReadyToSendMedia_w() const {
+ // Need to access some state updated on the network thread.
+ return network_thread_->Invoke<bool>(
+ RTC_FROM_HERE, Bind(&BaseChannel::IsReadyToSendMedia_n, this));
+}
+
+bool BaseChannel::IsReadyToSendMedia_n() const {
// Send outgoing data if we are enabled, have local and remote content,
// and we have had some form of connectivity.
return enabled() && IsReceiveContentDirection(remote_content_direction_) &&
IsSendContentDirection(local_content_direction_) &&
- network_thread_->Invoke<bool>(
- RTC_FROM_HERE, Bind(&BaseChannel::IsTransportReadyToSend_n, this));
-}
-
-bool BaseChannel::IsTransportReadyToSend_n() const {
- return was_ever_writable() &&
+ was_ever_writable() &&
(srtp_filter_.IsActive() || !ShouldSetupDtlsSrtp_n());
}
@@ -570,8 +586,9 @@
}
void BaseChannel::OnReadyToSend(TransportChannel* channel) {
- ASSERT(channel == transport_channel_ || channel == rtcp_transport_channel_);
- SetReadyToSend(channel == rtcp_transport_channel_, true);
+ RTC_DCHECK(channel == transport_channel_ ||
+ channel == rtcp_transport_channel_);
+ SetTransportChannelReadyToSend(channel == rtcp_transport_channel_, true);
}
void BaseChannel::OnDtlsState(TransportChannel* channel,
@@ -595,7 +612,8 @@
CandidatePairInterface* selected_candidate_pair,
int last_sent_packet_id,
bool ready_to_send) {
- ASSERT(channel == transport_channel_ || channel == rtcp_transport_channel_);
+ RTC_DCHECK(channel == transport_channel_ ||
+ channel == rtcp_transport_channel_);
RTC_DCHECK(network_thread_->IsCurrent());
std::string transport_name = channel->transport_name();
rtc::NetworkRoute network_route;
@@ -611,7 +629,7 @@
network_route));
}
-void BaseChannel::SetReadyToSend(bool rtcp, bool ready) {
+void BaseChannel::SetTransportChannelReadyToSend(bool rtcp, bool ready) {
RTC_DCHECK(network_thread_->IsCurrent());
if (rtcp) {
rtcp_ready_to_send_ = ready;
@@ -741,7 +759,7 @@
LOG(LS_ERROR) << "Can't send outgoing " << PacketType(rtcp)
<< " packet when SRTP is inactive and crypto is required";
- ASSERT(false);
+ RTC_DCHECK(false);
return false;
}
@@ -752,7 +770,7 @@
if (ret != static_cast<int>(packet->size())) {
if (channel->GetError() == ENOTCONN) {
LOG(LS_WARNING) << "Got ENOTCONN from transport.";
- SetReadyToSend(rtcp, false);
+ SetTransportChannelReadyToSend(rtcp, false);
}
return false;
}
@@ -883,23 +901,23 @@
}
void BaseChannel::EnableMedia_w() {
- ASSERT(worker_thread_ == rtc::Thread::Current());
+ RTC_DCHECK(worker_thread_ == rtc::Thread::Current());
if (enabled_)
return;
LOG(LS_INFO) << "Channel enabled";
enabled_ = true;
- ChangeState_w();
+ UpdateMediaSendRecvState_w();
}
void BaseChannel::DisableMedia_w() {
- ASSERT(worker_thread_ == rtc::Thread::Current());
+ RTC_DCHECK(worker_thread_ == rtc::Thread::Current());
if (!enabled_)
return;
LOG(LS_INFO) << "Channel disabled";
enabled_ = false;
- ChangeState_w();
+ UpdateMediaSendRecvState_w();
}
void BaseChannel::UpdateWritableState_n() {
@@ -934,7 +952,7 @@
was_ever_writable_ = true;
MaybeSetupDtlsSrtp_n();
writable_ = true;
- ChangeState();
+ UpdateMediaSendRecvState();
}
void BaseChannel::SignalDtlsSetupFailure_n(bool rtcp) {
@@ -945,7 +963,7 @@
}
void BaseChannel::SignalDtlsSetupFailure_s(bool rtcp) {
- ASSERT(signaling_thread() == rtc::Thread::Current());
+ RTC_DCHECK(signaling_thread() == rtc::Thread::Current());
SignalDtlsSetupFailure(this, rtcp);
}
@@ -1005,7 +1023,7 @@
NULL, 0, false,
&dtls_buffer[0], dtls_buffer.size())) {
LOG(LS_WARNING) << "DTLS-SRTP key export failed";
- ASSERT(false); // This should never happen
+ RTC_DCHECK(false); // This should never happen
return false;
}
@@ -1085,7 +1103,7 @@
LOG(LS_INFO) << "Channel not writable (" << content_name_ << ")";
writable_ = false;
- ChangeState();
+ UpdateMediaSendRecvState();
}
bool BaseChannel::SetRtpTransportParameters(
@@ -1208,6 +1226,8 @@
ret = rtcp_mux_filter_.SetOffer(enable, src);
break;
case CA_PRANSWER:
+ // This may activate RTCP muxing, but we don't yet destroy the channel
+ // because the final answer may deactivate it.
ret = rtcp_mux_filter_.SetProvisionalAnswer(enable, src);
break;
case CA_ANSWER:
@@ -1245,12 +1265,12 @@
}
bool BaseChannel::AddRecvStream_w(const StreamParams& sp) {
- ASSERT(worker_thread() == rtc::Thread::Current());
+ RTC_DCHECK(worker_thread() == rtc::Thread::Current());
return media_channel()->AddRecvStream(sp);
}
bool BaseChannel::RemoveRecvStream_w(uint32_t ssrc) {
- ASSERT(worker_thread() == rtc::Thread::Current());
+ RTC_DCHECK(worker_thread() == rtc::Thread::Current());
return media_channel()->RemoveRecvStream(ssrc);
}
@@ -1664,21 +1684,22 @@
}
}
-void BaseChannel::ChangeState() {
+void BaseChannel::UpdateMediaSendRecvState() {
RTC_DCHECK(network_thread_->IsCurrent());
- invoker_.AsyncInvoke<void>(RTC_FROM_HERE, worker_thread_,
- Bind(&BaseChannel::ChangeState_w, this));
+ invoker_.AsyncInvoke<void>(
+ RTC_FROM_HERE, worker_thread_,
+ Bind(&BaseChannel::UpdateMediaSendRecvState_w, this));
}
-void VoiceChannel::ChangeState_w() {
+void VoiceChannel::UpdateMediaSendRecvState_w() {
// Render incoming data if we're the active call, and we have the local
// content. We receive data on the default channel and multiplexed streams.
- bool recv = IsReadyToReceive_w();
+ bool recv = IsReadyToReceiveMedia_w();
media_channel()->SetPlayout(recv);
// Send outgoing data if we're the active call, we have the remote content,
// and we have had some form of connectivity.
- bool send = IsReadyToSend_w();
+ bool send = IsReadyToSendMedia_w();
media_channel()->SetSend(send);
LOG(LS_INFO) << "Changing voice state, recv=" << recv << " send=" << send;
@@ -1693,12 +1714,12 @@
ContentAction action,
std::string* error_desc) {
TRACE_EVENT0("webrtc", "VoiceChannel::SetLocalContent_w");
- ASSERT(worker_thread() == rtc::Thread::Current());
+ RTC_DCHECK(worker_thread() == rtc::Thread::Current());
LOG(LS_INFO) << "Setting local voice description";
const AudioContentDescription* audio =
static_cast<const AudioContentDescription*>(content);
- ASSERT(audio != NULL);
+ RTC_DCHECK(audio != NULL);
if (!audio) {
SafeSetError("Can't find audio content in local description.", error_desc);
return false;
@@ -1730,7 +1751,7 @@
}
set_local_content_direction(content->direction());
- ChangeState_w();
+ UpdateMediaSendRecvState_w();
return true;
}
@@ -1738,12 +1759,12 @@
ContentAction action,
std::string* error_desc) {
TRACE_EVENT0("webrtc", "VoiceChannel::SetRemoteContent_w");
- ASSERT(worker_thread() == rtc::Thread::Current());
+ RTC_DCHECK(worker_thread() == rtc::Thread::Current());
LOG(LS_INFO) << "Setting remote voice description";
const AudioContentDescription* audio =
static_cast<const AudioContentDescription*>(content);
- ASSERT(audio != NULL);
+ RTC_DCHECK(audio != NULL);
if (!audio) {
SafeSetError("Can't find audio content in remote description.", error_desc);
return false;
@@ -1781,7 +1802,7 @@
}
set_remote_content_direction(content->direction());
- ChangeState_w();
+ UpdateMediaSendRecvState_w();
return true;
}
@@ -1826,7 +1847,7 @@
void VoiceChannel::OnMediaMonitorUpdate(
VoiceMediaChannel* media_channel, const VoiceMediaInfo& info) {
- ASSERT(media_channel == this->media_channel());
+ RTC_DCHECK(media_channel == this->media_channel());
SignalMediaMonitor(this, info);
}
@@ -1935,10 +1956,10 @@
return media_channel()->SetRtpReceiveParameters(ssrc, parameters);
}
-void VideoChannel::ChangeState_w() {
+void VideoChannel::UpdateMediaSendRecvState_w() {
// Send outgoing data if we're the active call, we have the remote content,
// and we have had some form of connectivity.
- bool send = IsReadyToSend_w();
+ bool send = IsReadyToSendMedia_w();
if (!media_channel()->SetSend(send)) {
LOG(LS_ERROR) << "Failed to SetSend on video channel";
// TODO(gangji): Report error back to server.
@@ -1976,12 +1997,12 @@
ContentAction action,
std::string* error_desc) {
TRACE_EVENT0("webrtc", "VideoChannel::SetLocalContent_w");
- ASSERT(worker_thread() == rtc::Thread::Current());
+ RTC_DCHECK(worker_thread() == rtc::Thread::Current());
LOG(LS_INFO) << "Setting local video description";
const VideoContentDescription* video =
static_cast<const VideoContentDescription*>(content);
- ASSERT(video != NULL);
+ RTC_DCHECK(video != NULL);
if (!video) {
SafeSetError("Can't find video content in local description.", error_desc);
return false;
@@ -2013,7 +2034,7 @@
}
set_local_content_direction(content->direction());
- ChangeState_w();
+ UpdateMediaSendRecvState_w();
return true;
}
@@ -2021,12 +2042,12 @@
ContentAction action,
std::string* error_desc) {
TRACE_EVENT0("webrtc", "VideoChannel::SetRemoteContent_w");
- ASSERT(worker_thread() == rtc::Thread::Current());
+ RTC_DCHECK(worker_thread() == rtc::Thread::Current());
LOG(LS_INFO) << "Setting remote video description";
const VideoContentDescription* video =
static_cast<const VideoContentDescription*>(content);
- ASSERT(video != NULL);
+ RTC_DCHECK(video != NULL);
if (!video) {
SafeSetError("Can't find video content in remote description.", error_desc);
return false;
@@ -2065,7 +2086,7 @@
}
set_remote_content_direction(content->direction());
- ChangeState_w();
+ UpdateMediaSendRecvState_w();
return true;
}
@@ -2092,7 +2113,7 @@
// audio, video, and data, perhaps by using templates.
void VideoChannel::OnMediaMonitorUpdate(
VideoMediaChannel* media_channel, const VideoMediaInfo &info) {
- ASSERT(media_channel == this->media_channel());
+ RTC_DCHECK(media_channel == this->media_channel());
SignalMediaMonitor(this, info);
}
@@ -2197,12 +2218,12 @@
ContentAction action,
std::string* error_desc) {
TRACE_EVENT0("webrtc", "DataChannel::SetLocalContent_w");
- ASSERT(worker_thread() == rtc::Thread::Current());
+ RTC_DCHECK(worker_thread() == rtc::Thread::Current());
LOG(LS_INFO) << "Setting local data description";
const DataContentDescription* data =
static_cast<const DataContentDescription*>(content);
- ASSERT(data != NULL);
+ RTC_DCHECK(data != NULL);
if (!data) {
SafeSetError("Can't find data content in local description.", error_desc);
return false;
@@ -2245,7 +2266,7 @@
}
set_local_content_direction(content->direction());
- ChangeState_w();
+ UpdateMediaSendRecvState_w();
return true;
}
@@ -2253,11 +2274,11 @@
ContentAction action,
std::string* error_desc) {
TRACE_EVENT0("webrtc", "DataChannel::SetRemoteContent_w");
- ASSERT(worker_thread() == rtc::Thread::Current());
+ RTC_DCHECK(worker_thread() == rtc::Thread::Current());
const DataContentDescription* data =
static_cast<const DataContentDescription*>(content);
- ASSERT(data != NULL);
+ RTC_DCHECK(data != NULL);
if (!data) {
SafeSetError("Can't find data content in remote description.", error_desc);
return false;
@@ -2300,21 +2321,21 @@
}
set_remote_content_direction(content->direction());
- ChangeState_w();
+ UpdateMediaSendRecvState_w();
return true;
}
-void DataChannel::ChangeState_w() {
+void DataChannel::UpdateMediaSendRecvState_w() {
// Render incoming data if we're the active call, and we have the local
// content. We receive data on the default channel and multiplexed streams.
- bool recv = IsReadyToReceive_w();
+ bool recv = IsReadyToReceiveMedia_w();
if (!media_channel()->SetReceive(recv)) {
LOG(LS_ERROR) << "Failed to SetReceive on data channel";
}
// Send outgoing data if we're the active call, we have the remote content,
// and we have had some form of connectivity.
- bool send = IsReadyToSend_w();
+ bool send = IsReadyToSendMedia_w();
if (!media_channel()->SetSend(send)) {
LOG(LS_ERROR) << "Failed to SetSend on data channel";
}
@@ -2384,7 +2405,7 @@
void DataChannel::OnMediaMonitorUpdate(
DataMediaChannel* media_channel, const DataMediaInfo& info) {
- ASSERT(media_channel == this->media_channel());
+ RTC_DCHECK(media_channel == this->media_channel());
SignalMediaMonitor(this, info);
}
diff --git a/webrtc/pc/channel.h b/webrtc/pc/channel.h
index eea1d7f..2a5d3a5 100644
--- a/webrtc/pc/channel.h
+++ b/webrtc/pc/channel.h
@@ -160,7 +160,15 @@
}
// Made public for easier testing.
- void SetReadyToSend(bool rtcp, bool ready);
+ //
+ // Updates "ready to send" for an individual channel, and informs the media
+ // channel that the transport is ready to send if each channel (in use) is
+ // ready to send. This is more specific than just "writable"; it means the
+ // last send didn't return ENOTCONN.
+ //
+ // This should be called whenever a channel's ready-to-send state changes,
+ // or when RTCP muxing becomes active/inactive.
+ void SetTransportChannelReadyToSend(bool rtcp, bool ready);
// Only public for unit tests. Otherwise, consider protected.
int SetOption(SocketType type, rtc::Socket::Option o, int val)
@@ -175,8 +183,10 @@
protected:
virtual MediaChannel* media_channel() const { return media_channel_; }
- // Sets the |transport_channel_| (and |rtcp_transport_channel_|, if |rtcp_| is
- // true). Gets the transport channels from |transport_controller_|.
+
+ // Sets the |transport_channel_| (and |rtcp_transport_channel_|, if
+ // |rtcp_enabled_| is true). Gets the transport channels from
+ // |transport_controller_|.
bool SetTransport_n(const std::string& transport_name);
void SetTransportChannel_n(TransportChannel* transport);
@@ -193,8 +203,18 @@
void set_secure_required(bool secure_required) {
secure_required_ = secure_required;
}
- bool IsReadyToReceive_w() const;
- bool IsReadyToSend_w() const;
+ // These methods verify that:
+ // * The required content description directions have been set.
+ // * The channel is enabled.
+ // * And for sending:
+ // - The SRTP filter is active if it's needed.
+ // - The transport has been writable before, meaning it should be at least
+ // possible to succeed in sending a packet.
+ //
+ // When any of these properties change, UpdateMediaSendRecvState_w should be
+ // called.
+ bool IsReadyToReceiveMedia_w() const;
+ bool IsReadyToSendMedia_w() const;
rtc::Thread* signaling_thread() {
return transport_controller_->signaling_thread();
}
@@ -242,9 +262,14 @@
void EnableMedia_w();
void DisableMedia_w();
+
+ // Performs actions if the RTP/RTCP writable state changed. This should
+ // be called whenever a channel's writable state changes or when RTCP muxing
+ // becomes active/inactive.
void UpdateWritableState_n();
void ChannelWritable_n();
void ChannelNotWritable_n();
+
bool AddRecvStream_w(const StreamParams& sp);
bool RemoveRecvStream_w(uint32_t ssrc);
bool AddSendStream_w(const StreamParams& sp);
@@ -257,8 +282,11 @@
// Set the DTLS-SRTP cipher policy on this channel as appropriate.
bool SetDtlsSrtpCryptoSuites_n(TransportChannel* tc, bool rtcp);
- void ChangeState();
- virtual void ChangeState_w() = 0;
+ // Should be called whenever the conditions for
+ // IsReadyToReceiveMedia/IsReadyToSendMedia are satisfied (or unsatisfied).
+ // Updates the send/recv state of the media channel.
+ void UpdateMediaSendRecvState();
+ virtual void UpdateMediaSendRecvState_w() = 0;
// Gets the content info appropriate to the channel (audio or video).
virtual const ContentInfo* GetFirstContent(
@@ -329,7 +357,7 @@
void SignalSentPacket_n(TransportChannel* channel,
const rtc::SentPacket& sent_packet);
void SignalSentPacket_w(const rtc::SentPacket& sent_packet);
- bool IsTransportReadyToSend_n() const;
+ bool IsReadyToSendMedia_n() const;
void CacheRtpAbsSendTimeHeaderExtension_n(int rtp_abs_sendtime_extn_id);
rtc::Thread* const worker_thread_;
@@ -363,11 +391,12 @@
rtc::CryptoOptions crypto_options_;
int rtp_abs_sendtime_extn_id_ = -1;
- // MediaChannel related members that should be access from worker thread.
+ // MediaChannel related members that should be accessed from the worker
+ // thread.
MediaChannel* const media_channel_;
- // Currently enabled_ flag accessed from signaling thread too, but it can
- // be changed only when signaling thread does sunchronious call to worker
- // thread, so it should be safe.
+ // Currently the |enabled_| flag is accessed from the signaling thread as
+ // well, but it can be changed only when signaling thread does a synchronous
+ // call to the worker thread, so it should be safe.
bool enabled_ = false;
std::vector<StreamParams> local_streams_;
std::vector<StreamParams> remote_streams_;
@@ -458,7 +487,7 @@
size_t len,
const rtc::PacketTime& packet_time,
int flags) override;
- void ChangeState_w() override;
+ void UpdateMediaSendRecvState_w() override;
const ContentInfo* GetFirstContent(const SessionDescription* sdesc) override;
bool SetLocalContent_w(const MediaContentDescription* content,
ContentAction action,
@@ -538,7 +567,7 @@
private:
// overrides from BaseChannel
- void ChangeState_w() override;
+ void UpdateMediaSendRecvState_w() override;
const ContentInfo* GetFirstContent(const SessionDescription* sdesc) override;
bool SetLocalContent_w(const MediaContentDescription* content,
ContentAction action,
@@ -663,7 +692,7 @@
bool SetRemoteContent_w(const MediaContentDescription* content,
ContentAction action,
std::string* error_desc) override;
- void ChangeState_w() override;
+ void UpdateMediaSendRecvState_w() override;
bool WantsPacket(bool rtcp, const rtc::CopyOnWriteBuffer* packet) override;
void OnMessage(rtc::Message* pmsg) override;
diff --git a/webrtc/pc/channel_unittest.cc b/webrtc/pc/channel_unittest.cc
index 7b30547..00382fa 100644
--- a/webrtc/pc/channel_unittest.cc
+++ b/webrtc/pc/channel_unittest.cc
@@ -1862,24 +1862,28 @@
EXPECT_TRUE(media_channel1_->ready_to_send());
// rtp channel becomes not ready to send will be propagated to mediachannel
- network_thread_->Invoke<void>(
- RTC_FROM_HERE, [this] { channel1_->SetReadyToSend(false, false); });
+ network_thread_->Invoke<void>(RTC_FROM_HERE, [this] {
+ channel1_->SetTransportChannelReadyToSend(false, false);
+ });
WaitForThreads();
EXPECT_FALSE(media_channel1_->ready_to_send());
- network_thread_->Invoke<void>(
- RTC_FROM_HERE, [this] { channel1_->SetReadyToSend(false, true); });
+ network_thread_->Invoke<void>(RTC_FROM_HERE, [this] {
+ channel1_->SetTransportChannelReadyToSend(false, true);
+ });
WaitForThreads();
EXPECT_TRUE(media_channel1_->ready_to_send());
// rtcp channel becomes not ready to send will be propagated to mediachannel
- network_thread_->Invoke<void>(
- RTC_FROM_HERE, [this] { channel1_->SetReadyToSend(true, false); });
+ network_thread_->Invoke<void>(RTC_FROM_HERE, [this] {
+ channel1_->SetTransportChannelReadyToSend(true, false);
+ });
WaitForThreads();
EXPECT_FALSE(media_channel1_->ready_to_send());
- network_thread_->Invoke<void>(
- RTC_FROM_HERE, [this] { channel1_->SetReadyToSend(true, true); });
+ network_thread_->Invoke<void>(RTC_FROM_HERE, [this] {
+ channel1_->SetTransportChannelReadyToSend(true, true);
+ });
WaitForThreads();
EXPECT_TRUE(media_channel1_->ready_to_send());
}
@@ -1902,8 +1906,9 @@
WaitForThreads();
EXPECT_TRUE(media_channel1_->ready_to_send());
- network_thread_->Invoke<void>(
- RTC_FROM_HERE, [this] { channel1_->SetReadyToSend(false, false); });
+ network_thread_->Invoke<void>(RTC_FROM_HERE, [this] {
+ channel1_->SetTransportChannelReadyToSend(false, false);
+ });
WaitForThreads();
EXPECT_FALSE(media_channel1_->ready_to_send());
}
