webrtc/modules/modules.gyp - Issue 2111293003: Removed callback between old AudioConferenceMixer and OutputMixer. The audio frame with mixed audio…

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/modules.gyp

Issue 2111293003: Removed callback between old AudioConferenceMixer and OutputMixer. The audio frame with mixed audio… (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@new_mixer_format

Patch Set: Removed asserts, decreased lock holding time & minor changes. Created 4 years, 5 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/modules.gyp

diff --git a/webrtc/modules/modules.gyp b/webrtc/modules/modules.gyp

index 4e2a14eb35c8642bf6f11269d7355f8eefa97be7..14a1fade1a818dc9ad21885d64cd8bb9deaf477b 100644

--- a/webrtc/modules/modules.gyp

+++ b/webrtc/modules/modules.gyp

@@ -12,6 +12,7 @@

'audio_coding/audio_coding.gypi',

'audio_conference_mixer/audio_conference_mixer.gypi',

'audio_device/audio_device.gypi',

+ 'audio_mixer/audio_mixer.gypi',

'audio_processing/audio_processing.gypi',

'bitrate_controller/bitrate_controller.gypi',

'congestion_controller/congestion_controller.gypi',

@@ -126,6 +127,7 @@

'audio_coding_module',

'audio_conference_mixer',

'audio_device' ,

+ 'audio_mixer',

'audio_processing',

'audioproc_test_utils',

'bitrate_controller',

@@ -231,6 +233,7 @@

'audio_coding/neteq/tools/packet_unittest.cc',

'audio_conference_mixer/test/audio_conference_mixer_unittest.cc',

'audio_device/fine_audio_buffer_unittest.cc',

+ 'audio_mixer/test/audio_mixer_unittest.cc',

'audio_processing/aec/echo_cancellation_unittest.cc',

'audio_processing/aec/system_delay_unittest.cc',

'audio_processing/agc/agc_manager_direct_unittest.cc',

« webrtc/modules/audio_mixer/source/new_audio_conference_mixer_impl.cc ('K') | « webrtc/modules/audio_mixer/test/audio_mixer_unittest.cc ('k') | no next file » | no next file with comments »