| 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 a3de360cf6a4a399eb82bbfa5353bf2e83061d2a..283644e3bc0ed5ea856bc912c9f67b853b67c9fe 100644
|
| --- a/webrtc/modules/rtp_rtcp/source/rtcp_sender.cc
|
| +++ b/webrtc/modules/rtp_rtcp/source/rtcp_sender.cc
|
| @@ -158,13 +158,12 @@ RTCPSender::RTCPSender(
|
| Clock* clock,
|
| ReceiveStatistics* receive_statistics,
|
| RtcpPacketTypeCounterObserver* packet_type_counter_observer,
|
| - RtcEventLog* event_log,
|
| Transport* outgoing_transport)
|
| : audio_(audio),
|
| clock_(clock),
|
| random_(clock_->TimeInMicroseconds()),
|
| method_(RtcpMode::kOff),
|
| - event_log_(event_log),
|
| + event_log_(nullptr),
|
| transport_(outgoing_transport),
|
|
|
| critical_section_rtcp_sender_(
|
| @@ -772,6 +771,7 @@ int32_t RTCPSender::SendCompoundRTCP(
|
| const uint16_t* nack_list,
|
| bool repeat,
|
| uint64_t pictureID) {
|
| + CriticalSectionScoped event_lock(event_log_crit_.get());
|
| PacketContainer container(transport_, event_log_);
|
| {
|
| CriticalSectionScoped lock(critical_section_rtcp_sender_.get());
|
| @@ -1024,6 +1024,7 @@ bool RTCPSender::AllVolatileFlagsConsumed() const {
|
| }
|
|
|
| bool RTCPSender::SendFeedbackPacket(const rtcp::TransportFeedback& packet) {
|
| + CriticalSectionScoped lock(event_log_crit_.get());
|
| class Sender : public rtcp::RtcpPacket::PacketReadyCallback {
|
| public:
|
| Sender(Transport* transport, RtcEventLog* event_log)
|
| @@ -1053,4 +1054,8 @@ bool RTCPSender::SendFeedbackPacket(const rtcp::TransportFeedback& packet) {
|
| !sender.send_failure_;
|
| }
|
|
|
| +void RTCPSender::SetRtcEventLog(webrtc::RtcEventLog* event_log) {
|
| + CriticalSectionScoped lock(event_log_crit_.get());
|
| + event_log_ = event_log;
|
| +}
|
| } // namespace webrtc
|
|
|