| Index: webrtc/voice_engine/channel.cc
|
| diff --git a/webrtc/voice_engine/channel.cc b/webrtc/voice_engine/channel.cc
|
| index 66f14bd46326dd994b9f422e43dec84832820ead..6a30fbce47f7f1669de8c6380724496365b979de 100644
|
| --- a/webrtc/voice_engine/channel.cc
|
| +++ b/webrtc/voice_engine/channel.cc
|
| @@ -2813,6 +2813,13 @@ uint32_t Channel::EncodeAndSend() {
|
| return 0;
|
| }
|
|
|
| +void Channel::set_associate_send_channel(const ChannelOwner& channel) {
|
| + RTC_DCHECK(!channel.channel() ||
|
| + channel.channel()->ChannelId() != _channelId);
|
| + rtc::CritScope lock(&assoc_send_channel_lock_);
|
| + associate_send_channel_ = channel;
|
| +}
|
| +
|
| void Channel::DisassociateSendChannel(int channel_id) {
|
| rtc::CritScope lock(&assoc_send_channel_lock_);
|
| Channel* channel = associate_send_channel_.channel();
|
|
|