webrtc/voice_engine/transmit_mixer.h - Issue 1607353002: Swap use of CriticalSectionWrapper with rtc::CriticalSection in voice_engine/

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/voice_engine/transmit_mixer.h

Issue 1607353002: Swap use of CriticalSectionWrapper with rtc::CriticalSection in voice_engine/ (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

« webrtc/voice_engine/statistics.cc ('K') | « webrtc/voice_engine/test/auto_test/voe_standard_test.h ('k') | webrtc/voice_engine/transmit_mixer.cc » ('j') | webrtc/voice_engine/transmit_mixer.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/voice_engine/transmit_mixer.h

diff --git a/webrtc/voice_engine/transmit_mixer.h b/webrtc/voice_engine/transmit_mixer.h

index 0aee1062316ce930c18a6bd59c09d4f8eb721b60..e0246cf4ceaa9595f6bf77a4d908dd20ab42e132 100644

--- a/webrtc/voice_engine/transmit_mixer.h

+++ b/webrtc/voice_engine/transmit_mixer.h

@@ -11,6 +11,7 @@

#ifndef WEBRTC_VOICE_ENGINE_TRANSMIT_MIXER_H

#define WEBRTC_VOICE_ENGINE_TRANSMIT_MIXER_H

+#include "webrtc/base/criticalsection.h"

#include "webrtc/base/scoped_ptr.h"

#include "webrtc/common_audio/resampler/include/push_resampler.h"

#include "webrtc/common_types.h"

@@ -210,8 +211,8 @@ private:

bool _fileCallRecording;

voe::AudioLevel _audioLevel;

// protect file instances and their variables in MixedParticipants()

- CriticalSectionWrapper& _critSect;

- CriticalSectionWrapper& _callbackCritSect;

+ rtc::CriticalSection _critSect;

+ rtc::CriticalSection _callbackCritSect;

#ifdef WEBRTC_VOICE_ENGINE_TYPING_DETECTION

webrtc::TypingDetection _typingDetection;