After returning from the call the AVAudioSession was configured to use the receiver instead of the speaker for audio output. The configuration was only restored if the sound loop was previously playing, this change makes sure that the configuration is always reset so the sound can be played audibly after a call has been finished. Bug: webrtc:7792 Change-Id: Idabf6fadc8041b18722cb8f5e89e0c8c36b1b74d Reviewed-on: https://chromium-review.googlesource.com/544819 Reviewed-by: Magnus Jedvert <magjed@webrtc.org> Commit-Queue: Anders Carlsson <andersc@webrtc.org> Cr-Commit-Position: refs/heads/master@{#18754}
261 lines
9.0 KiB
Objective-C
261 lines
9.0 KiB
Objective-C
/*
|
|
* Copyright 2015 The WebRTC Project Authors. All rights reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#import "ARDMainViewController.h"
|
|
|
|
#import <AVFoundation/AVFoundation.h>
|
|
|
|
#import "WebRTC/RTCAudioSession.h"
|
|
#import "WebRTC/RTCAudioSessionConfiguration.h"
|
|
#import "WebRTC/RTCDispatcher.h"
|
|
#import "WebRTC/RTCLogging.h"
|
|
|
|
|
|
#import "ARDAppClient.h"
|
|
#import "ARDMainView.h"
|
|
#import "ARDSettingsModel.h"
|
|
#import "ARDSettingsViewController.h"
|
|
#import "ARDVideoCallViewController.h"
|
|
|
|
static NSString *const barButtonImageString = @"ic_settings_black_24dp.png";
|
|
|
|
// Launch argument to be passed to indicate that the app should start loopback immediatly
|
|
static NSString *const loopbackLaunchProcessArgument = @"loopback";
|
|
|
|
@interface ARDMainViewController () <
|
|
ARDMainViewDelegate,
|
|
ARDVideoCallViewControllerDelegate,
|
|
RTCAudioSessionDelegate>
|
|
@end
|
|
|
|
@implementation ARDMainViewController {
|
|
ARDMainView *_mainView;
|
|
AVAudioPlayer *_audioPlayer;
|
|
BOOL _useManualAudio;
|
|
}
|
|
|
|
- (void)viewDidLoad {
|
|
[super viewDidLoad];
|
|
if ([[[NSProcessInfo processInfo] arguments] containsObject:loopbackLaunchProcessArgument]) {
|
|
[self mainView:nil didInputRoom:@"" isLoopback:YES];
|
|
}
|
|
}
|
|
|
|
- (void)loadView {
|
|
self.title = @"AppRTC Mobile";
|
|
_mainView = [[ARDMainView alloc] initWithFrame:CGRectZero];
|
|
_mainView.delegate = self;
|
|
self.view = _mainView;
|
|
[self addSettingsBarButton];
|
|
|
|
RTCAudioSessionConfiguration *webRTCConfig =
|
|
[RTCAudioSessionConfiguration webRTCConfiguration];
|
|
webRTCConfig.categoryOptions = webRTCConfig.categoryOptions |
|
|
AVAudioSessionCategoryOptionDefaultToSpeaker;
|
|
[RTCAudioSessionConfiguration setWebRTCConfiguration:webRTCConfig];
|
|
|
|
RTCAudioSession *session = [RTCAudioSession sharedInstance];
|
|
[session addDelegate:self];
|
|
|
|
[self configureAudioSession];
|
|
[self setupAudioPlayer];
|
|
}
|
|
|
|
- (void)addSettingsBarButton {
|
|
UIBarButtonItem *settingsButton =
|
|
[[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:barButtonImageString]
|
|
style:UIBarButtonItemStylePlain
|
|
target:self
|
|
action:@selector(showSettings:)];
|
|
self.navigationItem.rightBarButtonItem = settingsButton;
|
|
}
|
|
|
|
+ (NSString *)loopbackRoomString {
|
|
NSString *loopbackRoomString =
|
|
[[NSUUID UUID].UUIDString stringByReplacingOccurrencesOfString:@"-" withString:@""];
|
|
return loopbackRoomString;
|
|
}
|
|
|
|
#pragma mark - ARDMainViewDelegate
|
|
|
|
- (void)mainView:(ARDMainView *)mainView didInputRoom:(NSString *)room isLoopback:(BOOL)isLoopback {
|
|
if (!room.length) {
|
|
if (isLoopback) {
|
|
// If this is a loopback call, allow a generated room name.
|
|
room = [[self class] loopbackRoomString];
|
|
} else {
|
|
[self showAlertWithMessage:@"Missing room name."];
|
|
return;
|
|
}
|
|
}
|
|
// Trim whitespaces.
|
|
NSCharacterSet *whitespaceSet = [NSCharacterSet whitespaceCharacterSet];
|
|
NSString *trimmedRoom = [room stringByTrimmingCharactersInSet:whitespaceSet];
|
|
|
|
// Check that room name is valid.
|
|
NSError *error = nil;
|
|
NSRegularExpressionOptions options = NSRegularExpressionCaseInsensitive;
|
|
NSRegularExpression *regex =
|
|
[NSRegularExpression regularExpressionWithPattern:@"\\w+"
|
|
options:options
|
|
error:&error];
|
|
if (error) {
|
|
[self showAlertWithMessage:error.localizedDescription];
|
|
return;
|
|
}
|
|
NSRange matchRange =
|
|
[regex rangeOfFirstMatchInString:trimmedRoom
|
|
options:0
|
|
range:NSMakeRange(0, trimmedRoom.length)];
|
|
if (matchRange.location == NSNotFound ||
|
|
matchRange.length != trimmedRoom.length) {
|
|
[self showAlertWithMessage:@"Invalid room name."];
|
|
return;
|
|
}
|
|
|
|
ARDSettingsModel *settingsModel = [[ARDSettingsModel alloc] init];
|
|
|
|
RTCAudioSession *session = [RTCAudioSession sharedInstance];
|
|
session.useManualAudio = [settingsModel currentUseManualAudioConfigSettingFromStore];
|
|
session.isAudioEnabled = NO;
|
|
|
|
// Kick off the video call.
|
|
ARDVideoCallViewController *videoCallViewController =
|
|
[[ARDVideoCallViewController alloc] initForRoom:trimmedRoom
|
|
isLoopback:isLoopback
|
|
delegate:self];
|
|
videoCallViewController.modalTransitionStyle =
|
|
UIModalTransitionStyleCrossDissolve;
|
|
[self presentViewController:videoCallViewController
|
|
animated:YES
|
|
completion:nil];
|
|
}
|
|
|
|
- (void)mainViewDidToggleAudioLoop:(ARDMainView *)mainView {
|
|
if (mainView.isAudioLoopPlaying) {
|
|
[_audioPlayer stop];
|
|
} else {
|
|
[_audioPlayer play];
|
|
}
|
|
mainView.isAudioLoopPlaying = _audioPlayer.playing;
|
|
}
|
|
|
|
#pragma mark - ARDVideoCallViewControllerDelegate
|
|
|
|
- (void)viewControllerDidFinish:(ARDVideoCallViewController *)viewController {
|
|
if (![viewController isBeingDismissed]) {
|
|
RTCLog(@"Dismissing VC");
|
|
[self dismissViewControllerAnimated:YES completion:^{
|
|
[self restartAudioPlayerIfNeeded];
|
|
}];
|
|
}
|
|
RTCAudioSession *session = [RTCAudioSession sharedInstance];
|
|
session.isAudioEnabled = NO;
|
|
}
|
|
|
|
#pragma mark - RTCAudioSessionDelegate
|
|
|
|
- (void)audioSessionDidStartPlayOrRecord:(RTCAudioSession *)session {
|
|
// Stop playback on main queue and then configure WebRTC.
|
|
[RTCDispatcher dispatchAsyncOnType:RTCDispatcherTypeMain
|
|
block:^{
|
|
if (_mainView.isAudioLoopPlaying) {
|
|
RTCLog(@"Stopping audio loop due to WebRTC start.");
|
|
[_audioPlayer stop];
|
|
}
|
|
RTCLog(@"Setting isAudioEnabled to YES.");
|
|
session.isAudioEnabled = YES;
|
|
}];
|
|
}
|
|
|
|
- (void)audioSessionDidStopPlayOrRecord:(RTCAudioSession *)session {
|
|
// WebRTC is done with the audio session. Restart playback.
|
|
[RTCDispatcher dispatchAsyncOnType:RTCDispatcherTypeMain
|
|
block:^{
|
|
RTCLog(@"audioSessionDidStopPlayOrRecord");
|
|
[self restartAudioPlayerIfNeeded];
|
|
}];
|
|
}
|
|
|
|
#pragma mark - Private
|
|
- (void)showSettings:(id)sender {
|
|
ARDSettingsViewController *settingsController =
|
|
[[ARDSettingsViewController alloc] initWithStyle:UITableViewStyleGrouped
|
|
settingsModel:[[ARDSettingsModel alloc] init]];
|
|
|
|
UINavigationController *navigationController =
|
|
[[UINavigationController alloc] initWithRootViewController:settingsController];
|
|
[self presentViewControllerAsModal:navigationController];
|
|
}
|
|
|
|
- (void)presentViewControllerAsModal:(UIViewController *)viewController {
|
|
[self presentViewController:viewController animated:YES completion:nil];
|
|
}
|
|
|
|
- (void)configureAudioSession {
|
|
RTCAudioSessionConfiguration *configuration =
|
|
[[RTCAudioSessionConfiguration alloc] init];
|
|
configuration.category = AVAudioSessionCategoryAmbient;
|
|
configuration.categoryOptions = AVAudioSessionCategoryOptionDuckOthers;
|
|
configuration.mode = AVAudioSessionModeDefault;
|
|
|
|
RTCAudioSession *session = [RTCAudioSession sharedInstance];
|
|
[session lockForConfiguration];
|
|
BOOL hasSucceeded = NO;
|
|
NSError *error = nil;
|
|
if (session.isActive) {
|
|
hasSucceeded = [session setConfiguration:configuration error:&error];
|
|
} else {
|
|
hasSucceeded = [session setConfiguration:configuration
|
|
active:YES
|
|
error:&error];
|
|
}
|
|
if (!hasSucceeded) {
|
|
RTCLogError(@"Error setting configuration: %@", error.localizedDescription);
|
|
}
|
|
[session unlockForConfiguration];
|
|
}
|
|
|
|
- (void)setupAudioPlayer {
|
|
NSString *audioFilePath =
|
|
[[NSBundle mainBundle] pathForResource:@"mozart" ofType:@"mp3"];
|
|
NSURL *audioFileURL = [NSURL URLWithString:audioFilePath];
|
|
_audioPlayer = [[AVAudioPlayer alloc] initWithContentsOfURL:audioFileURL
|
|
error:nil];
|
|
_audioPlayer.numberOfLoops = -1;
|
|
_audioPlayer.volume = 1.0;
|
|
[_audioPlayer prepareToPlay];
|
|
}
|
|
|
|
- (void)restartAudioPlayerIfNeeded {
|
|
[self configureAudioSession];
|
|
if (_mainView.isAudioLoopPlaying && !self.presentedViewController) {
|
|
RTCLog(@"Starting audio loop due to WebRTC end.");
|
|
[_audioPlayer play];
|
|
}
|
|
}
|
|
|
|
- (void)showAlertWithMessage:(NSString*)message {
|
|
UIAlertController *alert =
|
|
[UIAlertController alertControllerWithTitle:nil
|
|
message:message
|
|
preferredStyle:UIAlertControllerStyleAlert];
|
|
|
|
UIAlertAction *defaultAction = [UIAlertAction actionWithTitle:@"OK"
|
|
style:UIAlertActionStyleDefault
|
|
handler:^(UIAlertAction *action){
|
|
}];
|
|
|
|
[alert addAction:defaultAction];
|
|
[self presentViewController:alert animated:YES completion:nil];
|
|
}
|
|
|
|
@end
|