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

Missing use of RTC_GUARDED_BY in PacedSender

Browse Source 
PacedSender::probing_send_failure_ and PacedSender::packet_counter_ should probably also be protected by the critical section.
(This isn't the cause of webrtc:8331.)

TBR=stefan@webrtc.org

Bug: webrtc:8331
Change-Id: I94ebe77341137aa511c736d18a63e3e8ec0d1bac
Reviewed-on: https://webrtc-review.googlesource.com/12220
Commit-Queue: Elad Alon <eladalon@webrtc.org>
Reviewed-by: Fredrik Solenberg <solenberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20324}
This commit is contained in:
Elad Alon
2017-10-17 14:17:54 +02:00
committed by Commit Bot
parent 5fc130b065
commit 44b1fa43be
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/pacing/paced_sender.cc
View File

@ -102,8 +102,8 @@ void PacedSender::Resume() {
}
void PacedSender::SetProbingEnabled(bool enabled) {
RTC_CHECK_EQ(0, packet_counter_);
rtc::CritScope cs(&critsect_);
RTC_CHECK_EQ(0, packet_counter_);
prober_->SetEnabled(enabled);
}

4
modules/pacing/paced_sender.h
View File

@ -173,7 +173,7 @@ class PacedSender : public Pacer {
std::unique_ptr<IntervalBudget> padding_budget_ RTC_GUARDED_BY(critsect_);
std::unique_ptr<BitrateProber> prober_ RTC_GUARDED_BY(critsect_);
bool probing_send_failure_;
bool probing_send_failure_ RTC_GUARDED_BY(critsect_);
// Actual configured bitrates (media_budget_ may temporarily be higher in
// order to meet pace time constraint).
uint32_t estimated_bitrate_bps_ RTC_GUARDED_BY(critsect_);
@ -185,7 +185,7 @@ class PacedSender : public Pacer {
int64_t first_sent_packet_ms_ RTC_GUARDED_BY(critsect_);
std::unique_ptr<PacketQueue> packets_ RTC_GUARDED_BY(critsect_);
uint64_t packet_counter_;
uint64_t packet_counter_ RTC_GUARDED_BY(critsect_);
ProcessThread* process_thread_ = nullptr;
float pacing_factor_ RTC_GUARDED_BY(critsect_);