* */
struct slot_info slot[MAX_STREAM_SLOTS];
+/** The vss status flags audiod is interested in. */
+enum vss_status_flags {
+ /** Whether the 'N' flag is set. */
+ VSS_STATUS_FLAG_NEXT = 1,
+ /** The 'P' flag is set. */
+ VSS_STATUS_FLAG_PLAYING = 2,
+};
+
+/**
+ * The task for obtaining para_server's status (para_client stat).
+ *
+ * \sa struct task, struct sched.
+ */
+struct status_task {
+ /** The associated task structure of audiod. */
+ struct task task;
+ /** Client data associated with the stat task. */
+ struct client_task *ct;
+ /** Do not restart client command until this time. */
+ struct timeval restart_barrier;
+ /** Last time we received status data from para_server. */
+ struct timeval last_status_read;
+ /** The offset value announced by para_server. */
+ int offset_seconds;
+ /** The length of the current audio file as announced by para_server. */
+ int length_seconds;
+ /** The start of the current stream from the view of para_server. */
+ struct timeval server_stream_start;
+ /** The average time deviation between para_server and para_audiod. */
+ struct timeval sa_time_diff;
+ /** Whether client time is ahead of server time. */
+ int sa_time_diff_sign;
+ /** The 'P' and the 'N' flags as announced by para_server. */
+ enum vss_status_flags vss_status;
+ /** Number of times the clock difference is to be checked. */
+ unsigned clock_diff_count;
+ /** When to start the next check for clock difference. */
+ struct timeval clock_diff_barrier;
+ /** Number of the audio format as announced by para_server. */
+ int current_audio_format_num;
+};
/** The array of status items sent by para_server. */
char *stat_item_values[NUM_STAT_ITEMS] = {NULL};
int total = 0, use_server_time = 1,
length_seconds = stat_task->length_seconds;
- if (!stat_task->playing) {
+ if (!(stat_task->vss_status & VSS_STATUS_FLAG_PLAYING)) {
if (length_seconds)
return NULL;
return make_message("%s:\n", status_item_list[SI_PLAY_TIME]);
return ret;
}
+/* return: 0: Not running, 1: Running, -1: Running but eof (or error) */
static int receiver_running(int format)
{
- int i;
+ int i, ret = 0;
FOR_EACH_SLOT(i) {
struct slot_info *s = &slot[i];
- if (s->format == format && s->receiver_node)
+ if (s->format != format)
+ continue;
+ if (!s->receiver_node)
+ continue;
+ if (s->receiver_node->task.error >= 0)
return 1;
+ ret = -1;
}
- return 0;
+ return ret;
}
-static int open_current_receiver(struct sched *s)
+static void open_current_receiver(struct sched *s)
{
struct timeval diff;
- int cafn = stat_task->current_audio_format_num;
+ int ret, cafn = stat_task->current_audio_format_num;
if (cafn < 0 || !stat_task->ct)
- return 0;
- if (receiver_running(cafn))
- return 0;
+ return;
+ /* Do nothing if the 'N' flag is set or the 'P' flag is unset */
+ if (stat_task->vss_status != VSS_STATUS_FLAG_PLAYING)
+ return;
+ ret = receiver_running(cafn);
+ if (ret > 0) /* already running and not eof */
+ return;
+ if (ret < 0) { /* eof */
+ /*
+ * para_server uses a zero start time during the announcement
+ * period, i.e. before it sends the first chunk. Wait until
+ * this period begins to avoid restarting the receiver that
+ * belongs to the file just completed.
+ */
+ if (stat_task->server_stream_start.tv_sec)
+ return;
+ }
if (tv_diff(now, &afi[cafn].restart_barrier, &diff) < 0) {
+ /* avoid busy loop */
s->timeout = diff;
- return 0;
+ return;
}
- return open_receiver(cafn) < 0? 0 : 1;
+ /* start a new receiver */
+ open_receiver(cafn);
}
static unsigned compute_time_diff(const struct timeval *status_time)
stat_item_values[itemnum] = para_strdup(line);
ilen = strlen(status_item_list[itemnum]);
switch (itemnum) {
- case SI_STATUS:
- stat_task->playing = strstr(line, "playing")? 1 : 0;
- PARA_INFO_LOG("stat task playing: %d\n", stat_task->playing);
+ case SI_STATUS_FLAGS:
+ stat_task->vss_status = 0;
+ if (strchr(line, 'N'))
+ stat_task->vss_status |= VSS_STATUS_FLAG_NEXT;
+ if (strchr(line, 'P'))
+ stat_task->vss_status |= VSS_STATUS_FLAG_PLAYING;
break;
case SI_OFFSET:
stat_task->offset_seconds = atoi(line + ilen + 1);
dump_empty_status();
stat_task->length_seconds = 0;
stat_task->offset_seconds = 0;
+ stat_task->vss_status = 0;
audiod_status_dump();
- stat_task->playing = 0;
}
/**
FOR_EACH_SLOT(i)
try_to_close_slot(i);
- if (audiod_status != AUDIOD_ON || !stat_task->playing)
+ if (audiod_status != AUDIOD_ON ||
+ !(stat_task->vss_status & VSS_STATUS_FLAG_PLAYING))
return kill_all_decoders(-E_NOT_PLAYING);
open_current_receiver(s);
FOR_EACH_SLOT(i) {