zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add const or GUARDED_BY on a few ChannelSend members

Browse Source 
Bug: webrtc:9719
Change-Id: I537775b3ca7ebdb06d43b2cca911a221add7d7c9
Reviewed-on: https://webrtc-review.googlesource.com/c/111382
Reviewed-by: Fredrik Solenberg <solenberg@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25706}
This commit is contained in:
Niels Möller
2018-11-19 16:08:42 +01:00
committed by Commit Bot
parent 5f00995964
commit 985a1f3524
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
audio/channel_send.cc
View File

@ -259,7 +259,7 @@ class ChannelSend
uint16_t send_sequence_number_; uint16_t send_sequence_number_;
// uses // uses
ProcessThread* _moduleProcessThreadPtr; ProcessThread* const _moduleProcessThreadPtr;
Transport* _transportPtr; // WebRtc socket or external transport Transport* _transportPtr; // WebRtc socket or external transport
RmsLevel rms_level_ RTC_GUARDED_BY(encoder_queue_); RmsLevel rms_level_ RTC_GUARDED_BY(encoder_queue_);
bool input_mute_ RTC_GUARDED_BY(volume_settings_critsect_); bool input_mute_ RTC_GUARDED_BY(volume_settings_critsect_);
@ -273,13 +273,14 @@ class ChannelSend
size_t rtp_overhead_per_packet_ RTC_GUARDED_BY(overhead_per_packet_lock_); size_t rtp_overhead_per_packet_ RTC_GUARDED_BY(overhead_per_packet_lock_);
rtc::CriticalSection overhead_per_packet_lock_; rtc::CriticalSection overhead_per_packet_lock_;
// RtcpBandwidthObserver // RtcpBandwidthObserver
std::unique_ptr<VoERtcpObserver> rtcp_observer_; const std::unique_ptr<VoERtcpObserver> rtcp_observer_;
PacketRouter* packet_router_ = nullptr; PacketRouter* packet_router_ RTC_GUARDED_BY(&worker_thread_checker_) =
std::unique_ptr<TransportFeedbackProxy> feedback_observer_proxy_; nullptr;
std::unique_ptr<TransportSequenceNumberProxy> seq_num_allocator_proxy_; const std::unique_ptr<TransportFeedbackProxy> feedback_observer_proxy_;
std::unique_ptr<RtpPacketSenderProxy> rtp_packet_sender_proxy_; const std::unique_ptr<TransportSequenceNumberProxy> seq_num_allocator_proxy_;
std::unique_ptr<RateLimiter> retransmission_rate_limiter_; const std::unique_ptr<RtpPacketSenderProxy> rtp_packet_sender_proxy_;
const std::unique_ptr<RateLimiter> retransmission_rate_limiter_;
rtc::ThreadChecker construction_thread_; rtc::ThreadChecker construction_thread_;
@ -287,7 +288,7 @@ class ChannelSend
rtc::CriticalSection encoder_queue_lock_; rtc::CriticalSection encoder_queue_lock_;
bool encoder_queue_is_active_ RTC_GUARDED_BY(encoder_queue_lock_) = false; bool encoder_queue_is_active_ RTC_GUARDED_BY(encoder_queue_lock_) = false;
rtc::TaskQueue* encoder_queue_ = nullptr; rtc::TaskQueue* const encoder_queue_ = nullptr;
MediaTransportInterface* const media_transport_; MediaTransportInterface* const media_transport_;
int media_transport_sequence_number_ RTC_GUARDED_BY(encoder_queue_) = 0; int media_transport_sequence_number_ RTC_GUARDED_BY(encoder_queue_) = 0;
@ -306,7 +307,7 @@ class ChannelSend
// E2EE Audio Frame Encryption // E2EE Audio Frame Encryption
rtc::scoped_refptr<FrameEncryptorInterface> frame_encryptor_; rtc::scoped_refptr<FrameEncryptorInterface> frame_encryptor_;
// E2EE Frame Encryption Options // E2EE Frame Encryption Options
webrtc::CryptoOptions crypto_options_; const webrtc::CryptoOptions crypto_options_;
rtc::CriticalSection bitrate_crit_section_; rtc::CriticalSection bitrate_crit_section_;
int configured_bitrate_bps_ RTC_GUARDED_BY(bitrate_crit_section_) = 0; int configured_bitrate_bps_ RTC_GUARDED_BY(bitrate_crit_section_) = 0;