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

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

Issue 2240163002: Move FilePlayer and FileRecorder to Voice Engine (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 4 years, 4 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/file_recorder_impl.cc ('k') | webrtc/voice_engine/transmit_mixer.h » ('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 "webrtc/base/criticalsection.h" 14 #include "webrtc/base/criticalsection.h"
15 #include "webrtc/common_audio/resampler/include/push_resampler.h" 15 #include "webrtc/common_audio/resampler/include/push_resampler.h"
16 #include "webrtc/common_types.h" 16 #include "webrtc/common_types.h"
17 #include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer.h " 17 #include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer.h "
18 #include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer_d efines.h" 18 #include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer_d efines.h"
19 #include "webrtc/modules/utility/include/file_recorder.h" 19 #include "webrtc/voice_engine/file_recorder.h"
20 #include "webrtc/voice_engine/level_indicator.h" 20 #include "webrtc/voice_engine/level_indicator.h"
21 #include "webrtc/voice_engine/voice_engine_defines.h" 21 #include "webrtc/voice_engine/voice_engine_defines.h"
22 22
23 namespace webrtc { 23 namespace webrtc {
24 24
25 class AudioProcessing; 25 class AudioProcessing;
26 class FileWrapper; 26 class FileWrapper;
27 class VoEMediaProcess; 27 class VoEMediaProcess;
28 28
29 namespace voe { 29 namespace voe {
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 int _mixingFrequencyHz; 121 int _mixingFrequencyHz;
122 FileRecorder* _outputFileRecorderPtr; 122 FileRecorder* _outputFileRecorderPtr;
123 bool _outputFileRecording; 123 bool _outputFileRecording;
124 }; 124 };
125 125
126 } // namespace voe 126 } // namespace voe
127 127
128 } // namespace werbtc 128 } // namespace werbtc
129 129
130 #endif // VOICE_ENGINE_OUTPUT_MIXER_H_ 130 #endif // VOICE_ENGINE_OUTPUT_MIXER_H_
OLDNEW
« no previous file with comments | « webrtc/voice_engine/file_recorder_impl.cc ('k') | webrtc/voice_engine/transmit_mixer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698