diff options
| author | milanb@chromium.org <milanb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-25 19:06:26 +0000 |
|---|---|---|
| committer | milanb@chromium.org <milanb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-25 19:06:26 +0000 |
| commit | f26c3df0227be7964de6bbeccdd2a9aadc40c7d6 (patch) | |
| tree | 9d8233106ae89d5bae434f6028c2a7c4a04eb335 | |
| parent | 77aef0b8b3d341aaf6e23201f9d07611c0bdae6d (diff) | |
| download | chromium_src-f26c3df0227be7964de6bbeccdd2a9aadc40c7d6.zip chromium_src-f26c3df0227be7964de6bbeccdd2a9aadc40c7d6.tar.gz chromium_src-f26c3df0227be7964de6bbeccdd2a9aadc40c7d6.tar.bz2 | |
Add initialization for ios audio-video framework.
The default initialization on ios blocks audio input
when audio output is active. This enables duplex mode.
BUG=None
Review URL: https://chromiumcodereview.appspot.com/11276024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164129 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | media/audio/ios/audio_manager_ios.mm | 5 | ||||
| -rw-r--r-- | media/media.gyp | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/media/audio/ios/audio_manager_ios.mm b/media/audio/ios/audio_manager_ios.mm index 7bf8b27..cdae9ad 100644 --- a/media/audio/ios/audio_manager_ios.mm +++ b/media/audio/ios/audio_manager_ios.mm @@ -5,6 +5,7 @@ #include "media/audio/ios/audio_manager_ios.h" #import <AudioToolbox/AudioToolbox.h> +#import <AVFoundation/AVFoundation.h> #include "base/sys_info.h" #include "media/audio/fake_audio_input_stream.h" @@ -20,6 +21,10 @@ enum { kMaxInputChannels = 2 }; static bool InitAudioSessionInternal() { OSStatus error = AudioSessionInitialize(NULL, NULL, NULL, NULL); DCHECK(error != kAudioSessionAlreadyInitialized); + AVAudioSession* audioSession = [AVAudioSession sharedInstance]; + BOOL result = [audioSession setCategory:AVAudioSessionCategoryPlayAndRecord + error:nil]; + DCHECK(result); return error == kAudioSessionNoError; } diff --git a/media/media.gyp b/media/media.gyp index 633914e..3db10df 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -417,6 +417,7 @@ 'link_settings': { 'libraries': [ '$(SDKROOT)/System/Library/Frameworks/AudioToolbox.framework', + '$(SDKROOT)/System/Library/Frameworks/AVFoundation.framework', '$(SDKROOT)/System/Library/Frameworks/CoreAudio.framework', ], }, |