/*
- * Copyright (C) 2006-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2010 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
/** the array of supported writers */
struct writer writers[NUM_SUPPORTED_WRITERS] = {WRITER_ARRAY};
-static void wng_pre_select(struct sched *s, struct task *t)
-{
- struct writer_node_group *g = container_of(t, struct writer_node_group, task);
- int i;
-
- FOR_EACH_WRITER_NODE(i, g) {
- struct writer_node *wn = &g->writer_nodes[i];
- struct writer *w = writers + wn->writer_num;
- if (!w->pre_select)
- continue;
- t->error = w->pre_select(s, wn);
- if (t->error < 0)
- return;
- }
- /*
- * Force a minimal delay if something was written during the previous
- * call to wng_post_select(). This is necessary because the filter
- * chain might still have data for us which it couldn't convert during
- * the previous run due to its buffer size constraints. In this case we
- * do not want to wait until the next input data arrives as this could
- * lead to buffer underruns.
- */
- if (g->last_written == 0)
- return;
- s->timeout.tv_sec = 0;
- s->timeout.tv_usec = 1;
-}
-
-static void wng_post_select(struct sched *s, struct task *t)
-{
- struct writer_node_group *g = container_of(t, struct writer_node_group, task);
- int i;
- size_t min_written = 0, max_written = 0;
-
- FOR_EACH_WRITER_NODE(i, g) {
- struct writer_node *wn = &g->writer_nodes[i];
- struct writer *w = writers + wn->writer_num;
- t->error = w->post_select(s, wn);
- if (t->error < 0)
- return;
- if (!i)
- min_written = wn->written;
- else
- min_written = PARA_MIN(min_written, wn->written);
- max_written = PARA_MAX(max_written, wn->written);
- }
- g->last_written = max_written;
- //PARA_INFO_LOG("loaded: %zd, min_written: %zd bytes\n", *g->loaded, min_written);
- if (min_written) {
- *g->loaded -= min_written;
- FOR_EACH_WRITER_NODE(i, g)
- g->writer_nodes[i].written -= min_written;
- }
- if (!*g->loaded && *g->input_error) {
- t->error = *g->input_error;
- return;
- }
- if (*g->loaded && min_written) {
-// PARA_INFO_LOG("moving %zd bytes\n", *g->loaded);
- memmove(*g->bufp, *g->bufp + min_written, *g->loaded);
- }
-}
-
-/**
- * call the open function of each writer in the group
- *
- * \param g the writer node group
- *
- * \return If at least one open function returned an error, all successful
- * writer notes get closed and this error value is returned. Upon success, a
- * task associated with \a g is registered to the scheduler and the function
- * returns a positive value.
- * */
-int wng_open(struct writer_node_group *g)
-{
- int i, ret = 1;
-
- PARA_NOTICE_LOG("opening wng %p with %d writer(s)\n", g, g->num_writers);
- FOR_EACH_WRITER_NODE(i, g) {
- struct writer_node *wn = &g->writer_nodes[i];
- struct writer *w = writers + wn->writer_num;
- wn->wng = g;
- ret = w->open(wn);
- if (ret < 0)
- goto err_out;
- }
- sprintf(g->task.status, "%s", "writer node group");
- register_task(&g->task);
- g->open = 1;
- return 1;
-err_out:
- PARA_ERROR_LOG("%s\n", para_strerror(-ret));
- while (i > 0) {
- struct writer_node *wn = &g->writer_nodes[--i];
- struct writer *w = writers + wn->writer_num;
- w->close(wn);
- }
- free(g->writer_nodes);
- g->num_writers = 0;
- g->task.error = -E_TASK_UNREGISTERED;
- return ret;
-}
-
-/**
- * call the close function of each writer in the given group
- *
- * \param g the writer node group to close
- *
- * This function also frees all resources of the given group.
- */
-void wng_close(struct writer_node_group *g)
-{
- int i;
-
- if (!g || !g->open)
- return;
- PARA_NOTICE_LOG("closing wng with %d writer(s)\n", g->num_writers);
- FOR_EACH_WRITER_NODE(i, g) {
- struct writer_node *wn = &g->writer_nodes[i];
- struct writer *w = writers + wn->writer_num;
- w->close(wn);
- }
- free(g->writer_nodes);
- free(g);
-}
-
-/**
- * allocate and initialize a new writer_node_group struct
- *
- * \param num_writers the number of writer nodes for the new group
- *
- * \return Pointer to the new writer node group
- */
-struct writer_node_group *wng_new(unsigned num_writers)
-{
- struct writer_node_group *g = para_calloc(sizeof(struct writer_node_group));
- g->num_writers = num_writers;
- g->writer_nodes = para_calloc(num_writers
- * sizeof(struct writer_node));
- g->task.post_select = wng_post_select;
- g->task.pre_select = wng_pre_select;
- return g;
-}
-
/**
* Call the init function of each supported paraslash writer.
*/
return NULL;
}
-/**
- * setup a writer node group with only one writer, the default writer
- *
- * The writer which is set up depends on the OS. It defaults to alsa for Linux,
- * osx_write for OS X, file writer if neither of these is supported.
- *
- * \return pointer to the allocated writer node group
- */
-struct writer_node_group *setup_default_wng(void)
-{
- struct writer_node_group *wng = wng_new(1);
- wng->writer_nodes[0].writer_num = DEFAULT_WRITER;
- PARA_INFO_LOG("using default writer: %s %p\n",
- writer_names[DEFAULT_WRITER], writers[DEFAULT_WRITER].parse_config);
- wng->writer_nodes[0].conf = writers[DEFAULT_WRITER].parse_config("");
- return wng;
-}
-
void register_writer_node(struct writer_node *wn, struct btr_node *parent)
{
struct writer *w = writers + wn->writer_num;
char *name = make_message("%s writer", writer_names[wn->writer_num]);
int ret;
- wn->btrn = btr_new_node(name, parent, w->execute, wn);
+ wn->btrn = btr_new_node(&(struct btr_node_description)
+ EMBRACE(.name = name, .parent = parent,
+ .handler = w->execute, .context = wn));
strcpy(wn->task.status, name);
free(name);
ret = w->open(wn);
- wn->task.post_select = w->post_select_btr;
- wn->task.pre_select = w->pre_select_btr;
+ wn->task.post_select = w->post_select;
+ wn->task.pre_select = w->pre_select;
register_task(&wn->task);
}
}
}
-static int get_btr_value(struct btr_node *btrn, const char *key, int32_t *result)
+static void get_btr_value(struct btr_node *btrn, const char *cmd,
+ int32_t *result)
{
char *buf = NULL;
- int ret = btr_exec_up(btrn, key, &buf);
+ int ret = btr_exec_up(btrn, cmd, &buf);
- if (ret < 0)
- return ret;
+ assert(ret >= 0);
ret = para_atoi32(buf, result);
+ assert(ret >= 0);
free(buf);
- return ret;
}
-/*
- * Ask parent btr nodes for the samplerate of the current stream.
+/**
+ * Ask parent btr nodes for the sample rate of the current stream.
+ *
+ * \param btrn Where to start the search.
+ * \param result Filled in by this function.
+ *
+ * This function is assumed to succeed and terminates on errors.
*/
-int get_btr_samplerate(struct btr_node *btrn, int32_t *result)
+void get_btr_sample_rate(struct btr_node *btrn, int32_t *result)
{
- return get_btr_value(btrn, "samplerate", result);
+ get_btr_value(btrn, "sample_rate", result);
}
-/*
+/**
* Ask parent btr nodes for the channel count of the current stream.
+ *
+ * \param btrn See \ref get_btr_sample_rate.
+ * \param result See \ref get_btr_sample_rate.
+ */
+void get_btr_channels(struct btr_node *btrn, int32_t *result)
+{
+ get_btr_value(btrn, "channels", result);
+}
+
+/**
+ * Ask parent btr nodes for the number of bits per sample and the byte sex.
+ *
+ * \param btrn See \ref get_btr_sample_rate.
+ * \param result Contains the sample format as an enum sample_format type.
*/
-int get_btr_channels(struct btr_node *btrn, int32_t *result)
+void get_btr_sample_format(struct btr_node *btrn, int32_t *result)
{
- return get_btr_value(btrn, "channels", result);
+ get_btr_value(btrn, "sample_format", result);
}
projects / paraslash.git / blobdiff