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

Side by Side Diff: webrtc/voice_engine/include/voe_base.h

Issue 1830213002: Remove WVoE::SetAudioDeviceModule() - it is now set in ctor. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 4 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
« no previous file with comments | « webrtc/voice_engine/channel_proxy.h ('k') | webrtc/voice_engine/voe_base_impl.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
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 // takes ownership of this object. 125 // takes ownership of this object.
126 // If NULL is passed for any of these, VoiceEngine will create its own. 126 // If NULL is passed for any of these, VoiceEngine will create its own.
127 // Returns -1 in case of an error, 0 otherwise. 127 // Returns -1 in case of an error, 0 otherwise.
128 // TODO(ajm): Remove default NULLs. 128 // TODO(ajm): Remove default NULLs.
129 virtual int Init(AudioDeviceModule* external_adm = NULL, 129 virtual int Init(AudioDeviceModule* external_adm = NULL,
130 AudioProcessing* audioproc = NULL) = 0; 130 AudioProcessing* audioproc = NULL) = 0;
131 131
132 // Returns NULL before Init() is called. 132 // Returns NULL before Init() is called.
133 virtual AudioProcessing* audio_processing() = 0; 133 virtual AudioProcessing* audio_processing() = 0;
134 134
135 // This method is WIP - DO NOT USE!
136 // Returns NULL before Init() is called.
137 virtual AudioDeviceModule* audio_device_module() = 0;
138
135 // Terminates all VoiceEngine functions and releases allocated resources. 139 // Terminates all VoiceEngine functions and releases allocated resources.
136 // Returns 0. 140 // Returns 0.
137 virtual int Terminate() = 0; 141 virtual int Terminate() = 0;
138 142
139 // Creates a new channel and allocates the required resources for it. 143 // Creates a new channel and allocates the required resources for it.
140 // One can use |config| to configure the channel. Currently that is used for 144 // One can use |config| to configure the channel. Currently that is used for
141 // choosing between ACM1 and ACM2, when creating Audio Coding Module. 145 // choosing between ACM1 and ACM2, when creating Audio Coding Module.
142 // Returns channel ID or -1 in case of an error. 146 // Returns channel ID or -1 in case of an error.
143 virtual int CreateChannel() = 0; 147 virtual int CreateChannel() = 0;
144 virtual int CreateChannel(const Config& config) = 0; 148 virtual int CreateChannel(const Config& config) = 0;
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 virtual int AssociateSendChannel(int channel, int accociate_send_channel) = 0; 190 virtual int AssociateSendChannel(int channel, int accociate_send_channel) = 0;
187 191
188 protected: 192 protected:
189 VoEBase() {} 193 VoEBase() {}
190 virtual ~VoEBase() {} 194 virtual ~VoEBase() {}
191 }; 195 };
192 196
193 } // namespace webrtc 197 } // namespace webrtc
194 198
195 #endif // WEBRTC_VOICE_ENGINE_VOE_BASE_H 199 #endif // WEBRTC_VOICE_ENGINE_VOE_BASE_H
OLDNEW
« no previous file with comments | « webrtc/voice_engine/channel_proxy.h ('k') | webrtc/voice_engine/voe_base_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698