Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(84)

Unified Diff: webrtc/modules/audio_coding/codecs/isac/locked_bandwidth_info.h

Issue 1610073003: Switch CriticalSectionWrapper->rtc::CriticalSection in modules/audio_coding. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/audio_coding/codecs/isac/locked_bandwidth_info.h
diff --git a/webrtc/modules/audio_coding/codecs/isac/locked_bandwidth_info.h b/webrtc/modules/audio_coding/codecs/isac/locked_bandwidth_info.h
index bbb040de1d1484f98169416af036f92804097f88..9996cbdbef856c9044cfecc60a3dd041bc508bba 100644
--- a/webrtc/modules/audio_coding/codecs/isac/locked_bandwidth_info.h
+++ b/webrtc/modules/audio_coding/codecs/isac/locked_bandwidth_info.h
@@ -11,10 +11,10 @@
#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_LOCKED_BANDWIDTH_INFO_H_
#define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_LOCKED_BANDWIDTH_INFO_H_
+#include "webrtc/base/criticalsection.h"
#include "webrtc/base/scoped_ptr.h"
#include "webrtc/base/thread_annotations.h"
#include "webrtc/modules/audio_coding/codecs/isac/bandwidth_info.h"
-#include "webrtc/system_wrappers/include/critical_section_wrapper.h"
namespace webrtc {
@@ -26,17 +26,17 @@ class LockedIsacBandwidthInfo final {
~LockedIsacBandwidthInfo();
IsacBandwidthInfo Get() const {
- CriticalSectionScoped cs(lock_.get());
+ rtc::CritScope lock(&lock_);
return bwinfo_;
}
void Set(const IsacBandwidthInfo& bwinfo) {
- CriticalSectionScoped cs(lock_.get());
+ rtc::CritScope lock(&lock_);
bwinfo_ = bwinfo;
}
private:
- const rtc::scoped_ptr<CriticalSectionWrapper> lock_;
+ mutable rtc::CriticalSection lock_;
IsacBandwidthInfo bwinfo_ GUARDED_BY(lock_);
};

Powered by Google App Engine
This is Rietveld 408576698