/*
- * Copyright (C) 2006-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2010 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
* <skortze@sourceforge.net>
*/
+#include <regex.h>
#include <sys/types.h>
#include <dirent.h>
-#include <CoreAudio/CoreAudio.h>
+#include <stdbool.h>
+
#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 <CoreAudio/CoreAudio.h>
+#include <CoreServices/CoreServices.h>
#include <AudioUnit/AudioUnit.h>
-#include <AudioToolbox/DefaultAudioOutput.h>
+#include <AudioToolbox/AudioToolbox.h>
/** describes one input buffer for the osx writer */
struct osx_buffer {
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;
{
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;
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);
/*
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;
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);
kAudioUnitScope_Input, 0, &inputCallback,
sizeof(inputCallback)) < 0)
goto e3;
+ wn->min_iqs = powd->channels * 2;
return 1;
e3:
destroy_buffers(powd);
}
+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;
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);
}
projects / paraslash.git / blobdiff