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

Unified Diff: webrtc/modules/audio_device/ios/audio_device_ios.mm

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 side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/audio_device/ios/audio_device_ios.mm
diff --git a/webrtc/modules/audio_device/ios/audio_device_ios.mm b/webrtc/modules/audio_device/ios/audio_device_ios.mm
index 6a1cd04fe0a61b8a1d26fcef7549a369c6a7d754..ba4fe2a9632431b8943db1efc70e2e1e63d356ae 100644
--- a/webrtc/modules/audio_device/ios/audio_device_ios.mm
+++ b/webrtc/modules/audio_device/ios/audio_device_ios.mm
@@ -751,19 +751,24 @@ void AudioDeviceIOS::UpdateAudioUnit(bool can_play_or_record) {
}
}
-void AudioDeviceIOS::ConfigureAudioSession() {
+bool AudioDeviceIOS::ConfigureAudioSession() {
RTC_DCHECK(thread_checker_.CalledOnValidThread());
RTCLog(@"Configuring audio session.");
if (has_configured_session_) {
RTCLogWarning(@"Audio session already configured.");
- return;
+ return false;
}
RTCAudioSession* session = [RTCAudioSession sharedInstance];
[session lockForConfiguration];
- [session configureWebRTCSession:nil];
+ bool success = [session configureWebRTCSession:nil];
[session unlockForConfiguration];
- has_configured_session_ = true;
- RTCLog(@"Configured audio session.");
+ if (success) {
tkchin_webrtc 2017/04/21 20:36:11 nit: can just set to has_configured_session_ above
+ has_configured_session_ = true;
+ RTCLog(@"Configured audio session.");
+ } else {
+ RTCLog(@"Failed to configure audio session.");
+ }
+ return success;
}
void AudioDeviceIOS::UnconfigureAudioSession() {
« no previous file with comments | « webrtc/modules/audio_device/ios/audio_device_ios.h ('k') | webrtc/modules/audio_device/ios/objc/RTCAudioSession.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698