webrtc/modules/audio_mixer/audio_mixer_impl.h - Issue 2439283002: Elimiteted race condition in the AudioMixer.

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_mixer/audio_mixer_impl.h

Issue 2439283002: Elimiteted race condition in the AudioMixer. (Closed)

Patch Set: Removed previous change, now holding lock a little longer. Created 4 years, 2 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:

Index: webrtc/modules/audio_mixer/audio_mixer_impl.h

diff --git a/webrtc/modules/audio_mixer/audio_mixer_impl.h b/webrtc/modules/audio_mixer/audio_mixer_impl.h

index 876284fac6b3bedf83f04f133adba4ee9a1b4bb1..e2f55fce400ae76dae5d301e8cd1c26103ee9900 100644

--- a/webrtc/modules/audio_mixer/audio_mixer_impl.h

+++ b/webrtc/modules/audio_mixer/audio_mixer_impl.h

@@ -57,7 +57,7 @@ class AudioMixerImpl : public AudioMixer {

void Mix(int sample_rate_hz,

size_t number_of_channels,

- AudioFrame* audio_frame_for_mixing) override;

+ AudioFrame* audio_frame_for_mixing) override LOCKS_EXCLUDED(crit_);

// Returns true if the source was mixed last round. Returns

// false and logs an error if the source was never added to the

« no previous file with comments | « no previous file | webrtc/modules/audio_mixer/audio_mixer_impl.cc » ('j') | no next file with comments »