ims-volte-vowifi
/
doubango
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Delete coreaudio implementation based on AudioQueue for iOS and OS X

This commit is contained in:
bossiel 2011-04-30 12:48:45 +00:00
parent a5d278b4e1
commit 386eeebbaa
4 changed files with 0 additions and 604 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
branches/2.0/doubango/tinyDAV/include/tinydav/audio/coreaudio/tdav_consumer_coreaudio.h
View File

@ -1,64 +0,0 @@
/*
* 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.
*
*/
/**@file tdav_consumer_coreaudio.h
* @brief Audio Consumer for MacOSX and iOS platforms.
*
* @author Laurent Etiemble <laurent.etiemble(at)gmail.com>
*
* @date Created: Sat Nov 8 16:54:58 2009 letiemble
*/
#ifndef TINYDAV_CONSUMER_COREAUDIO_H
#define TINYDAV_CONSUMER_COREAUDIO_H
#include "tinydav_config.h"
#if HAVE_COREAUDIO
#include <AudioToolbox/AudioToolbox.h>
#include "tinydav/audio/tdav_consumer_audio.h"
TDAV_BEGIN_DECLS
#define CoreAudioPlayBuffers 3
typedef struct tdav_consumer_coreaudio_s
{
TDAV_DECLARE_CONSUMER_AUDIO;
tsk_bool_t started;
AudioStreamBasicDescription description;
AudioQueueRef queue;
AudioQueueBufferRef buffers[CoreAudioPlayBuffers];
tsk_size_t buffer_size;
}
tdav_consumer_coreaudio_t;
TINYDAV_GEXTERN const tmedia_consumer_plugin_def_t *tdav_consumer_coreaudio_plugin_def_t;
TDAV_END_DECLS
#endif /* HAVE_COREAUDIO */
#endif /* TINYDAV_CONSUMER_COREAUDIO_H */

42
branches/2.0/doubango/tinyDAV/include/tinydav/audio/coreaudio/tdav_producer_coreaudio.h
View File

@ -1,42 +0,0 @@
/**@file tdav_consumer_coreaudio.h
* @brief Audio Producer for MacOSX and iOS platforms.
*
* @author Laurent Etiemble <laurent.etiemble(at)gmail.com>
*
* @date Created: Sat Nov 8 16:54:58 2009 letiemble
*/
#ifndef TINYDAV_PRODUCER_COREAUDIO_H
#define TINYDAV_PRODUCER_COREAUDIO_H
#include "tinydav_config.h"
#if HAVE_COREAUDIO
#include <AudioToolbox/AudioToolbox.h>
#include "tinydav/audio/tdav_producer_audio.h"
TDAV_BEGIN_DECLS
#define CoreAudioRecordBuffers 3
typedef struct tdav_producer_coreaudio_s
{
TDAV_DECLARE_PRODUCER_AUDIO;
tsk_bool_t started;
AudioStreamBasicDescription description;
AudioQueueRef queue;
AudioQueueBufferRef buffers[CoreAudioRecordBuffers];
tsk_size_t buffer_size;
}
tdav_producer_coreaudio_t;
TINYDAV_GEXTERN const tmedia_producer_plugin_def_t *tdav_producer_coreaudio_plugin_def_t;
TDAV_END_DECLS
#endif /* HAVE_COREAUDIO */
#endif /* TINYDAV_PRODUCER_COREAUDIO_H */

269
branches/2.0/doubango/tinyDAV/src/audio/coreaudio/tdav_consumer_coreaudio.c
View File

