1 files changed, 131 insertions, 132 deletions

diff --git a/tinyDAV/src/audio/coreaudio/tdav_consumer_audioqueue.c b/tinyDAV/src/audio/coreaudio/tdav_consumer_audioqueue.c
index 2f5fd90..882a988 100755
--- a/tinyDAV/src/audio/coreaudio/tdav_consumer_audioqueue.c
+++ b/tinyDAV/src/audio/coreaudio/tdav_consumer_audioqueue.c
@@ -2,19 +2,19 @@
  * Copyright (C) 2010-2011 Mamadou Diop.
  *
  * Contact: Mamadou Diop <diopmamadou(at)doubango.org>
- *	
+ *
  * This file is part of Open Source Doubango Framework.
  *
  * DOUBANGO is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- *	
+ *
  * DOUBANGO is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *	
+ *
  * You should have received a copy of the GNU General Public License
  * along with DOUBANGO.
  *
@@ -23,7 +23,7 @@
 /**@file tdav_consumer_audioqueue.c
  * @brief Audio Consumer for MacOSX and iOS platforms.
  *
- * @authors 
+ * @authors
  *	- Laurent Etiemble <laurent.etiemble(at)gmail.com>
  *	- Mamadou Diop <diopmamadou(at)doubango(dot)org>
  *
@@ -40,22 +40,23 @@
 #include "tsk_memory.h"
 #include "tsk_debug.h"
 
-static void __handle_output_buffer(void *userdata, AudioQueueRef queue, AudioQueueBufferRef buffer) {
+static void __handle_output_buffer(void *userdata, AudioQueueRef queue, AudioQueueBufferRef buffer)
+{
     tdav_consumer_audioqueue_t* consumer = (tdav_consumer_audioqueue_t*)userdata;
-	
+
     if (!consumer->started) {
         return;
     }
-    
-	if(!tdav_consumer_audio_get(TDAV_CONSUMER_AUDIO(consumer), buffer->mAudioData, consumer->buffer_size)){
-		// Put silence
-		memset(buffer->mAudioData, 0, consumer->buffer_size);
-	}
-    
+
+    if(!tdav_consumer_audio_get(TDAV_CONSUMER_AUDIO(consumer), buffer->mAudioData, consumer->buffer_size)) {
+        // Put silence
+        memset(buffer->mAudioData, 0, consumer->buffer_size);
+    }
+
     // Re-enqueue the buffer
     AudioQueueEnqueueBuffer(consumer->queue, buffer, 0, NULL);
-	// alert the jitter buffer
-	tdav_consumer_audio_tick(TDAV_CONSUMER_AUDIO(consumer));
+    // alert the jitter buffer
+    tdav_consumer_audio_tick(TDAV_CONSUMER_AUDIO(consumer));
 }
 
 /* ============ Media Consumer Interface ================= */
