From 8b5c345ee55e390c7e78241e5924c6674dc5aa3f Mon Sep 17 00:00:00 2001 From: brandtr Date: Mon, 19 Dec 2016 10:02:30 -0800 Subject: [PATCH] Add GUARDED_BY's in FlexfecReceiver. BUG=webrtc:5654 Review-Url: https://codereview.webrtc.org/2589583004 Cr-Commit-Position: refs/heads/master@{#15688} --- .../modules/rtp_rtcp/include/flexfec_receiver.h | 15 +++++++++------ .../modules/rtp_rtcp/source/flexfec_receiver.cc | 9 ++++----- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/webrtc/modules/rtp_rtcp/include/flexfec_receiver.h b/webrtc/modules/rtp_rtcp/include/flexfec_receiver.h index dc90f045d5..721d6c592f 100644 --- a/webrtc/modules/rtp_rtcp/include/flexfec_receiver.h +++ b/webrtc/modules/rtp_rtcp/include/flexfec_receiver.h @@ -57,15 +57,18 @@ class FlexfecReceiver { const uint32_t protected_media_ssrc_; // Erasure code interfacing and callback. - std::unique_ptr erasure_code_; - ForwardErrorCorrection::ReceivedPacketList received_packets_; - ForwardErrorCorrection::RecoveredPacketList recovered_packets_; - RecoveredPacketReceiver* const callback_; + std::unique_ptr erasure_code_ + GUARDED_BY(sequence_checker_); + ForwardErrorCorrection::ReceivedPacketList received_packets_ + GUARDED_BY(sequence_checker_); + ForwardErrorCorrection::RecoveredPacketList recovered_packets_ + GUARDED_BY(sequence_checker_); + RecoveredPacketReceiver* const callback_ GUARDED_BY(sequence_checker_); // Logging and stats. Clock* const clock_; - int64_t last_recovered_packet_ms_; - FecPacketCounter packet_counter_; + int64_t last_recovered_packet_ms_ GUARDED_BY(sequence_checker_); + FecPacketCounter packet_counter_ GUARDED_BY(sequence_checker_); rtc::SequencedTaskChecker sequence_checker_; }; diff --git a/webrtc/modules/rtp_rtcp/source/flexfec_receiver.cc b/webrtc/modules/rtp_rtcp/source/flexfec_receiver.cc index 2c97475491..369dd31ae1 100644 --- a/webrtc/modules/rtp_rtcp/source/flexfec_receiver.cc +++ b/webrtc/modules/rtp_rtcp/source/flexfec_receiver.cc @@ -49,8 +49,7 @@ FlexfecReceiver::~FlexfecReceiver() = default; bool FlexfecReceiver::AddAndProcessReceivedPacket(const uint8_t* packet, size_t packet_length) { - RTC_DCHECK(sequence_checker_.CalledSequentially()); - + RTC_DCHECK_CALLED_SEQUENTIALLY(&sequence_checker_); if (!AddReceivedPacket(packet, packet_length)) { return false; } @@ -58,13 +57,13 @@ bool FlexfecReceiver::AddAndProcessReceivedPacket(const uint8_t* packet, } FecPacketCounter FlexfecReceiver::GetPacketCounter() const { - RTC_DCHECK(sequence_checker_.CalledSequentially()); + RTC_DCHECK_CALLED_SEQUENTIALLY(&sequence_checker_); return packet_counter_; } bool FlexfecReceiver::AddReceivedPacket(const uint8_t* packet, size_t packet_length) { - RTC_DCHECK(sequence_checker_.CalledSequentially()); + RTC_DCHECK_CALLED_SEQUENTIALLY(&sequence_checker_); // RTP packets with a full base header (12 bytes), but without payload, // could conceivably be useful in the decoding. Therefore we check @@ -130,7 +129,7 @@ bool FlexfecReceiver::AddReceivedPacket(const uint8_t* packet, // FlexFEC decoder, and we therefore do not interfere with the reception // of non-recovered media packets. bool FlexfecReceiver::ProcessReceivedPackets() { - RTC_DCHECK(sequence_checker_.CalledSequentially()); + RTC_DCHECK_CALLED_SEQUENTIALLY(&sequence_checker_); // Decode. if (!received_packets_.empty()) {