Merge branch 'master' of github.com:pili-engineering/PLCameraStreamin…

…gKit
ssmqcfj · Dec 28, 2015 · 3292b52 · 3292b52
2 parents 6772bcc + c726d1d
commit 3292b52
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/Pod/Classes/PLCameraStreamingSession.m b/Pod/Classes/PLCameraStreamingSession.m
@@ -265,7 +265,7 @@ - (void)initMicophoneSource {
         }
 
         self.microphoneSource = [[PLMicrophoneSource alloc] initWithSampleRate:self.audioConfiguration.audioSampleRate
-                                                              channelsPerFrame:2];
+                                                              channelsPerFrame:1];
         self.microphoneSource.delegate = self;
 
         dispatch_async(dispatch_get_main_queue(), ^{

diff --git a/Pod/Classes/PLMicrophoneSource.m b/Pod/Classes/PLMicrophoneSource.m
@@ -88,7 +88,7 @@ static OSStatus handleInputBuffer(void *inRefCon,
         AudioBuffer buffer;
         buffer.mData = NULL;
         buffer.mDataByteSize = 0;
-        buffer.mNumberChannels = 2;
+        buffer.mNumberChannels = 1;
 
         AudioBufferList buffers;
         buffers.mNumberBuffers = 1;
@@ -139,6 +139,7 @@ - (instancetype)initWithSampleRate:(PLAACSampleRate)sampleRate channelsPerFrame:
         self.tsBase = 0;
 
         AVAudioSession *session = [AVAudioSession sharedInstance];
+        [session setActive:YES withOptions:kAudioSessionSetActiveFlag_NotifyOthersOnDeactivation error:nil];
 
         [[NSNotificationCenter defaultCenter] addObserver: self
                                                  selector: @selector(handleRouteChange:)
@@ -156,10 +157,14 @@ - (instancetype)initWithSampleRate:(PLAACSampleRate)sampleRate channelsPerFrame:
         NSError *error = nil;
 
         [session setCategory:AVAudioSessionCategoryPlayAndRecord withOptions:AVAudioSessionCategoryOptionDefaultToSpeaker | AVAudioSessionCategoryOptionMixWithOthers error:nil];
+
+        [session setMode:AVAudioSessionModeVideoRecording error:&error];
+
         if (![session setActive:YES error:&error]) {
             [self handleAudioComponentCreationFailure];
         }
 
+
         AudioComponentDescription acd;
         acd.componentType = kAudioUnitType_Output;
         acd.componentSubType = kAudioUnitSubType_RemoteIO;
@@ -184,7 +189,7 @@ - (instancetype)initWithSampleRate:(PLAACSampleRate)sampleRate channelsPerFrame:
         desc.mSampleRate = self.sampleRate;
         desc.mFormatID = kAudioFormatLinearPCM;
         desc.mFormatFlags = kAudioFormatFlagIsSignedInteger | kAudioFormatFlagsNativeEndian | kAudioFormatFlagIsPacked;
-        desc.mChannelsPerFrame = self.channelsPerFrame;
+        desc.mChannelsPerFrame = (UInt32)self.channelsPerFrame;
         desc.mFramesPerPacket = 1;
         desc.mBitsPerChannel = 16;
         desc.mBytesPerFrame = desc.mBitsPerChannel / 8 * desc.mChannelsPerFrame;