@ -1,269 +0,0 @@
/*
* 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.
*
*/
/**@file tdav_consumer_coreaudio.c
* @brief Audio Consumer for MacOSX and iOS platforms.
*
* @authors
* - Laurent Etiemble <laurent.etiemble(at)gmail.com>
* - Mamadou Diop <diopmamadou(at)doubango(dot)org>
*
* @date Created: Sat Nov 8 16:54:58 2009 letiemble
*/
#include "tinydav/audio/coreaudio/tdav_consumer_coreaudio.h"
// http://developer.apple.com/library/mac/#documentation/MusicAudio/Reference/AudioQueueReference/Reference/reference.html
#if HAVE_COREAUDIO
#include "tsk_thread.h"
#include "tsk_memory.h"
#include "tsk_debug.h"
static void __handle_output_buffer(void *userdata, AudioQueueRef queue, AudioQueueBufferRef buffer) {
OSStatus ret;
void *data;
tsk_size_t out_size = 0;
tdav_consumer_coreaudio_t* consumer = (tdav_consumer_coreaudio_t*)userdata;
if (!consumer->started) {
return;
}
if((data = tdav_consumer_audio_get(TDAV_CONSUMER_AUDIO(consumer), &out_size))){
// If we can get audio to play, then copy in the buffer
memcpy(buffer->mAudioData, data, TSK_MIN(consumer->buffer_size, out_size));
TSK_FREE(data);
} else{
// Put silence if there is no audio to play
memset(buffer->mAudioData, 0, consumer->buffer_size);
}
// Re-enqueue the buffer
ret = AudioQueueEnqueueBuffer(consumer->queue, buffer, 0, NULL);
}
/* ============ Media Consumer Interface ================= */
#define tdav_consumer_coreaudio_set tsk_null
int tdav_consumer_coreaudio_prepare(tmedia_consumer_t* self, const tmedia_codec_t* codec)
{
OSStatus ret;
tsk_size_t i;
tdav_consumer_coreaudio_t* consumer = (tdav_consumer_coreaudio_t*)self;
if(!consumer || !codec && codec->plugin){
TSK_DEBUG_ERROR("Invalid parameter");
return -1;
}
TDAV_CONSUMER_AUDIO(consumer)->channels = codec->plugin->audio.channels;
TDAV_CONSUMER_AUDIO(consumer)->codec_rate = codec->plugin->rate;
/* codec should have ptime */
// Set audio category
UInt32 category = kAudioSessionCategory_PlayAndRecord;
AudioSessionSetProperty(kAudioSessionProperty_AudioCategory, sizeof(category), &category);
// Create the audio stream description
AudioStreamBasicDescription *description = &(consumer->description);
description->mSampleRate = TDAV_CONSUMER_AUDIO(dsound)->output_rate ? TDAV_CONSUMER_AUDIO(dsound)->output_rate : TDAV_CONSUMER_AUDIO(dsound)->codec_rate;
description->mFormatID = kAudioFormatLinearPCM;
description->mFormatFlags = kAudioFormatFlagIsSignedInteger | kAudioFormatFlagIsPacked;
description->mChannelsPerFrame = TDAV_CONSUMER_AUDIO(consumer)->channels;
description->mFramesPerPacket = 1;
description->mBitsPerChannel = TDAV_CONSUMER_AUDIO(consumer)->bits_per_sample;
description->mBytesPerPacket = description->mBitsPerChannel / 8 * description->mChannelsPerFrame;
description->mBytesPerFrame = description->mBytesPerPacket;
description->mReserved = 0;
int packetperbuffer = 1000 / TDAV_CONSUMER_AUDIO(consumer)->ptime;
consumer->buffer_size = description->mSampleRate * description->mBytesPerFrame / packetperbuffer;
// Create the playback audio queue
ret = AudioQueueNewOutput(&(consumer->description),
__handle_output_buffer,
consumer,
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;
}
int tdav_consumer_coreaudio_start(tmedia_consumer_t* self)
{
OSStatus ret;
tdav_consumer_coreaudio_t* consumer = (tdav_consumer_coreaudio_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;
}
int tdav_consumer_coreaudio_consume(tmedia_consumer_t* self, void** buffer, tsk_size_t size, const tsk_object_t* proto_hdr)
{
tdav_consumer_coreaudio_t* consumer = (tdav_consumer_coreaudio_t*)self;
if(!consumer || !buffer || !*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_coreaudio_pause(tmedia_consumer_t* self)
{
OSStatus ret;
tdav_consumer_coreaudio_t* consumer = (tdav_consumer_coreaudio_t*)self;
if(!consumer){
TSK_DEBUG_ERROR("Invalid parameter");
return -1;
}
ret = AudioQueuePause(consumer->queue);
return ret;
}
int tdav_consumer_coreaudio_stop(tmedia_consumer_t* self)
{
OSStatus ret;
tdav_consumer_coreaudio_t* consumer = (tdav_consumer_coreaudio_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;
}
//
// coreaudio consumer object definition
//
/* constructor */
static tsk_object_t* tdav_consumer_coreaudio_ctor(tsk_object_t * self, va_list * app)
{
tdav_consumer_coreaudio_t *consumer = self;
if(consumer){
/* init base */
tdav_consumer_audio_init(TDAV_CONSUMER_AUDIO(consumer));
}
return self;
}
/* destructor */
static tsk_object_t* tdav_consumer_coreaudio_dtor(tsk_object_t * self)
{
tdav_consumer_coreaudio_t *consumer = self;
if(consumer){
// Stop the consumer if not done
if(consumer->started){
tdav_consumer_coreaudio_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]);
}
AudioQueueDispose(consumer->queue, true);
}
/* deinit base */
tdav_consumer_audio_deinit(TDAV_CONSUMER_AUDIO(consumer));
}
return self;
}
/* object definition */
static const tsk_object_def_t tdav_consumer_coreaudio_def_s =
{
sizeof(tdav_consumer_coreaudio_t),
tdav_consumer_coreaudio_ctor,
tdav_consumer_coreaudio_dtor,
tdav_consumer_audio_cmp,
};
/* plugin definition*/
static const tmedia_consumer_plugin_def_t tdav_consumer_coreaudio_plugin_def_s =
{
&tdav_consumer_coreaudio_def_s,
tmedia_audio,
"Apple CoreAudio consumer",
tdav_consumer_coreaudio_set,
tdav_consumer_coreaudio_prepare,
tdav_consumer_coreaudio_start,
tdav_consumer_coreaudio_consume,
tdav_consumer_coreaudio_pause,
tdav_consumer_coreaudio_stop
};
const tmedia_consumer_plugin_def_t *tdav_consumer_coreaudio_plugin_def_t = &tdav_consumer_coreaudio_plugin_def_s;
#endif /* HAVE_COREAUDIO */

229
branches/2.0/doubango/tinyDAV/src/audio/coreaudio/tdav_producer_coreaudio.c
View File

@ -1,229 +0,0 @@
/**@file tdav_producer_coreaudio.c
* @brief Audio Producer for MacOSX and iOS platforms.
*
* @authors
* - Laurent Etiemble <laurent.etiemble(at)gmail.com>
* - Mamadou Diop <diopmamadou(at)doubango(dot)org>
*
* @date Created: Sat Nov 8 16:54:58 2009 letiemble
*/
#include "tinydav/audio/coreaudio/tdav_producer_coreaudio.h"
// http://developer.apple.com/library/mac/#documentation/MusicAudio/Reference/AudioQueueReference/Reference/reference.html
#if HAVE_COREAUDIO
#include "tsk_thread.h"
#include "tsk_memory.h"
#include "tsk_debug.h"
void __handle_input_buffer (void *userdata, AudioQueueRef queue, AudioQueueBufferRef buffer, const AudioTimeStamp *start_time, UInt32 number_packet_descriptions, const AudioStreamPacketDescription *packet_descriptions ) {
OSStatus ret;
tdav_producer_coreaudio_t* producer = (tdav_producer_coreaudio_t*)userdata;
if (!producer->started) {
return;
}
// Alert the session that there is new data to send
if(TMEDIA_PRODUCER(producer)->enc_cb.callback) {
TMEDIA_PRODUCER(producer)->enc_cb.callback(TMEDIA_PRODUCER(producer)->enc_cb.callback_data, buffer->mAudioData, buffer->mAudioDataByteSize);
}
// Re-enqueue the buffer
ret = AudioQueueEnqueueBuffer(producer->queue, buffer, 0, NULL);
}
/* ============ Media Producer Interface ================= */
#define tdav_producer_coreaudio_set tsk_null
int tdav_producer_coreaudio_prepare(tmedia_producer_t* self, const tmedia_codec_t* codec)
{
OSStatus ret;
tsk_size_t i;
tdav_producer_coreaudio_t* producer = (tdav_producer_coreaudio_t*)self;
if(!producer || !codec && codec->plugin){
TSK_DEBUG_ERROR("Invalid parameter");
return -1;
}
TDAV_PRODUCER_AUDIO(producer)->channels = codec->plugin->audio.channels;
TDAV_PRODUCER_AUDIO(producer)->rate = codec->plugin->rate;
/* codec should have ptime */
// Set audio category
UInt32 category = kAudioSessionCategory_PlayAndRecord;
AudioSessionSetProperty(kAudioSessionProperty_AudioCategory, sizeof(category), &category);
// Create the audio stream description
AudioStreamBasicDescription *description = &(producer->description);
description->mSampleRate = TDAV_PRODUCER_AUDIO(producer)->rate;
description->mFormatID = kAudioFormatLinearPCM;
description->mFormatFlags = kAudioFormatFlagIsSignedInteger | kAudioFormatFlagIsPacked;
description->mChannelsPerFrame = TDAV_PRODUCER_AUDIO(producer)->channels;
description->mFramesPerPacket = 1;
description->mBitsPerChannel = TDAV_PRODUCER_AUDIO(producer)->bits_per_sample;
description->mBytesPerPacket = description->mBitsPerChannel / 8 * description->mChannelsPerFrame;
description->mBytesPerFrame = description->mBytesPerPacket;
description->mReserved = 0;
int packetperbuffer = 1000 / TDAV_PRODUCER_AUDIO(producer)->ptime;
producer->buffer_size = description->mSampleRate * description->mBytesPerFrame / packetperbuffer;
// Create the record audio queue
ret = AudioQueueNewInput(&(producer->description),
__handle_input_buffer,
producer,
NULL,
kCFRunLoopCommonModes,
0,
&(producer->queue));
for(i = 0; i < CoreAudioRecordBuffers; i++) {
// Create the buffer for the queue
ret = AudioQueueAllocateBuffer(producer->queue, producer->buffer_size, &(producer->buffers[i]));
if (ret) {
break;
}
// Clear the data
memset(producer->buffers[i]->mAudioData, 0, producer->buffer_size);
producer->buffers[i]->mAudioDataByteSize = producer->buffer_size;
// Enqueue the buffer
ret = AudioQueueEnqueueBuffer(producer->queue, producer->buffers[i], 0, NULL);
if (ret) {
break;
}
}
return 0;
}
int tdav_producer_coreaudio_start(tmedia_producer_t* self)
{
OSStatus ret;
tdav_producer_coreaudio_t* producer = (tdav_producer_coreaudio_t*)self;
if(!producer){
TSK_DEBUG_ERROR("Invalid parameter");
return -1;
}
if(producer->started){
TSK_DEBUG_WARN("Producer already started");
return 0;
}
producer->started = tsk_true;
ret = AudioQueueStart(producer->queue, NULL);
return ret;
}
int tdav_producer_coreaudio_pause(tmedia_producer_t* self)
{
OSStatus ret;
tdav_producer_coreaudio_t* producer = (tdav_producer_coreaudio_t*)self;
if(!producer){
TSK_DEBUG_ERROR("Invalid parameter");
return -1;
}
ret = AudioQueuePause(producer->queue);
return ret;
}
int tdav_producer_coreaudio_stop(tmedia_producer_t* self)
{
OSStatus ret;
tdav_producer_coreaudio_t* producer = (tdav_producer_coreaudio_t*)self;
if(!self){
TSK_DEBUG_ERROR("Invalid parameter");
return -1;
}
if(!producer->started){
TSK_DEBUG_WARN("Producer not started");
return 0;
}
producer->started = tsk_false;
ret = AudioQueueStop(producer->queue, false);
return ret;
}
//
// CoreAudio producer object definition
//
/* constructor */
static tsk_object_t* tdav_producer_coreaudio_ctor(tsk_object_t * self, va_list * app)
{
tdav_producer_coreaudio_t *producer = self;
if(producer){
/* init base */
tdav_producer_audio_init(TDAV_PRODUCER_AUDIO(producer));
/* init self */
// TODO
}
return self;
}
/* destructor */
static tsk_object_t* tdav_producer_coreaudio_dtor(tsk_object_t * self)
{
tdav_producer_coreaudio_t *producer = self;
if(producer){
// Stop the producer if not done
if(producer->started){
tdav_producer_coreaudio_stop(self);
}
// Free all buffers and dispose the queue
if (producer->queue) {
tsk_size_t i;
for(i=0; i<CoreAudioRecordBuffers; i++){
AudioQueueFreeBuffer(producer->queue, producer->buffers[i]);
}
AudioQueueDispose(producer->queue, true);
}
/* deinit base */
tdav_producer_audio_deinit(TDAV_PRODUCER_AUDIO(producer));
}
return self;
}
/* object definition */
static const tsk_object_def_t tdav_producer_coreaudio_def_s =
{
sizeof(tdav_producer_coreaudio_t),
tdav_producer_coreaudio_ctor,
tdav_producer_coreaudio_dtor,
tdav_producer_audio_cmp,
};
/* plugin definition*/
static const tmedia_producer_plugin_def_t tdav_producer_coreaudio_plugin_def_s =
{
&tdav_producer_coreaudio_def_s,
tmedia_audio,
"Apple CoreAudio producer",
tdav_producer_coreaudio_set,
tdav_producer_coreaudio_prepare,
tdav_producer_coreaudio_start,
tdav_producer_coreaudio_pause,
tdav_producer_coreaudio_stop
};
const tmedia_producer_plugin_def_t *tdav_producer_coreaudio_plugin_def_t = &tdav_producer_coreaudio_plugin_def_s;
#endif /* HAVE_COREAUDIO */