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

Side by Side Diff: webrtc/voice_engine/output_mixer.h

Issue 2969623003: Update includes for webrtc/{base => rtc_base} rename (2/3) (Closed)
Patch Set: Rebased onto 224e65939af87443addfc5bb500fbf434728bd1c and restored sorting in clock.cc Created 3 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 unified diff | Download patch
« no previous file with comments | « webrtc/voice_engine/include/voe_base.h ('k') | webrtc/voice_engine/output_mixer.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef WEBRTC_VOICE_ENGINE_OUTPUT_MIXER_H_ 11 #ifndef WEBRTC_VOICE_ENGINE_OUTPUT_MIXER_H_
12 #define WEBRTC_VOICE_ENGINE_OUTPUT_MIXER_H_ 12 #define WEBRTC_VOICE_ENGINE_OUTPUT_MIXER_H_
13 13
14 #include <memory> 14 #include <memory>
15 15
16 #include "webrtc/base/criticalsection.h"
17 #include "webrtc/common_audio/resampler/include/push_resampler.h" 16 #include "webrtc/common_audio/resampler/include/push_resampler.h"
18 #include "webrtc/common_types.h" 17 #include "webrtc/common_types.h"
19 #include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer.h " 18 #include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer.h "
20 #include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer_d efines.h" 19 #include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer_d efines.h"
20 #include "webrtc/rtc_base/criticalsection.h"
21 #include "webrtc/voice_engine/file_recorder.h" 21 #include "webrtc/voice_engine/file_recorder.h"
22 22
23 namespace webrtc { 23 namespace webrtc {
24 24
25 class AudioProcessing; 25 class AudioProcessing;
26 class FileWrapper; 26 class FileWrapper;
27 27
28 namespace voe { 28 namespace voe {
29 29
30 class Statistics; 30 class Statistics;
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 int _mixingFrequencyHz; 99 int _mixingFrequencyHz;
100 std::unique_ptr<FileRecorder> output_file_recorder_; 100 std::unique_ptr<FileRecorder> output_file_recorder_;
101 bool _outputFileRecording; 101 bool _outputFileRecording;
102 }; 102 };
103 103
104 } // namespace voe 104 } // namespace voe
105 105
106 } // namespace werbtc 106 } // namespace werbtc
107 107
108 #endif // VOICE_ENGINE_OUTPUT_MIXER_H_ 108 #endif // VOICE_ENGINE_OUTPUT_MIXER_H_
OLDNEW
« no previous file with comments | « webrtc/voice_engine/include/voe_base.h ('k') | webrtc/voice_engine/output_mixer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698