OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
9 */ | 9 */ |
10 | 10 |
(...skipping 1031 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1042 } | 1042 } |
1043 | 1043 |
1044 Transport* const transport_; | 1044 Transport* const transport_; |
1045 RtcEventLog* const event_log_; | 1045 RtcEventLog* const event_log_; |
1046 bool send_failure_; | 1046 bool send_failure_; |
1047 // TODO(terelius): We would like to | 1047 // TODO(terelius): We would like to |
1048 // RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(Sender); | 1048 // RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(Sender); |
1049 // but we can't because of an incorrect warning (C4822) in MVS 2013. | 1049 // but we can't because of an incorrect warning (C4822) in MVS 2013. |
1050 } sender(transport_, event_log_); | 1050 } sender(transport_, event_log_); |
1051 | 1051 |
1052 { | |
1053 rtc::CritScope lock(&critical_section_rtcp_sender_); | |
1054 if (method_ == RtcpMode::kOff) | |
1055 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
| |
1056 } | |
1057 | |
1052 RTC_DCHECK_LE(max_packet_size_, IP_PACKET_SIZE); | 1058 RTC_DCHECK_LE(max_packet_size_, IP_PACKET_SIZE); |
1053 uint8_t buffer[IP_PACKET_SIZE]; | 1059 uint8_t buffer[IP_PACKET_SIZE]; |
1054 return packet.BuildExternalBuffer(buffer, max_packet_size_, &sender) && | 1060 return packet.BuildExternalBuffer(buffer, max_packet_size_, &sender) && |
1055 !sender.send_failure_; | 1061 !sender.send_failure_; |
1056 } | 1062 } |
1057 | 1063 |
1058 } // namespace webrtc | 1064 } // namespace webrtc |
OLD | NEW |