/*
- * Copyright (C) 2006-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2011 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
/** 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;
};
*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;
}
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);
/*
#define ENDIAN_FLAGS 0
#endif
-static int osx_write_open(struct writer_node *wn)
+static int core_audio_init(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));
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;
+ init_buffers(wn);
/* where did that default audio output go? */
desc.componentType = kAudioUnitType_Output;
desc.componentSubType = kAudioUnitSubType_DefaultOutput;
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
* 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);
e1:
CloseComponent(powd->audio_unit);
e0:
+ free(powd);
+ wn->private_data = NULL;
return ret;
}
-__malloc static void *osx_write_parse_config(const char *options)
+__malloc static void *osx_write_parse_config_or_die(const char *options)
{
- struct osx_write_args_info *conf
- = para_calloc(sizeof(struct osx_write_args_info));
- PARA_INFO_LOG("options: %s\n", options);
- int ret = osx_cmdline_parser_string(options, conf, "osx_write");
- if (ret)
- goto err_out;
- return conf;
-err_out:
- free(conf);
- return NULL;
+ struct osx_write_args_info *conf = para_calloc(sizeof(*conf));
+ /* exits on errors */
+ osx_cmdline_parser_string(options, conf, "osx_write");
+ return conf;
}
static void osx_free_config(void *conf)
{
struct private_osx_write_data *powd = wn->private_data;
+ if (!powd)
+ return;
PARA_INFO_LOG("closing writer node %p\n", wn);
AudioOutputUnitStop(powd->audio_unit);
AudioUnitUninitialize(powd->audio_unit);
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);
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 || powd->to->remaining <= 0) {
+ ret = btr_node_status(wn->btrn, wn->min_iqs, BTR_NT_LEAF);
+ if (ret <= 0)
+ break;
+ if (!powd) {
+ ret = core_audio_init(wn);
+ if (ret < 0)
+ break;
+ powd = wn->private_data;
+ }
+ 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 || 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)
struct writer_node *wn = container_of(t, struct writer_node, task);
struct private_osx_write_data *powd = wn->private_data;
struct timeval tmp = {.tv_sec = 1, .tv_usec = 0}, delay = tmp;
- unsigned long divisor;
- size_t numbytes = powd->to->remaining * sizeof(short);
+ unsigned long factor;
+ size_t numbytes;
int ret = btr_node_status(wn->btrn, wn->min_iqs, BTR_NT_LEAF);
- if (ret < 0)
- sched_min_delay(s);
- if (ret <= 0 || numbytes < wn->min_iqs)
+ if (ret == 0)
return;
- divisor = powd->samplerate * wn->min_iqs / numbytes;
- if (divisor)
- tv_divide(divisor, &tmp, &delay);
+ if (ret < 0 || !powd)
+ return sched_min_delay(s);
+ assert(powd->sample_rate > 0);
+ assert(wn->min_iqs > 0);
+ numbytes = powd->to->remaining * sizeof(short);
+ factor = numbytes / powd->sample_rate / wn->min_iqs;
+ tv_scale(factor, &tmp, &delay);
sched_request_timeout(&delay, s);
}
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->parse_config_or_die = osx_write_parse_config_or_die;
w->free_config = osx_free_config;
w->shutdown = NULL; /* nothing to do */
w->help = (struct ggo_help) {
projects / paraslash.git / blobdiff