struct slot_info {
/** number of the audio format in this slot */
int format;
- /** time of the last successful read from the receiver */
- struct timeval rtime;
- /** time the last write to the write fd happend */
- struct timeval wtime;
/** writer start time */
struct timeval wstime;
/** the receiver info associated with this slot */
if (s->format < 0 || !s->receiver_node)
return;
a = &afi[s->format];
- PARA_NOTICE_LOG("closing %s recevier in slot %d (eof = %d)\n",
+ PARA_NOTICE_LOG("closing %s receiver in slot %d (eof = %d)\n",
audio_formats[s->format] , slot_num, s->receiver_node->eof);
if (!s->receiver_node->eof)
unregister_task(&s->receiver_node->task);
static void wng_event_handler(struct task *t)
{
- struct writer_node_group *g = t->private_data;
- int i;
-
PARA_INFO_LOG("%s\n", PARA_STRERROR(-t->ret));
unregister_task(t);
- FOR_EACH_SLOT(i) {
- if (slot[i].wng != g)
- continue;
- wng_close(g);
- wng_destroy(g);
- slot[i].wng = NULL;
- }
}
-static void open_writer(int slot_num)
+static void open_writers(int slot_num)
{
int ret, i;
struct slot_info *s = &slot[slot_num];
for (i = 0; i < a->num_writers; i++) {
s->wng->writer_nodes[i].conf = a->writer_conf[i];
s->wng->writer_nodes[i].writer = a->writers[i];
- sprintf(s->wng->writer_nodes[i].task.status, "writer_ node");
+ sprintf(s->wng->writer_nodes[i].task.status, "writer_node");
}
ret = wng_open(s->wng);
s->wstime = *now;
clean_exit(EXIT_FAILURE, PARA_STRERROR(-slot_num));
s = &slot[slot_num];
s->format = format;
- s->rtime = *now;
- s->wtime = s->rtime;
s->receiver_node = para_calloc(sizeof(struct receiver_node));
rn = s->receiver_node;
rn->receiver = a->receiver;
PARA_NOTICE_LOG("started %s: %s receiver in slot %d\n",
audio_formats[s->format], a->receiver->name, slot_num);
rn->task.private_data = s->receiver_node;
- PARA_NOTICE_LOG("rn = %p\n", rn->task.private_data);
rn->task.pre_select = a->receiver->pre_select;
rn->task.post_select = a->receiver->post_select;
rn->task.event_handler = rn_event_handler;
}
}
-static void check_timeouts(void)
-{
-
- int slot_num, timeout = conf.stream_timeout_arg;
-
- FOR_EACH_SLOT(slot_num) {
- struct slot_info *s = &slot[slot_num];
- if (s->format < 0)
- continue;
- /* check read time */
- if (s->receiver_node &&
- now->tv_sec > s->rtime.tv_sec + timeout) {
- PARA_INFO_LOG("%s stream (slot %d) not ready\n",
- audio_formats[s->format], slot_num);
- s->receiver_node->eof = 1;
- }
- }
-}
-
-static void close_decoder_if_idle(int slot_num)
+static void try_to_close_slot(int slot_num)
{
struct slot_info *s = &slot[slot_num];
if (s->format < 0)
return;
- if (!s->fc)
+ if (s->receiver_node && !s->receiver_node->eof)
return;
- if (s->wng)
+ if (s->fc && !s->fc->eof)
return;
- PARA_INFO_LOG("closing all filters in slot %d (filter_chain %p)\n",
- slot_num, s->fc);
+ if (s->wng && !s->wng->eof)
+ return;
+ PARA_INFO_LOG("closing slot %d \n", slot_num);
+ wng_close(s->wng);
+ wng_destroy(s->wng);
close_filters(s->fc);
free(s->fc);
close_receiver(slot_num);
kill_all_decoders();
else if (playing)
open_current_receiver();
- check_timeouts();
FOR_EACH_SLOT(i) {
struct receiver_node *rn;
- close_decoder_if_idle(i);
+ try_to_close_slot(i);
if (slot[i].format < 0)
continue;
rn = slot[i].receiver_node;
if (rn && rn->loaded && !slot[i].wng) {
open_filters(i);
- open_writer(i);
+ open_writers(i);
}
}
}
static void audiod_post_select(struct sched *s, __a_unused struct task *t)
{
- int i;
-
+ /* only save away the current time for other users */
now = &s->now;
- FOR_EACH_SLOT(i) {
- struct receiver_node *rn = slot[i].receiver_node;
-
- if (rn && rn->loaded)
- slot[i].rtime = *now;
- }
}
static void init_audiod_task(struct audiod_task *at)
return filter_num;
}
-static int setup_default_filters(void)
-{
- int i, ret = 1;
-
- FOR_EACH_AUDIO_FORMAT(i) {
- struct audio_format_info *a = &afi[i];
- char *tmp;
- int j;
- if (a->num_filters)
- continue;
- /* add "dec" to audio format name */
- tmp = make_message("%sdec", audio_formats[i]);
- for (j = 0; filters[j].name; j++)
- if (!strcmp(tmp, filters[j].name))
- break;
- free(tmp);
- ret = -E_UNSUPPORTED_FILTER;
- if (!filters[j].name)
- goto out;
- tmp = para_strdup(filters[j].name);
- ret = add_filter(i, tmp);
- free(tmp);
- if (ret < 0)
- goto out;
- PARA_INFO_LOG("%s -> default filter: %s\n", audio_formats[i],
- filters[j].name);
- ret = add_filter(i, "wav");
- if (ret < 0)
- goto out;
- PARA_INFO_LOG("%s -> default filter: wav\n", audio_formats[i]);
- }
-out:
- return ret;
-}
-
static int init_writers(void)
{
int i, ret, nw;
init_supported_writers();
nw = PARA_MAX(1, conf.writer_given);
- PARA_INFO_LOG("allocating space for %d writers\n", nw);
+ PARA_INFO_LOG("maximal number of writers: %d\n", nw);
FOR_EACH_AUDIO_FORMAT(i) {
a = &afi[i];
a->writer_conf = para_malloc(nw * sizeof(void *));
ret = writer_num;
goto out;
}
- a->writers[nw] = &writers[ret];
+ a->writers[nw] = &writers[writer_num];
a->writer_conf[nw] = wconf;
PARA_INFO_LOG("%s writer #%d: %s\n", audio_formats[ret],
nw, writer_names[writer_num]);
return ret;
}
+static int init_default_filters(void)
+{
+ int i, ret = 1;
+
+ FOR_EACH_AUDIO_FORMAT(i) {
+ struct audio_format_info *a = &afi[i];
+ char *tmp;
+ int j;
+
+ if (a->num_filters)
+ continue; /* no default -- nothing to to */
+ /* add "dec" to audio format name */
+ tmp = make_message("%sdec", audio_formats[i]);
+ for (j = 0; filters[j].name; j++)
+ if (!strcmp(tmp, filters[j].name))
+ break;
+ free(tmp);
+ ret = -E_UNSUPPORTED_FILTER;
+ if (!filters[j].name)
+ goto out;
+ tmp = para_strdup(filters[j].name);
+ ret = add_filter(i, tmp);
+ free(tmp);
+ if (ret < 0)
+ goto out;
+ PARA_INFO_LOG("%s -> default filter: %s\n", audio_formats[i],
+ filters[j].name);
+ }
+out:
+ return ret;
+}
+
static int init_filters(void)
{
int i, ret, nf;
filter_init(filters);
- nf = PARA_MAX(2, conf.filter_given) + 1;
- PARA_INFO_LOG("allocating space for %d filters\n", nf);
+ nf = PARA_MAX(1, conf.filter_given);
+ PARA_INFO_LOG("maximal number of filters: %d\n", nf);
FOR_EACH_AUDIO_FORMAT(i) {
afi[i].filter_conf = para_malloc(nf * sizeof(void *));
afi[i].filters = para_malloc(nf * sizeof(struct filter *));
}
if (!conf.no_default_filters_given)
- return setup_default_filters();
+ return init_default_filters();
for (i = 0; i < conf.filter_given; i++) {
char *arg = conf.filter_arg[i];
char *filter_name = strchr(arg, ':');
if (ret < 0)
goto out;
}
- ret = 1;
+ ret = init_default_filters(); /* use default values for the rest */
out:
return ret;
}
if (ret <= 0) {
close_stat_pipe();
/* avoid busy loop if server is down */
- while (sleep(1) > 0)
+ while (sleep(1) > 0) /* FIXME */
; /* try again*/
} else {
st->buf[ret + st->loaded] = '\0';