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

Side by Side Diff: webrtc/modules/audio_mixer/audio_mixer.h

Issue 2049683003: FileRecorder + FilePlayer: Let Create functions return unique_ptr (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@remove3
Patch Set: 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
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_MODULES_AUDIO_MIXER_AUDIO_MIXER_H_ 11 #ifndef WEBRTC_MODULES_AUDIO_MIXER_AUDIO_MIXER_H_
12 #define WEBRTC_MODULES_AUDIO_MIXER_AUDIO_MIXER_H_ 12 #define WEBRTC_MODULES_AUDIO_MIXER_AUDIO_MIXER_H_
13 13
14 #include <memory>
15
14 #include "webrtc/base/criticalsection.h" 16 #include "webrtc/base/criticalsection.h"
15 #include "webrtc/common_audio/resampler/include/push_resampler.h" 17 #include "webrtc/common_audio/resampler/include/push_resampler.h"
16 #include "webrtc/common_types.h" 18 #include "webrtc/common_types.h"
17 #include "webrtc/modules/audio_mixer/new_audio_conference_mixer.h" 19 #include "webrtc/modules/audio_mixer/new_audio_conference_mixer.h"
18 #include "webrtc/modules/audio_mixer/audio_mixer_defines.h" 20 #include "webrtc/modules/audio_mixer/audio_mixer_defines.h"
19 #include "webrtc/modules/utility/include/file_recorder.h" 21 #include "webrtc/modules/utility/include/file_recorder.h"
20 #include "webrtc/voice_engine/level_indicator.h" 22 #include "webrtc/voice_engine/level_indicator.h"
21 #include "webrtc/voice_engine/voice_engine_defines.h" 23 #include "webrtc/voice_engine/voice_engine_defines.h"
22 24
23 namespace webrtc { 25 namespace webrtc {
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 AudioFrame _audioFrame; 102 AudioFrame _audioFrame;
101 // Converts mixed audio to the audio processing rate. 103 // Converts mixed audio to the audio processing rate.
102 PushResampler<int16_t> audioproc_resampler_; 104 PushResampler<int16_t> audioproc_resampler_;
103 AudioLevel _audioLevel; // measures audio level for the combined signal 105 AudioLevel _audioLevel; // measures audio level for the combined signal
104 int _instanceId; 106 int _instanceId;
105 VoEMediaProcess* _externalMediaCallbackPtr; 107 VoEMediaProcess* _externalMediaCallbackPtr;
106 bool _externalMedia; 108 bool _externalMedia;
107 float _panLeft; 109 float _panLeft;
108 float _panRight; 110 float _panRight;
109 int _mixingFrequencyHz; 111 int _mixingFrequencyHz;
110 FileRecorder* _outputFileRecorderPtr; 112 std::unique_ptr<FileRecorder> _outputFileRecorderPtr;
111 bool _outputFileRecording; 113 bool _outputFileRecording;
112 }; 114 };
113 115
114 } // namespace voe 116 } // namespace voe
115 117
116 } // namespace webrtc 118 } // namespace webrtc
117 119
118 #endif // WEBRTC_MODULES_AUDIO_MIXER_AUDIO_MIXER_H_ 120 #endif // WEBRTC_MODULES_AUDIO_MIXER_AUDIO_MIXER_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/modules/audio_mixer/audio_mixer.cc » ('j') | webrtc/modules/utility/include/file_player.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698