X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=osx_write.c;h=cfd02e7453b1ccac04eb951e5f42009801806b55;hp=36cd011be2a74142af165c971aed7a179f4ef868;hb=edeb499676e6d042ef1a913914a9fcb45a8cadde;hpb=88817381ee586d591bccbed2a132f6f1b181db4e diff --git a/osx_write.c b/osx_write.c index 36cd011b..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. */ @@ -57,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; }; @@ -94,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; } @@ -129,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); /* @@ -160,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 btr_node *btrn = wn->btrn; - struct osx_write_args_info *conf = wn->conf; + int32_t val; - wn->private_data = powd; /* where did that default audio output go? */ desc.componentType = kAudioUnitType_Output; desc.componentSubType = kAudioUnitSubType_DefaultOutput; @@ -189,18 +225,12 @@ static int osx_write_open(struct writer_node *wn) if (AudioUnitInitialize(powd->audio_unit)) goto e1; powd->play = 0; - 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; - } + 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 @@ -208,31 +238,36 @@ static int osx_write_open(struct writer_node *wn) * any format conversions necessary from your format to the device's * format. */ - 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; + 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, sizeof(inputCallback)) < 0) goto e3; - wn->min_iqs = powd->channels * 2; return 1; e3: destroy_buffers(powd); @@ -276,17 +311,6 @@ static void osx_write_close(struct writer_node *wn) free(powd); } -static int need_new_buffer(struct writer_node *wn) -{ - struct private_osx_write_data *powd = wn->private_data; - - 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 void osx_write_post_select(__a_unused struct sched *s, struct task *t) { struct writer_node *wn = container_of(t, struct writer_node, task); @@ -294,28 +318,34 @@ static void osx_write_post_select(__a_unused struct sched *s, struct task *t) struct btr_node *btrn = wn->btrn; char *data; size_t bytes; - int ret = btr_node_status(wn->btrn, wn->min_iqs, BTR_NT_LEAF); + int ret = 0; - if (ret <= 0) - goto out; - if (!need_new_buffer(wn)) - 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; - if (!powd->play) { - ret = -E_UNIT_START; - if (AudioOutputUnitStart(powd->audio_unit)) - goto out; - 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; } - ret = 1; -out: - if (ret < 0) + if (ret < 0 && powd->from->remaining <= 0) { btr_remove_node(btrn); - t->error = ret; + t->error = ret; + } } static void osx_write_pre_select(struct sched *s, struct task *t) @@ -331,7 +361,7 @@ static void osx_write_pre_select(struct sched *s, struct task *t) sched_min_delay(s); if (ret <= 0 || numbytes < wn->min_iqs) return; - divisor = powd->samplerate * wn->min_iqs / numbytes; + divisor = powd->sample_rate * wn->min_iqs / numbytes; if (divisor) tv_divide(divisor, &tmp, &delay); sched_request_timeout(&delay, s);