audiod: Kill unused initial_delay_barrier.
[paraslash.git] / audiod.c
index 1734c70357537cf942f1dad0172cd6167e454ba0..41fcdd8f1bc5e49ec49ff3d44369cdeb81ab4f19 100644 (file)
--- a/audiod.c
+++ b/audiod.c
@@ -142,7 +142,6 @@ static struct status_task status_task_struct;
  * \sa struct status_task
  */
 static struct status_task *stat_task = &status_task_struct;
-static struct timeval initial_delay_barrier;
 
 /**
  * the task for handling audiod commands
@@ -160,8 +159,9 @@ struct command_task {
 #define FOR_EACH_AUDIO_FORMAT(af) for (af = 0; af < NUM_AUDIO_FORMATS; af++)
 
 /**
- * get the audio format number
- * \param name the name of the audio format
+ * Get the audio format number.
+ *
+ * \param name The name of the audio format.
  *
  * \return The audio format number on success, -E_UNSUPPORTED_AUDIO_FORMAT if
  * \a name is not a supported audio format.
@@ -178,6 +178,27 @@ int get_audio_format_num(const char *name)
        return -E_UNSUPPORTED_AUDIO_FORMAT;
 }
 
+/**
+ * Compute the play time based on information of the given slot.
+ *
+ * \param slot_num The slot number (negative means: no slot).
+ *
+ * This computes a string of the form "0:07 [3:33] (3%/3:40)" using information
+ * from the status items received from para_server and the start time of the
+ * (first) writer of the given slot.
+ *
+ * It has to to take into account that probably the stream was not started at
+ * the beginning of the file, that the clock between the server and the client
+ * host may differ and that playback of the stream was delayed, e.g. because
+ * the prebuffer filter is used in the filter chain of the given slot.
+ *
+ * If no writer is active in the given slot, or \a slot_num is negative
+ * (indicating that para_audiod runs in standby mode), an approximation based
+ * only on the status items is computed and the returned string is prefixed
+ * with "~".
+ *
+ * \return A string that must be freed by the caller.
+ */
 char *get_time_string(int slot_num)
 {
        int ret, seconds = 0, length;
@@ -527,16 +548,13 @@ static int open_receiver(int format)
        int ret, slot_num;
        struct receiver *r = a->receiver;
        struct receiver_node *rn;
-       const struct timeval restart_delay = {2, 0};
 
+       tv_add(now, &(struct timeval)EMBRACE(2, 0), &a->restart_barrier);
        ret = get_empty_slot();
        if (ret < 0)
-               goto err;
+               return ret;
        slot_num = ret;
-       s = &slot[slot_num];
-       s->format = format;
-       s->receiver_node = para_calloc(sizeof(struct receiver_node));
-       rn = s->receiver_node;
+       rn = para_calloc(sizeof(*rn));
        rn->receiver = r;
        rn->conf = a->receiver_conf;
        rn->btrn = btr_new_node(&(struct btr_node_description)
@@ -545,21 +563,18 @@ static int open_receiver(int format)
        if (ret < 0) {
                btr_free_node(rn->btrn);
                free(rn);
-               s->receiver_node = NULL;
-               goto err;
+               return ret;
        }
+       s = &slot[slot_num];
+       s->format = format;
+       s->receiver_node = rn;
        PARA_NOTICE_LOG("started %s: %s receiver in slot %d\n",
-               audio_formats[s->format], r->name, slot_num);
+               audio_formats[format], r->name, slot_num);
        rn->task.pre_select = r->pre_select;
        rn->task.post_select = r->post_select;
        sprintf(rn->task.status, "%s receiver node", r->name);
        register_task(&rn->task);
-       ret = slot_num;
-err:
-       if (ret < 0)
-               PARA_ERROR_LOG("%s\n", para_strerror(-ret));
-       tv_add(now, &restart_delay, &afi[format].restart_barrier);
-       return ret;
+       return slot_num;
 }
 
 /* return: 0: Not running, 1: Running, -1: Running but eof (or error) */
@@ -580,6 +595,15 @@ static int receiver_running(int format)
        return ret;
 }
 
+/**
+ * Return the root node of the current buffer tree.
+ *
+ * This is only used for stream grabbing.
+ *
+ * \return \p NULL if no slot is currently active. If more than one buffer tree
+ * exists, the node corresponding to the most recently started receiver is
+ * returned.
+ */
 struct btr_node *audiod_get_btr_root(void)
 {
        int i, newest_slot = -1;
@@ -603,23 +627,22 @@ struct btr_node *audiod_get_btr_root(void)
        return slot[newest_slot].receiver_node->btrn;
 }
 
