webrtc/modules/audio_coding/neteq/neteq_impl.h - Issue 1610073003: Switch CriticalSectionWrapper->rtc::CriticalSection in modules/audio_coding.

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/modules/audio_coding/neteq/neteq_impl.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

« no previous file with comments | « webrtc/modules/audio_coding/codecs/isac/locked_bandwidth_info.cc ('k') | webrtc/modules/audio_coding/neteq/neteq_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/audio_coding/neteq/neteq_impl.h

diff --git a/webrtc/modules/audio_coding/neteq/neteq_impl.h b/webrtc/modules/audio_coding/neteq/neteq_impl.h

index 940deadd2f4798aba6115babe4c2a560f81437a8..817b697bcf25bed46e039c4c0e71f26a50c75144 100644

--- a/webrtc/modules/audio_coding/neteq/neteq_impl.h

+++ b/webrtc/modules/audio_coding/neteq/neteq_impl.h

@@ -14,6 +14,7 @@

#include <string>

#include "webrtc/base/constructormagic.h"

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

#include "webrtc/base/scoped_ptr.h"

#include "webrtc/base/thread_annotations.h"

#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h"

@@ -32,7 +33,6 @@ class Accelerate;

class BackgroundNoise;

class BufferLevelFilter;

class ComfortNoise;

-class CriticalSectionWrapper;

class DecisionLogic;

class DecoderDatabase;

class DelayManager;

@@ -338,7 +338,7 @@ class NetEqImpl : public webrtc::NetEq {

// Creates DecisionLogic object with the mode given by |playout_mode_|.

virtual void CreateDecisionLogic() EXCLUSIVE_LOCKS_REQUIRED(crit_sect_);

- const rtc::scoped_ptr<CriticalSectionWrapper> crit_sect_;

+ mutable rtc::CriticalSection crit_sect_;

const rtc::scoped_ptr<BufferLevelFilter> buffer_level_filter_

GUARDED_BY(crit_sect_);

const rtc::scoped_ptr<DecoderDatabase> decoder_database_