Chromium Code Reviews| Index: webrtc/modules/rtp_rtcp/source/rtcp_sender.cc |
| diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_sender.cc b/webrtc/modules/rtp_rtcp/source/rtcp_sender.cc |
| index 48f7595d77b3757a80d043e69db5ab8a7fba119a..ff535ea4c61499bd01b8aa0356ae5feeb3659f8a 100644 |
| --- a/webrtc/modules/rtp_rtcp/source/rtcp_sender.cc |
| +++ b/webrtc/modules/rtp_rtcp/source/rtcp_sender.cc |
| @@ -1049,6 +1049,12 @@ bool RTCPSender::SendFeedbackPacket(const rtcp::TransportFeedback& packet) { |
| // but we can't because of an incorrect warning (C4822) in MVS 2013. |
| } sender(transport_, event_log_); |
| + { |
| + rtc::CritScope lock(&critical_section_rtcp_sender_); |
| + if (method_ == RtcpMode::kOff) |
| + return false; |
|
brandtr
2017/02/06 13:25:25
Is this a bugfix? If so, consider mentioning it in
stefan-webrtc
2017/02/06 13:35:35
Yes
|
| + } |
| + |
| RTC_DCHECK_LE(max_packet_size_, IP_PACKET_SIZE); |
| uint8_t buffer[IP_PACKET_SIZE]; |
| return packet.BuildExternalBuffer(buffer, max_packet_size_, &sender) && |