@@ -64,25 +65,25 @@ static void __handle_output_buffer(void *userdata, AudioQueueRef queue, AudioQue
 int tdav_consumer_audioqueue_prepare(tmedia_consumer_t* self, const tmedia_codec_t* codec)
 {
     OSStatus ret;
-	tsk_size_t i;
-	tdav_consumer_audioqueue_t* consumer = (tdav_consumer_audioqueue_t*)self;
-	
-	if(!consumer || !codec && codec->plugin){
-		TSK_DEBUG_ERROR("Invalid parameter");
-		return -1;
-	}
-
-	TMEDIA_CONSUMER(consumer)->audio.ptime = TMEDIA_CODEC_PTIME_AUDIO_DECODING(codec);
-	TMEDIA_CONSUMER(consumer)->audio.in.channels = TMEDIA_CODEC_CHANNELS_AUDIO_DECODING(codec);
-	TMEDIA_CONSUMER(consumer)->audio.in.rate = TMEDIA_CODEC_RATE_DECODING(codec);
-	/* codec should have ptime */
-	
-	// Set audio category
+    tsk_size_t i;
+    tdav_consumer_audioqueue_t* consumer = (tdav_consumer_audioqueue_t*)self;
+
+    if(!consumer || !codec && codec->plugin) {
+        TSK_DEBUG_ERROR("Invalid parameter");
+        return -1;
+    }
+
+    TMEDIA_CONSUMER(consumer)->audio.ptime = TMEDIA_CODEC_PTIME_AUDIO_DECODING(codec);
+    TMEDIA_CONSUMER(consumer)->audio.in.channels = TMEDIA_CODEC_CHANNELS_AUDIO_DECODING(codec);
+    TMEDIA_CONSUMER(consumer)->audio.in.rate = TMEDIA_CODEC_RATE_DECODING(codec);
+    /* codec should have ptime */
+
+    // Set audio category
 #if TARGET_OS_IPHONE
-	UInt32 category = kAudioSessionCategory_PlayAndRecord; 
-	AudioSessionSetProperty(kAudioSessionProperty_AudioCategory, sizeof(category), &category);
+    UInt32 category = kAudioSessionCategory_PlayAndRecord;
+    AudioSessionSetProperty(kAudioSessionProperty_AudioCategory, sizeof(category), &category);
 #endif
-	
+
     // Create the audio stream description
     AudioStreamBasicDescription *description = &(consumer->description);
     description->mSampleRate = TMEDIA_CONSUMER(consumer)->audio.out.rate ? TMEDIA_CONSUMER(consumer)->audio.out.rate : TMEDIA_CONSUMER(consumer)->audio.in.rate;
@@ -94,107 +95,107 @@ int tdav_consumer_audioqueue_prepare(tmedia_consumer_t* self, const tmedia_codec
     description->mBytesPerPacket = description->mBitsPerChannel / 8 * description->mChannelsPerFrame;
     description->mBytesPerFrame = description->mBytesPerPacket;
     description->mReserved = 0;
-    
+
     int packetperbuffer = 1000 / TMEDIA_CONSUMER(consumer)->audio.ptime;
     consumer->buffer_size = description->mSampleRate * description->mBytesPerFrame / packetperbuffer;
-    
+
     // Create the playback audio queue
     ret = AudioQueueNewOutput(&(consumer->description),
                               __handle_output_buffer,
                               consumer,
-                              NULL, 
+                              NULL,
                               NULL,
                               0,
                               &(consumer->queue));
-    
+
     for(i = 0; i < CoreAudioPlayBuffers; i++) {
         // Create the buffer for the queue
         ret = AudioQueueAllocateBuffer(consumer->queue, consumer->buffer_size, &(consumer->buffers[i]));
         if (ret) {
             break;
         }
-        
+
         // Clear the data
         memset(consumer->buffers[i]->mAudioData, 0, consumer->buffer_size);
         consumer->buffers[i]->mAudioDataByteSize = consumer->buffer_size;
-        
+
         // Enqueue the buffer
         ret = AudioQueueEnqueueBuffer(consumer->queue, consumer->buffers[i], 0, NULL);
         if (ret) {
             break;
         }
     }
-	
-	return ret;
+
+    return ret;
 }
 
 int tdav_consumer_audioqueue_start(tmedia_consumer_t* self)
 {
     OSStatus ret;
-	tdav_consumer_audioqueue_t* consumer = (tdav_consumer_audioqueue_t*)self;
-	
-	if(!consumer){
-		TSK_DEBUG_ERROR("Invalid parameter");
-		return -1;
-	}
-	
-	if(consumer->started){
-		TSK_DEBUG_WARN("Consumer already started");
-		return 0;
-	}
-	
-	consumer->started = tsk_true;
+    tdav_consumer_audioqueue_t* consumer = (tdav_consumer_audioqueue_t*)self;
+
+    if(!consumer) {
+        TSK_DEBUG_ERROR("Invalid parameter");
+        return -1;
+    }
+
+    if(consumer->started) {
+        TSK_DEBUG_WARN("Consumer already started");
+        return 0;
+    }
+
+    consumer->started = tsk_true;
     ret = AudioQueueStart(consumer->queue, NULL);
-    
-	return ret;
+
+    return ret;
 }
 
 int tdav_consumer_audioqueue_consume(tmedia_consumer_t* self, const void* buffer, tsk_size_t size, const tsk_object_t* proto_hdr)
 {
-	tdav_consumer_audioqueue_t* consumer = (tdav_consumer_audioqueue_t*)self;
-	
-	if(!consumer || !buffer || !size){
-		TSK_DEBUG_ERROR("Invalid parameter");
-		return -1;
-	}
-	// buffer is already decoded
-	return tdav_consumer_audio_put(TDAV_CONSUMER_AUDIO(consumer), buffer, size, proto_hdr);
+    tdav_consumer_audioqueue_t* consumer = (tdav_consumer_audioqueue_t*)self;
+
+    if(!consumer || !buffer || !size) {
+        TSK_DEBUG_ERROR("Invalid parameter");
+        return -1;
+    }
+    // buffer is already decoded
+    return tdav_consumer_audio_put(TDAV_CONSUMER_AUDIO(consumer), buffer, size, proto_hdr);
 }
 
 int tdav_consumer_audioqueue_pause(tmedia_consumer_t* self)
 {
     OSStatus ret;
-	tdav_consumer_audioqueue_t* consumer = (tdav_consumer_audioqueue_t*)self;
-	
-	if(!consumer){
-		TSK_DEBUG_ERROR("Invalid parameter");
-		return -1;
-	}
-	
+    tdav_consumer_audioqueue_t* consumer = (tdav_consumer_audioqueue_t*)self;
+
+    if(!consumer) {
+        TSK_DEBUG_ERROR("Invalid parameter");
+        return -1;
+    }
+
     ret = AudioQueuePause(consumer->queue);
-	
-	return ret;
+
+    return ret;
 }
 
 int tdav_consumer_audioqueue_stop(tmedia_consumer_t* self)
 {
     OSStatus ret;
-	tdav_consumer_audioqueue_t* consumer = (tdav_consumer_audioqueue_t*)self;
-	
-	if(!self){
-		TSK_DEBUG_ERROR("Invalid parameter");
-		return -1;
-	}
-	
-	if(!consumer->started){
-		TSK_DEBUG_WARN("Consumer not started");
-		return 0;
-	}
-	
-	consumer->started = tsk_false;
+    tdav_consumer_audioqueue_t* consumer = (tdav_consumer_audioqueue_t*)self;
+
+    if(!self) {
+        TSK_DEBUG_ERROR("Invalid parameter");
+        return -1;
+    }
+
+    if(!consumer->started) {
+        TSK_DEBUG_WARN("Consumer not started");
+        return 0;
+    }
+
+    consumer->started = tsk_false;
     ret = AudioQueueStop(consumer->queue, false);
-    
-	return ret;
+
+    return ret;
 }
 
 //
@@ -203,64 +204,62 @@ int tdav_consumer_audioqueue_stop(tmedia_consumer_t* self)
 /* constructor */
 static tsk_object_t* tdav_consumer_audioqueue_ctor(tsk_object_t * self, va_list * app)
 {
-	tdav_consumer_audioqueue_t *consumer = self;
-	if(consumer){
-		/* init base */
-		tdav_consumer_audio_init(TDAV_CONSUMER_AUDIO(consumer));
-	}
-	return self;
+    tdav_consumer_audioqueue_t *consumer = self;
+    if(consumer) {
+        /* init base */
+        tdav_consumer_audio_init(TDAV_CONSUMER_AUDIO(consumer));
+    }
+    return self;
 }
 /* destructor */
 static tsk_object_t* tdav_consumer_audioqueue_dtor(tsk_object_t * self)
-{ 
-	tdav_consumer_audioqueue_t *consumer = self;
-	if(consumer){
-		// Stop the consumer if not done
-		if(consumer->started){
-			tdav_consumer_audioqueue_stop(self);
-		}
-		
-		// Free all buffers and dispose the queue
+{
+    tdav_consumer_audioqueue_t *consumer = self;
+    if(consumer) {
+        // Stop the consumer if not done
+        if(consumer->started) {
+            tdav_consumer_audioqueue_stop(self);
+        }
+
+        // Free all buffers and dispose the queue
         if (consumer->queue) {
-			tsk_size_t i;
-			
-			for(i=0; i<CoreAudioPlayBuffers; i++){
-				AudioQueueFreeBuffer(consumer->queue, consumer->buffers[i]);
-			}
-			
+            tsk_size_t i;
+
+            for(i=0; i<CoreAudioPlayBuffers; i++) {
+                AudioQueueFreeBuffer(consumer->queue, consumer->buffers[i]);
+            }
+
             AudioQueueDispose(consumer->queue, true);
         }
-        
-		/* deinit base */
-		tdav_consumer_audio_deinit(TDAV_CONSUMER_AUDIO(consumer));
-	}
-	
-	return self;
+
+        /* deinit base */
+        tdav_consumer_audio_deinit(TDAV_CONSUMER_AUDIO(consumer));
+    }
+
+    return self;
 }
 
 /* object definition */
-static const tsk_object_def_t tdav_consumer_audioqueue_def_s = 
-{
-	sizeof(tdav_consumer_audioqueue_t),
-	tdav_consumer_audioqueue_ctor, 
-	tdav_consumer_audioqueue_dtor,
-	tdav_consumer_audio_cmp, 
+static const tsk_object_def_t tdav_consumer_audioqueue_def_s = {
+    sizeof(tdav_consumer_audioqueue_t),
+    tdav_consumer_audioqueue_ctor,
+    tdav_consumer_audioqueue_dtor,
+    tdav_consumer_audio_cmp,
 };
 
 /* plugin definition*/
-static const tmedia_consumer_plugin_def_t tdav_consumer_audioqueue_plugin_def_s = 
-{
-	&tdav_consumer_audioqueue_def_s,
-	
-	tmedia_audio,
-	"Apple CoreAudio consumer(AudioQueue)",
-	
-	tdav_consumer_audioqueue_set,
-	tdav_consumer_audioqueue_prepare,
-	tdav_consumer_audioqueue_start,
-	tdav_consumer_audioqueue_consume,
-	tdav_consumer_audioqueue_pause,
-	tdav_consumer_audioqueue_stop
+static const tmedia_consumer_plugin_def_t tdav_consumer_audioqueue_plugin_def_s = {
+    &tdav_consumer_audioqueue_def_s,
+
+    tmedia_audio,
+    "Apple CoreAudio consumer(AudioQueue)",
+
+    tdav_consumer_audioqueue_set,
+    tdav_consumer_audioqueue_prepare,
+    tdav_consumer_audioqueue_start,
+    tdav_consumer_audioqueue_consume,
+    tdav_consumer_audioqueue_pause,
+    tdav_consumer_audioqueue_stop
 };
 
 const tmedia_consumer_plugin_def_t *tdav_consumer_audioqueue_plugin_def_t = &tdav_consumer_audioqueue_plugin_def_s;