webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc - Issue 1413333002: system_wrappers: rename interface -> include

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc

Issue 1413333002: system_wrappers: rename interface -> include (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Rebased again! Created 5 years, 1 month 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 unified diff | Download patch

« no previous file with comments | « webrtc/modules/audio_coding/neteq/tools/neteq_rtpplay.cc ('k') | webrtc/modules/audio_conference_mixer/source/memory_pool_posix.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 /*	1 /*

2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.	2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.

3 *	3 *

4 * Use of this source code is governed by a BSD-style license	4 * Use of this source code is governed by a BSD-style license

5 * that can be found in the LICENSE file in the root of the source	5 * that can be found in the LICENSE file in the root of the source

6 * tree. An additional intellectual property rights grant can be found	6 * tree. An additional intellectual property rights grant can be found

7 * in the file PATENTS. All contributing project authors may	7 * in the file PATENTS. All contributing project authors may

8 * be found in the AUTHORS file in the root of the source tree.	8 * be found in the AUTHORS file in the root of the source tree.

9 */	9 */

10	10

11 #include "webrtc/modules/audio_conference_mixer/interface/audio_conference_mixer _defines.h"	11 #include "webrtc/modules/audio_conference_mixer/interface/audio_conference_mixer _defines.h"

12 #include "webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_im pl.h"	12 #include "webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_im pl.h"

13 #include "webrtc/modules/audio_conference_mixer/source/audio_frame_manipulator.h "	13 #include "webrtc/modules/audio_conference_mixer/source/audio_frame_manipulator.h "

14 #include "webrtc/modules/audio_processing/include/audio_processing.h"	14 #include "webrtc/modules/audio_processing/include/audio_processing.h"

15 #include "webrtc/modules/utility/interface/audio_frame_operations.h"	15 #include "webrtc/modules/utility/interface/audio_frame_operations.h"

16 #include "webrtc/system_wrappers/interface/critical_section_wrapper.h"	16 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"

17 #include "webrtc/system_wrappers/interface/trace.h"	17 #include "webrtc/system_wrappers/include/trace.h"

18	18

19 namespace webrtc {	19 namespace webrtc {

20 namespace {	20 namespace {

21	21

22 struct ParticipantFramePair {	22 struct ParticipantFramePair {

23 MixerParticipant* participant;	23 MixerParticipant* participant;

24 AudioFrame* audioFrame;	24 AudioFrame* audioFrame;

25 };	25 };

26	26

27 typedef std::list<ParticipantFramePair*> ParticipantFramePairList;	27 typedef std::list<ParticipantFramePair*> ParticipantFramePairList;

(...skipping 891 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
919	919

920 if(error != _limiter->kNoError) {	920 if(error != _limiter->kNoError) {

921 WEBRTC_TRACE(kTraceError, kTraceAudioMixerServer, _id,	921 WEBRTC_TRACE(kTraceError, kTraceAudioMixerServer, _id,

922 "Error from AudioProcessing: %d", error);	922 "Error from AudioProcessing: %d", error);

923 assert(false);	923 assert(false);

924 return false;	924 return false;

925 }	925 }

926 return true;	926 return true;

927 }	927 }

928 } // namespace webrtc	928 } // namespace webrtc

OLD	NEW