| Index: webrtc/modules/rtp_rtcp/include/flexfec_sender.h
|
| diff --git a/webrtc/modules/rtp_rtcp/include/flexfec_sender.h b/webrtc/modules/rtp_rtcp/include/flexfec_sender.h
|
| index 48d3da02ac2487e1197ffdd41c226c2ca3a2ef5a..be29468d5d155fdf38a85638cf8af555f5796149 100644
|
| --- a/webrtc/modules/rtp_rtcp/include/flexfec_sender.h
|
| +++ b/webrtc/modules/rtp_rtcp/include/flexfec_sender.h
|
| @@ -15,8 +15,8 @@
|
| #include <vector>
|
|
|
| #include "webrtc/base/basictypes.h"
|
| +#include "webrtc/base/criticalsection.h"
|
| #include "webrtc/base/random.h"
|
| -#include "webrtc/base/sequenced_task_checker.h"
|
| #include "webrtc/config.h"
|
| #include "webrtc/modules/include/module_common_types.h"
|
| #include "webrtc/modules/rtp_rtcp/include/flexfec_sender.h"
|
| @@ -62,9 +62,9 @@ class FlexfecSender {
|
| private:
|
| // Utility.
|
| Clock* const clock_;
|
| - Random random_ GUARDED_BY(sequence_checker_);
|
| - int64_t last_generated_packet_ms_ GUARDED_BY(sequence_checker_);
|
| - rtc::SequencedTaskChecker sequence_checker_;
|
| + Random random_ GUARDED_BY(crit_sect_);
|
| + int64_t last_generated_packet_ms_ GUARDED_BY(crit_sect_);
|
| + rtc::CriticalSection crit_sect_;
|
|
|
| // Config.
|
| const int payload_type_;
|
| @@ -72,10 +72,10 @@ class FlexfecSender {
|
| const uint32_t ssrc_;
|
| const uint32_t protected_media_ssrc_;
|
| // Sequence number of next packet to generate.
|
| - uint16_t seq_num_ GUARDED_BY(sequence_checker_);
|
| + uint16_t seq_num_ GUARDED_BY(crit_sect_);
|
|
|
| // Implementation.
|
| - UlpfecGenerator ulpfec_generator_ GUARDED_BY(sequence_checker_);
|
| + UlpfecGenerator ulpfec_generator_ GUARDED_BY(crit_sect_);
|
| const RtpHeaderExtensionMap rtp_header_extension_map_;
|
| };
|
|
|
|
|