From: Andre Noll Date: Wed, 27 Jan 2010 11:56:06 +0000 (+0100) Subject: Add buffer tree support for the osx writer. X-Git-Tag: v0.4.2~64^2 X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=88817381ee586d591bccbed2a132f6f1b181db4e;p=paraslash.git Add buffer tree support for the osx writer. Fix makes paraslash build again on Max OS. --- diff --git a/ggo/osx_write.ggo b/ggo/osx_write.ggo index ce2792e5..c73ad2a8 100644 --- a/ggo/osx_write.ggo +++ b/ggo/osx_write.ggo @@ -3,8 +3,11 @@ section "osx options" option "channels" c #~~~~~~~~~~~~~~~~~~ -"number of channels (only neccessary for raw -audio)" +"channel count" + +details = " + Specify the number of channels. This is only neccessary for raw audio. +" int typestr="num" default="2" diff --git a/osx_write.c b/osx_write.c index 97a7ccf4..36cd011b 100644 --- a/osx_write.c +++ b/osx_write.c @@ -14,6 +14,7 @@ #include #include #include +#include #include "para.h" #include "fd.h" @@ -21,7 +22,9 @@ #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" @@ -164,7 +167,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; @@ -186,27 +189,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 | ENDIAN_FLAGS; - if (!conf->channels_given && wng->channels) - powd->channels = *wng->channels; - else - powd->channels = conf->channels_arg; format.mChannelsPerFrame = powd->channels; format.mFramesPerPacket = 1; format.mBytesPerPacket = format.mChannelsPerFrame * sizeof(float); @@ -224,6 +232,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); @@ -250,6 +259,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; @@ -264,70 +278,81 @@ static void osx_write_close(struct writer_node *wn) static int need_new_buffer(struct writer_node *wn) { - struct writer_node_group *wng = wn->wng; struct private_osx_write_data *powd = wn->private_data; - if (*wng->loaded < sizeof(short)) + if (wn->min_iqs > btr_get_input_queue_size(wn->btrn)) 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) +static void osx_write_post_select(__a_unused 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; - short *data = (short*)*wng->bufp; + struct btr_node *btrn = wn->btrn; + char *data; + size_t bytes; + int ret = btr_node_status(wn->btrn, wn->min_iqs, BTR_NT_LEAF); + if (ret <= 0) + goto out; if (!need_new_buffer(wn)) - return 1; - fill_buffer(powd->to, data, *wng->loaded / sizeof(short)); + goto out; + btr_merge(btrn, wn->min_iqs); + bytes = btr_next_buffer(btrn, &data); + fill_buffer(powd->to, (short *)data, bytes / sizeof(short)); + btr_consume(btrn, bytes); powd->to = powd->to->next; - wn->written = *wng->loaded; if (!powd->play) { + ret = -E_UNIT_START; if (AudioOutputUnitStart(powd->audio_unit)) - return -E_UNIT_START; + goto out; powd->play = 1; } - return 1; + ret = 1; +out: + 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); }