-/* returns slot num on success. */
-static int open_current_receiver(void)
+/* whether a new instance of a decoder should be started. */
+static bool must_start_decoder(void)
 {
        int ret, cafn = stat_task->current_audio_format_num;
 
        if (cafn < 0 || !stat_task->ct)
-               return -1;
+               return false;
        /* Do nothing if the 'N' flag is set or the 'P' flag is unset */
        if (stat_task->vss_status != VSS_STATUS_FLAG_PLAYING)
-               return -1;
+               return false;
        ret = receiver_running(cafn);
        if (ret != 0) /* already running */
-               return -1;
+               return false;
        if (tv_diff(now, &afi[cafn].restart_barrier, NULL) < 0)
-               return -1;
-       /* start a new receiver */
-       return open_receiver(cafn);
+               return false;
+       return true;
 }
 
 static unsigned compute_time_diff(const struct timeval *status_time)
@@ -654,9 +677,9 @@ static unsigned compute_time_diff(const struct timeval *status_time)
                &tmp);
        stat_task->sa_time_diff = tmp;
        PARA_INFO_LOG("time diff (cur/avg): %s%lums/%s%lums\n",
-               sign > 0? "+" : "-",
+               sign < 0? "-" : "+",
                tv2ms(&diff),
-               sa_time_diff_sign ? "+" : "-",
+               sa_time_diff_sign < 0? "-" : "+",
                tv2ms(&stat_task->sa_time_diff)
        );
 out:
@@ -689,20 +712,8 @@ static int update_item(int itemnum, char *buf)
                break;
        case SI_STREAM_START:
                if (sscanf(buf, "%lu.%lu", &sec, &usec) == 2) {
-                       struct timeval a_start, delay;
-                       delay.tv_sec = conf.stream_delay_arg / 1000;
-                       delay.tv_usec = (conf.stream_delay_arg % 1000) * 1000;
                        stat_task->server_stream_start.tv_sec = sec;
                        stat_task->server_stream_start.tv_usec = usec;
-                       if (compute_time_diff(NULL) > 2) {
-                               if (stat_task->sa_time_diff_sign < 0)
-                                       tv_add(&stat_task->server_stream_start,
-                                               &stat_task->sa_time_diff, &a_start);
-                               else
-                                       tv_diff(&stat_task->server_stream_start,
-                                               &stat_task->sa_time_diff, &a_start);
-                               tv_add(&a_start, &delay, &initial_delay_barrier);
-                       }
                }
                break;
        case SI_CURRENT_TIME:
@@ -843,6 +854,17 @@ static int init_default_filters(void)
 
                if (a->num_filters)
                        continue; /* no default -- nothing to to */
+               /*
+                * If udp is used to receive this audiod format, add fecdec as
+                * the first filter.
+                */
+               if (strcmp(afi[i].receiver->name, "udp") == 0) {
+                       tmp = para_strdup("fecdec");
+                       add_filter(i, tmp);
+                       free(tmp);
+                       if (ret < 0)
+                               goto out;
+               }
                /* add "dec" to audio format name */
                tmp = make_message("%sdec", audio_formats[i]);
                for (j = 0; filters[j].name; j++)
@@ -868,7 +890,7 @@ static int parse_filter_args(void)
 {
        int i, ret, nf;
 
-       nf = PARA_MAX(1U, conf.filter_given);
+       nf = PARA_MAX(2U, 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 *));
@@ -1098,9 +1120,13 @@ static void start_stop_decoders(void)
        if (audiod_status != AUDIOD_ON ||
                        !(stat_task->vss_status & VSS_STATUS_FLAG_PLAYING))
                return kill_all_decoders(-E_NOT_PLAYING);
-       ret = open_current_receiver();
-       if (ret < 0)
+       if (!must_start_decoder())
+               return;
+       ret = open_receiver(stat_task->current_audio_format_num);
+       if (ret < 0) {
+               PARA_ERROR_LOG("%s\n", para_strerror(-ret));
                return;
+       }
        sl = slot + ret;
        a = afi + sl->format;
        if (a->num_filters)
@@ -1113,10 +1139,20 @@ static void start_stop_decoders(void)
 static void status_pre_select(struct sched *s, struct task *t)
 {
        struct status_task *st = container_of(t, struct status_task, task);
-       int ret;
+       int ret, cafn = stat_task->current_audio_format_num;
 
+       if (must_start_decoder())
+               goto min_delay;
        ret = btr_node_status(st->btrn, 0, BTR_NT_LEAF);
-       sched_request_barrier(&st->restart_barrier, s);
+       if (ret > 0)
+               goto min_delay;
+       if (!st->ct)
+               sched_request_barrier_or_min_delay(&st->restart_barrier, s);
+       if (cafn >= 0)
+               sched_request_barrier(&afi[cafn].restart_barrier, s);
+       return;
+min_delay:
+       sched_min_delay(s);
 }
 
 /* restart the client task if necessary */