X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=osx_write.c;h=cfd02e7453b1ccac04eb951e5f42009801806b55;hp=97a7ccf49ba74977718e335f15142306e11c2c91;hb=edeb499676e6d042ef1a913914a9fcb45a8cadde;hpb=a694ab16b6ff43b545ccd530360b7224433a5b76 diff --git a/osx_write.c b/osx_write.c index 97a7ccf4..cfd02e74 100644 --- a/osx_write.c +++ b/osx_write.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2009 Andre Noll + * Copyright (C) 2006-2010 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -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" @@ -54,7 +57,9 @@ struct private_osx_write_data { /** the post_select writes audio data here */ struct osx_buffer *to; /** sample rate of the current audio stream */ - unsigned samplerate; + unsigned sample_rate; + /** Sample format of the current audio stream */ + unsigned sample_format; /** number of channels of the current audio stream */ unsigned channels; }; @@ -91,19 +96,41 @@ static void init_buffers(struct writer_node *wn) *ptrptr = powd->from = powd->to; } -static void fill_buffer(struct osx_buffer *b, short *source, long size) +static void fill_buffer(struct private_osx_write_data *powd, char *data, long bytes) { + struct osx_buffer *b = powd->to; float *dest; + long samples; + enum sample_format sf = powd->sample_format; - if (b->remaining) /* Non empty buffer, must still be playing */ - return; - if (b->size != size) { - b->buffer = para_realloc(b->buffer, size * sizeof(float)); - b->size = size; + samples = (sf == SF_S8 || sf == SF_U8)? bytes : bytes / 2; + assert(b->remaining == 0 || samples > 0); + if (b->size != samples) { + b->buffer = para_realloc(b->buffer, samples * sizeof(float)); + b->size = samples; } dest = b->buffer; - while (size--) - *dest++ = (*source++) / 32768.0; + switch (powd->sample_format) { + case SF_U8: { + uint8_t *src = (uint8_t *)data; + while (samples--) { + *dest++ = (*src++) / 256.0; + } + break; + } + case SF_S8: { + int8_t *src = (int8_t *)data; + while (samples--) { + *dest++ = ((*src++) + 128) / 256.0; + } + break; + } + default: { + short *src = (short *)data; + while (samples--) + *dest++ = (*src++) / 32768.0; + } + } b->ptr = b->buffer; b->remaining = b->size; } @@ -126,9 +153,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("buffer underrun\n"); - return 0; + 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); /* @@ -157,17 +189,24 @@ static OSStatus osx_callback(void * inClientData, static int osx_write_open(struct writer_node *wn) { - struct private_osx_write_data *powd = para_calloc( - sizeof(struct private_osx_write_data)); + struct private_osx_write_data *powd = para_calloc(sizeof(*powd)); + + wn->private_data = powd; + init_buffers(wn); + return 0; +} + +static int core_audio_init(struct writer_node *wn) +{ + struct private_osx_write_data *powd = wn->private_data; ComponentDescription desc; Component comp; AURenderCallbackStruct inputCallback = {osx_callback, powd}; AudioStreamBasicDescription format; int ret; - struct writer_node_group *wng = wn->wng; - struct osx_write_args_info *conf = wn->conf; + struct btr_node *btrn = wn->btrn; + int32_t val; - wn->private_data = powd; /* where did that default audio output go? */ desc.componentType = kAudioUnitType_Output; desc.componentSubType = kAudioUnitSubType_DefaultOutput; @@ -186,39 +225,44 @@ 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. + get_btr_sample_rate(btrn, &val); + powd->sample_rate = val; + get_btr_channels(btrn, &val); + powd->channels = val; + get_btr_sample_format(btrn, &val); + powd->sample_format = val; + /* + * 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*/ format.mFormatID = kAudioFormatLinearPCM; + format.mFramesPerPacket = 1; + format.mSampleRate = powd->sample_rate; /* 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; + switch (powd->sample_format) { + case SF_S8: + case SF_U8: + wn->min_iqs = powd->channels; + break; + default: + wn->min_iqs = powd->channels * 2; + } + format.mBitsPerChannel = 8 * sizeof(float); + format.mBytesPerPacket = powd->channels * sizeof(float); + format.mBytesPerFrame = format.mBytesPerPacket; format.mChannelsPerFrame = powd->channels; - format.mFramesPerPacket = 1; - format.mBytesPerPacket = format.mChannelsPerFrame * sizeof(float); - format.mBytesPerFrame = format.mFramesPerPacket * format.mBytesPerPacket; - /* one of the most constant constants of the whole computer history */ - format.mBitsPerChannel = sizeof(float) * 8; + ret = -E_STREAM_FORMAT; if (AudioUnitSetProperty(powd->audio_unit, kAudioUnitProperty_StreamFormat, kAudioUnitScope_Input, 0, &format, sizeof(AudioStreamBasicDescription))) goto e2; - init_buffers(wn); ret = -E_ADD_CALLBACK; if (AudioUnitSetProperty(powd->audio_unit, kAudioUnitProperty_SetRenderCallback, kAudioUnitScope_Input, 0, &inputCallback, @@ -250,6 +294,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; @@ -262,72 +311,78 @@ static void osx_write_close(struct writer_node *wn) free(powd); } -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)) - 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 = 0; - 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; + if (powd->sample_rate == 0) { + ret = core_audio_init(wn); + if (ret < 0) + break; + } + btr_merge(btrn, 8192); + bytes = btr_next_buffer(btrn, &data); + //PARA_CRIT_LOG("have: %zu\n", bytes); + fill_buffer(powd, data, bytes); + 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; + } + if (ret < 0 && powd->from->remaining <= 0) { + btr_remove_node(btrn); + t->error = ret; } - return 1; } -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->sample_rate * 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); }