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

Side by Side Diff: webrtc/modules/audio_device/ios/audio_device_ios.h

Issue 2822233002: Don't call unconfigureWebRTCSession if setConfiguration fails. webrtc:7471 (Closed)
Patch Set: updated' 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
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 // defines |playout_parameters_| and |record_parameters_|. 199 // defines |playout_parameters_| and |record_parameters_|.
200 void SetupAudioBuffersForActiveAudioSession(); 200 void SetupAudioBuffersForActiveAudioSession();
201 201
202 // Creates the audio unit. 202 // Creates the audio unit.
203 bool CreateAudioUnit(); 203 bool CreateAudioUnit();
204 204
205 // Updates the audio unit state based on current state. 205 // Updates the audio unit state based on current state.
206 void UpdateAudioUnit(bool can_play_or_record); 206 void UpdateAudioUnit(bool can_play_or_record);
207 207
208 // Configures the audio session for WebRTC. 208 // Configures the audio session for WebRTC.
209 void ConfigureAudioSession(); 209 bool ConfigureAudioSession();
210 // Unconfigures the audio session. 210 // Unconfigures the audio session.
211 void UnconfigureAudioSession(); 211 void UnconfigureAudioSession();
212 212
213 // Activates our audio session, creates and initializes the voice-processing 213 // Activates our audio session, creates and initializes the voice-processing
214 // audio unit and verifies that we got the preferred native audio parameters. 214 // audio unit and verifies that we got the preferred native audio parameters.
215 bool InitPlayOrRecord(); 215 bool InitPlayOrRecord();
216 216
217 // Closes and deletes the voice-processing I/O unit. 217 // Closes and deletes the voice-processing I/O unit.
218 void ShutdownPlayOrRecord(); 218 void ShutdownPlayOrRecord();
219 219
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
290 // Audio interruption observer instance. 290 // Audio interruption observer instance.
291 RTCAudioSessionDelegateAdapter* audio_session_observer_; 291 RTCAudioSessionDelegateAdapter* audio_session_observer_;
292 292
293 // Set to true if we've activated the audio session. 293 // Set to true if we've activated the audio session.
294 bool has_configured_session_; 294 bool has_configured_session_;
295 }; 295 };
296 296
297 } // namespace webrtc 297 } // namespace webrtc
298 298
299 #endif // WEBRTC_MODULES_AUDIO_DEVICE_IOS_AUDIO_DEVICE_IOS_H_ 299 #endif // WEBRTC_MODULES_AUDIO_DEVICE_IOS_AUDIO_DEVICE_IOS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698