fix bluetooth headset crash (#121)

Author: zoff99

local_pod_repo/objcTox/Classes/Private/Manager/Audio/OCTAudioEngine+Private.h

@@ -10,7 +10,8 @@
 extern int kBufferLength;
 extern int kNumberOfChannels;
 extern int kDefaultSampleRate;
-extern int kSampleCount;
+extern int kSampleCount_incoming_audio;
+extern int kSampleCount_outgoing_audio;
 extern int kBitsPerByte;
 extern int kFramesPerPacket;
 extern int kBytesPerSample;

local_pod_repo/objcTox/Classes/Private/Manager/Audio/OCTAudioEngine.m

@@ -112,6 +112,7 @@ - (BOOL)startAudioFlow:(NSError **)error
         OCTAudioEngine *aoi = welf;
 
         if (aoi.enableMicrophone) {
+            // TOXAUDIO: -outgoing-audio-
             [aoi.toxav sendAudioFrame:data
                           sampleCount:samples
                              channels:channelCount
@@ -120,6 +121,8 @@ - (BOOL)startAudioFlow:(NSError **)error
                                 error:nil];
         }
     };
+
+    // TOXAUDIO: -incoming-audio-
     [self.outputQueue updateSampleRate:self.outputSampleRate numberOfChannels:self.outputNumberOfChannels error:nil];
 
     if (! [self.inputQueue begin:error] || ! [self.outputQueue begin:error]) {
@@ -149,6 +152,7 @@ - (BOOL)stopAudioFlow:(NSError **)error
 
 - (void)provideAudioFrames:(OCTToxAVPCMData *)pcm sampleCount:(OCTToxAVSampleCount)sampleCount channels:(OCTToxAVChannels)channels sampleRate:(OCTToxAVSampleRate)sampleRate fromFriend:(OCTToxFriendNumber)friendNumber
 {
+    // TOXAUDIO: -incoming-audio-
     int32_t len = (int32_t)(channels * sampleCount * sizeof(OCTToxAVPCMData));
     TPCircularBuffer *buf = [self.outputQueue getBufferPointer];
     if (buf) {
@@ -174,7 +178,9 @@ - (void)makeQueues:(NSError **)error
     // Note: OCTAudioQueue handles the case where the device ids are nil - in that case
     // we don't set the device explicitly, and the default is used.
 #if TARGET_OS_IPHONE
+    // TOXAUDIO: -incoming-audio-
     self.outputQueue = [[OCTAudioQueue alloc] initWithOutputDeviceID:nil error:error];
+    // TOXAUDIO: -outgoing-audio-
     self.inputQueue = [[OCTAudioQueue alloc] initWithInputDeviceID:nil error:error];
 #else
     self.outputQueue = [[OCTAudioQueue alloc] initWithOutputDeviceID:self.outputDeviceID error:error];

local_pod_repo/objcTox/Classes/Private/Manager/Audio/OCTAudioQueue.m

@@ -13,12 +13,14 @@
 const int kBufferLength = 384000;
 const int kNumberOfChannels = 1;
 const int kDefaultSampleRate = 48000;
-const int kSampleCount = 1920;
+const int kSampleCount_incoming_audio = 1920;
+const int kSampleCount_outgoing_audio = (1920 / 2);
 const int kBitsPerByte = 8;
 const int kFramesPerPacket = 1;
 // if you make this too small, the output queue will silently not play,
 // but you will still get fill callbacks; it's really weird
-const int kFramesPerOutputBuffer = kSampleCount / 4;
+const int kFramesPerOutputBuffer_incoming_audio = kSampleCount_incoming_audio / 4;
+const int kFramesPerOutputBuffer_outgoing_audio = kSampleCount_outgoing_audio / 4;
 const int kBytesPerSample = sizeof(SInt16);
 const int kNumberOfAudioQueueBuffers = 8;
 
@@ -157,11 +159,13 @@ - (instancetype)initWithDeviceID:(NSString *)devID isOutput:(BOOL)output error:(
 
 - (instancetype)initWithInputDeviceID:(NSString *)devID error:(NSError **)error
 {
+    // TOXAUDIO: -outgoing-audio-
     return [self initWithDeviceID:devID isOutput:NO error:error];
 }
 
 - (instancetype)initWithOutputDeviceID:(NSString *)devID error:(NSError **)error
 {
+    // TOXAUDIO: -incoming-audio-
     return [self initWithDeviceID:devID isOutput:YES error:error];
 }
 
@@ -182,9 +186,11 @@ - (OSStatus)createAudioQueue
 {
     OSStatus err;
     if (self.isOutput) {
+        // TOXAUDIO: -incoming-audio-
         err = _AudioQueueNewOutput(&_streamFmt, (void *)&FillOutputBuffer, (__bridge void *)self, NULL, kCFRunLoopCommonModes, 0, &_audioQueue);
     }
     else {
+        // TOXAUDIO: -outgoing-audio-
         err = _AudioQueueNewInput(&_streamFmt, (void *)&InputAvailable, (__bridge void *)self, NULL, kCFRunLoopCommonModes, 0, &_audioQueue);
     }
 
@@ -215,9 +221,16 @@ - (BOOL)begin:(NSError **)error
     }
 
     for (int i = 0; i < kNumberOfAudioQueueBuffers; ++i) {
-        _AudioQueueAllocateBuffer(self.audioQueue, kBytesPerSample * kNumberOfChannels * kFramesPerOutputBuffer, &(_AQBuffers[i]));
+        if (self.isOutput) {
+            // TOXAUDIO: -incoming-audio-
+            _AudioQueueAllocateBuffer(self.audioQueue, kBytesPerSample * kNumberOfChannels * kFramesPerOutputBuffer_incoming_audio, &(_AQBuffers[i]));
+        } else {
+            // TOXAUDIO: -outgoing-audio-
+            _AudioQueueAllocateBuffer(self.audioQueue, kBytesPerSample * kNumberOfChannels * kFramesPerOutputBuffer_outgoing_audio, &(_AQBuffers[i]));
+        }
         _AudioQueueEnqueueBuffer(self.audioQueue, _AQBuffers[i], 0, NULL);
         if (self.isOutput) {
+            // TOXAUDIO: -outgoing-audio-
             // For some reason we have to fill it with zero or the callback never gets called.
             FillOutputBuffer(self, self.audioQueue, _AQBuffers[i]);
         }
@@ -354,11 +367,25 @@ static void InputAvailable(OCTAudioQueue *__unsafe_unretained context,
 
     int32_t availableBytesToConsume;
     void *tail = TPCircularBufferTail(&context->_buffer, &availableBytesToConsume);
-    int32_t minimalBytesToConsume = kSampleCount * kNumberOfChannels * sizeof(SInt16);
+
+    // TOXAUDIO: -outgoing-audio-
+    int32_t minimalBytesToConsume = kSampleCount_outgoing_audio * kNumberOfChannels * sizeof(SInt16);
+
+    if (context.isOutput) {
+        // TOXAUDIO: -incoming-audio-
+        minimalBytesToConsume = kSampleCount_incoming_audio * kNumberOfChannels * sizeof(SInt16);
+    }
+
     int32_t cyclesToConsume = availableBytesToConsume / minimalBytesToConsume;
 
     for (int32_t i = 0; i < cyclesToConsume; i++) {
-        context.sendDataBlock(tail, kSampleCount, context.streamFmt.mSampleRate, kNumberOfChannels);
+        if (context.isOutput) {
+            // TOXAUDIO: -incoming-audio-
+            context.sendDataBlock(tail, kSampleCount_incoming_audio, context.streamFmt.mSampleRate, kNumberOfChannels);
+        } else {
+            // TOXAUDIO: -outgoing-audio-
+            context.sendDataBlock(tail, kSampleCount_outgoing_audio, context.streamFmt.mSampleRate, kNumberOfChannels);
+        }
         TPCircularBufferConsume(&context->_buffer, minimalBytesToConsume);
         tail = TPCircularBufferTail(&context->_buffer, &availableBytesToConsume);
     }

local_pod_repo/objcTox/Classes/Private/Manager/Submanagers/OCTSubmanagerCallsImpl.m

@@ -528,6 +528,7 @@ - (void)   toxAV:(OCTToxAV *)toxAV
       sampleRate:(OCTToxAVSampleRate)sampleRate
     friendNumber:(OCTToxFriendNumber)friendNumber
 {
+    // TOXAUDIO: -incoming-audio-
     [self.audioEngine provideAudioFrames:pcm sampleCount:sampleCount channels:channels sampleRate:sampleRate fromFriend:friendNumber];
 }
 

local_pod_repo/objcTox/Classes/Private/Wrapper/OCTToxAV.m

@@ -203,6 +203,7 @@ - (BOOL)sendAudioFrame:(OCTToxAVPCMData *)pcm sampleCount:(OCTToxAVSampleCount)s
               channels:(OCTToxAVChannels)channels sampleRate:(OCTToxAVSampleRate)sampleRate
               toFriend:(OCTToxFriendNumber)friendNumber error:(NSError **)error
 {
+    // TOXAUDIO: -outgoing-audio-
     TOXAV_ERR_SEND_FRAME cError;
 
     BOOL status = _toxav_audio_send_frame(self.toxAV, friendNumber,
@@ -620,6 +621,7 @@ void receiveAudioFrameCallback(ToxAV *cToxAV,
 {
     OCTToxAV *toxAV = (__bridge OCTToxAV *)userData;
 
+    // TOXAUDIO: -incoming-audio-
     if ([toxAV.delegate respondsToSelector:@selector(toxAV:receiveAudio:sampleCount:channels:sampleRate:friendNumber:)]) {
         [toxAV.delegate toxAV:toxAV receiveAudio:pcm sampleCount:sampleCount channels:channels sampleRate:sampleRate friendNumber:friendNumber];
     }