Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(251)

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

Issue 2784873002: Delete unneeded includes of deprecated system_wrappers include files. (Closed)
Patch Set: Delete unneeded includes of system_wrappers/include/critical_section_wrapper.h Created 3 years, 8 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 unified diff | Download patch
OLDNEW
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/audio/utility/audio_frame_operations.h" 11 #include "webrtc/audio/utility/audio_frame_operations.h"
12 #include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer_d efines.h" 12 #include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer_d efines.h"
13 #include "webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_im pl.h" 13 #include "webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_im pl.h"
14 #include "webrtc/modules/audio_conference_mixer/source/audio_frame_manipulator.h " 14 #include "webrtc/modules/audio_conference_mixer/source/audio_frame_manipulator.h "
15 #include "webrtc/modules/audio_processing/include/audio_processing.h" 15 #include "webrtc/modules/audio_processing/include/audio_processing.h"
16 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
17 #include "webrtc/system_wrappers/include/trace.h" 16 #include "webrtc/system_wrappers/include/trace.h"
18 17
19 namespace webrtc { 18 namespace webrtc {
20 namespace { 19 namespace {
21 20
22 struct ParticipantFrameStruct { 21 struct ParticipantFrameStruct {
23 ParticipantFrameStruct(MixerParticipant* p, AudioFrame* a, bool m) 22 ParticipantFrameStruct(MixerParticipant* p, AudioFrame* a, bool m)
24 : participant(p), audioFrame(a), muted(m) {} 23 : participant(p), audioFrame(a), muted(m) {}
25 MixerParticipant* participant; 24 MixerParticipant* participant;
26 AudioFrame* audioFrame; 25 AudioFrame* audioFrame;
(...skipping 890 matching lines...) Expand 10 before | Expand all | Expand 10 after
917 916
918 if(error != _limiter->kNoError) { 917 if(error != _limiter->kNoError) {
919 WEBRTC_TRACE(kTraceError, kTraceAudioMixerServer, _id, 918 WEBRTC_TRACE(kTraceError, kTraceAudioMixerServer, _id,
920 "Error from AudioProcessing: %d", error); 919 "Error from AudioProcessing: %d", error);
921 assert(false); 920 assert(false);
922 return false; 921 return false;
923 } 922 }
924 return true; 923 return true;
925 } 924 }
926 } // namespace webrtc 925 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/test/opus_test.cc ('k') | webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698