X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=osx_write.c;h=bcff09f781bc3c1e703a4cc4bcce91f5c8ff5628;hp=153ae3d656bdfff144f048e584430968dc8b3ea2;hb=6b935f552ebfe3a0a83ec9367deb2f42c1aff252;hpb=e10ee3808534ff46b63ad94acfc665ec3841aa4f diff --git a/osx_write.c b/osx_write.c index 153ae3d6..bcff09f7 100644 --- a/osx_write.c +++ b/osx_write.c @@ -1,19 +1,7 @@ /* - * Copyright (C) 2006 Andre Noll + * Copyright (C) 2006-2010 Andre Noll * - * This program 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 2 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Licensed under the GPL v2. For licencing details see COPYING. */ /** \file osx_write.c paraslash's output plugin for MacOs */ @@ -23,20 +11,26 @@ * */ -#include +#include +#include +#include +#include + #include "para.h" #include "fd.h" #include "string.h" #include "list.h" #include "sched.h" +#include "ggo.h" +#include "buffer_tree.h" #include "write.h" +#include "write_common.h" #include "osx_write.cmdline.h" #include "error.h" - -#include +#include #include -#include +#include /** describes one input buffer for the osx writer */ struct osx_buffer { @@ -44,7 +38,7 @@ struct osx_buffer { float *buffer; /** the size of this buffer */ long size; - /* current position in the buffer */ + /** current position in the buffer */ float *ptr; /** number of floats not yet consuned */ long remaining; @@ -52,6 +46,7 @@ struct osx_buffer { struct osx_buffer *next; }; +/** data specific to the osx writer */ struct private_osx_write_data { /** the main control structure for audio data manipulation */ AudioUnit audio_unit; @@ -59,7 +54,7 @@ struct private_osx_write_data { char play; /** callback reads audio data from this buffer */ struct osx_buffer *from; - /* the post_select writes audio data here */ + /** the post_select writes audio data here */ struct osx_buffer *to; /** sample rate of the current audio stream */ unsigned samplerate; @@ -90,7 +85,7 @@ static void init_buffers(struct writer_node *wn) ptrptr = &powd->to; for (i = 0; i < conf->numbuffers_arg; i++) { - *ptrptr = malloc(sizeof(struct osx_buffer)); + *ptrptr = para_malloc(sizeof(struct osx_buffer)); (*ptrptr)->size = 0; (*ptrptr)->remaining = 0; (*ptrptr)->buffer = NULL; @@ -103,21 +98,14 @@ static void fill_buffer(struct osx_buffer *b, short *source, long size) { float *dest; - if (b->remaining) /* Non empty buffer, must still be playing */ - return; + assert(b->remaining == 0 || size > 0); if (b->size != size) { b->buffer = para_realloc(b->buffer, size * sizeof(float)); b->size = size; } dest = b->buffer; - while (size--) { - char *tmp = (char *)source; - char c = *tmp; - *tmp = *(tmp + 1); - *(tmp + 1) = c; - /* *dest++ = ((*source++) + 32768) / 65536.0; */ + while (size--) *dest++ = (*source++) / 32768.0; - } b->ptr = b->buffer; b->remaining = b->size; } @@ -140,12 +128,14 @@ static OSStatus osx_callback(void * inClientData, m = outOutputData->mBuffers[i].mDataByteSize / sizeof(float); dest = outOutputData->mBuffers[i].mData; while (m > 0) { - if ((n = powd->from->remaining) <= 0) { - PARA_INFO_LOG("%s", "buffer underrun\n"); - /* no more bytes in the current read buffer! */ - while ((n = powd->from->remaining) <= 0) - /* wait for the results */ - usleep(2000); + n = powd->from->remaining; + if (n <= 0) { + n = powd->from->next->remaining; + if (n <= 0) { + PARA_INFO_LOG("buffer underrun\n"); + return 0; + } + powd->from = powd->from->next; } // PARA_INFO_LOG("buf %p: n = %ld, m= %ld\n", powd->from->buffer, n, m); /* @@ -166,6 +156,12 @@ static OSStatus osx_callback(void * inClientData, return 0; } +#ifdef WORDS_BIGENDIAN /* ppc */ +#define ENDIAN_FLAGS kLinearPCMFormatFlagIsBigEndian +#else +#define ENDIAN_FLAGS 0 +#endif + static int osx_write_open(struct writer_node *wn) { struct private_osx_write_data *powd = para_calloc( @@ -175,7 +171,7 @@ static int osx_write_open(struct writer_node *wn) AURenderCallbackStruct inputCallback = {osx_callback, powd}; AudioStreamBasicDescription format; int ret; - struct writer_node_group *wng = wn->wng; + struct btr_node *btrn = wn->btrn; struct osx_write_args_info *conf = wn->conf; wn->private_data = powd; @@ -197,27 +193,32 @@ static int osx_write_open(struct writer_node *wn) if (AudioUnitInitialize(powd->audio_unit)) goto e1; powd->play = 0; - /* Hmmm, let's choose PCM format */ - /* We tell the Output Unit what format we're going to supply data to it. - * This is necessary if you're providing data through an input callback - * AND you want the DefaultOutputUnit to do any format conversions - * necessary from your format to the device's format. + powd->samplerate = conf->samplerate_arg; + powd->channels = conf->channels_arg; + if (!conf->samplerate_given) { + int32_t rate; + if (get_btr_samplerate(btrn, &rate) >= 0) + powd->samplerate = rate; + } + if (!conf->channels_given) { + int32_t ch; + if (get_btr_channels(btrn, &ch) >= 0) + powd->channels = ch; + } + /* + * Choose PCM format. We tell the Output Unit what format we're going + * to supply data to it. This is necessary if you're providing data + * through an input callback AND you want the DefaultOutputUnit to do + * any format conversions necessary from your format to the device's + * format. */ - if (!conf->samplerate_given && wng->samplerate) - powd->samplerate = *wng->samplerate; - else - powd->samplerate = conf->samplerate_arg; format.mSampleRate = powd->samplerate; - /* The specific encoding type of audio stream*/ + /* The specific encoding type of audio stream */ format.mFormatID = kAudioFormatLinearPCM; /* flags specific to each format */ format.mFormatFlags = kLinearPCMFormatFlagIsFloat | kLinearPCMFormatFlagIsPacked - | kLinearPCMFormatFlagIsBigEndian; - if (!conf->channels_given && wng->channels) - powd->channels = *wng->channels; - else - powd->channels = conf->channels_arg; + | ENDIAN_FLAGS; format.mChannelsPerFrame = powd->channels; format.mFramesPerPacket = 1; format.mBytesPerPacket = format.mChannelsPerFrame * sizeof(float); @@ -235,6 +236,7 @@ static int osx_write_open(struct writer_node *wn) kAudioUnitScope_Input, 0, &inputCallback, sizeof(inputCallback)) < 0) goto e3; + wn->min_iqs = powd->channels * 2; return 1; e3: destroy_buffers(powd); @@ -246,7 +248,7 @@ e0: return ret; } -__malloc void *osx_write_parse_config(char *options) +__malloc static void *osx_write_parse_config(const char *options) { struct osx_write_args_info *conf = para_calloc(sizeof(struct osx_write_args_info)); @@ -261,6 +263,11 @@ err_out: } +static void osx_free_config(void *conf) +{ + osx_cmdline_parser_free(conf); +} + static void osx_write_close(struct writer_node *wn) { struct private_osx_write_data *powd = wn->private_data; @@ -273,72 +280,72 @@ static void osx_write_close(struct writer_node *wn) free(powd); } -static int need_new_buffer(struct writer_node *wn) +static void osx_write_post_select(__a_unused struct sched *s, struct task *t) { - struct writer_node_group *wng = wn->wng; + struct writer_node *wn = container_of(t, struct writer_node, task); struct private_osx_write_data *powd = wn->private_data; + struct btr_node *btrn = wn->btrn; + char *data; + size_t bytes; + int ret = 0; - if (*wng->loaded < sizeof(short)) - return 0; - if (powd->to->remaining) /* Non empty buffer, must still be playing */ - return 0; - return 1; -} - -static int osx_write_post_select(__a_unused struct sched *s, - struct writer_node *wn) -{ - struct private_osx_write_data *powd = wn->private_data; - struct writer_node_group *wng = wn->wng; - short *data = (short*)wng->buf; - - if (!need_new_buffer(wn)) - return 1; - fill_buffer(powd->to, data, *wng->loaded / sizeof(short)); - powd->to = powd->to->next; - wn->written = *wng->loaded; - if (!powd->play) { - if (AudioOutputUnitStart(powd->audio_unit)) - return -E_UNIT_START; - powd->play = 1; + while (powd->to->remaining <= 0) { + ret = btr_node_status(wn->btrn, wn->min_iqs, BTR_NT_LEAF); + if (ret <= 0) + break; + btr_merge(btrn, 8192); + bytes = btr_next_buffer(btrn, &data); + //PARA_CRIT_LOG("have: %zu\n", bytes); + fill_buffer(powd->to, (short *)data, bytes / sizeof(short)); + btr_consume(btrn, bytes); + if (!powd->play) { + ret = -E_UNIT_START; + if (AudioOutputUnitStart(powd->audio_unit)) + break; + powd->play = 1; + } + powd->to = powd->to->next; } - return 1; + if (ret < 0) + btr_remove_node(btrn); + t->error = ret; } -static int osx_write_pre_select(struct sched *s, __a_unused struct writer_node *wn) +static void osx_write_pre_select(struct sched *s, struct task *t) { + struct writer_node *wn = container_of(t, struct writer_node, task); struct private_osx_write_data *powd = wn->private_data; - struct writer_node_group *wng = wn->wng; - size_t numbytes = powd->to->remaining * sizeof(short); struct timeval tmp = {.tv_sec = 1, .tv_usec = 0}, delay = tmp; unsigned long divisor; + size_t numbytes = powd->to->remaining * sizeof(short); + int ret = btr_node_status(wn->btrn, wn->min_iqs, BTR_NT_LEAF); - if (!numbytes && *wng->loaded >= sizeof(short)) - goto min_delay; /* there's a buffer to fill */ - if (!numbytes) - return 1; - divisor = powd->samplerate * powd->channels * 2 / numbytes; + if (ret < 0) + sched_min_delay(s); + if (ret <= 0 || numbytes < wn->min_iqs) + return; + divisor = powd->samplerate * wn->min_iqs / numbytes; if (divisor) tv_divide(divisor, &tmp, &delay); - if (tv_diff(&s->timeout, &delay, NULL) > 0) - s->timeout = delay; -// PARA_DEBUG_LOG("delay: %lu:%lu\n", (long unsigned) s->timeout.tv_sec, -// (long unsigned) s->timeout.tv_usec); - return 1; -min_delay: - PARA_DEBUG_LOG("%s\n", "minimal delay"); - s->timeout.tv_sec = 0; - s->timeout.tv_usec = 1; - return 1; + sched_request_timeout(&delay, s); } /** the init function of the osx writer */ void osx_write_init(struct writer *w) { + struct osx_write_args_info dummy; + + osx_cmdline_parser_init(&dummy); w->open = osx_write_open; w->close = osx_write_close; w->pre_select = osx_write_pre_select; w->post_select = osx_write_post_select; w->parse_config = osx_write_parse_config; + w->free_config = osx_free_config; w->shutdown = NULL; /* nothing to do */ + w->help = (struct ggo_help) { + .short_help = osx_write_args_info_help, + .detailed_help = osx_write_args_info_detailed_help + }; + osx_cmdline_parser_free(&dummy); }