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

Unified Diff: webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h

Issue 2772573006: Remove CriticalSectionWrapper from audio conference mixer. (Closed)
Patch Set: Created 3 years, 9 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
« no previous file with comments | « no previous file | webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h
diff --git a/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h b/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h
index c2fbe98fa09ce9c5d6f86e4b62377a5e68111e13..e5065a4b56916e75017fb9078913f62f2b8d7195 100644
--- a/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h
+++ b/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h
@@ -15,6 +15,7 @@
#include <map>
#include <memory>
+#include "webrtc/base/criticalsection.h"
#include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer.h"
#include "webrtc/modules/audio_conference_mixer/source/memory_pool.h"
#include "webrtc/modules/audio_conference_mixer/source/time_scheduler.h"
@@ -23,7 +24,6 @@
namespace webrtc {
class AudioProcessing;
-class CriticalSectionWrapper;
struct FrameAndMuteInfo {
FrameAndMuteInfo(AudioFrame* f, bool m) : frame(f), muted(m) {}
@@ -148,8 +148,8 @@ private:
bool LimitMixedAudio(AudioFrame* mixedAudio) const;
- std::unique_ptr<CriticalSectionWrapper> _crit;
- std::unique_ptr<CriticalSectionWrapper> _cbCrit;
+ const rtc::CriticalSection _crit;
+ const rtc::CriticalSection _cbCrit;
int32_t _id;
« no previous file with comments | « no previous file | webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698