/*
- * Copyright (C) 1997-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2010 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
uint32_t num_chunks;
/** When the first chunk was sent. */
struct timeval start;
+ /** The duration of the full group. */
+ struct timeval duration;
/** The group duration divided by the number of slices. */
struct timeval slice_duration;
/** Group contains the audio file header that occupies that many slices. */
return 1;
}
+/* set group start and group duration */
+static void set_group_timing(struct fec_client *fc, struct fec_group *g)
+{
+ struct timeval *chunk_tv = vss_chunk_time();
+
+ tv_scale(g->num_chunks, chunk_tv, &g->duration);
+ tv_divide(fc->fcp->slices_per_group + fc->num_extra_slices,
+ &g->duration, &g->slice_duration);
+ PARA_DEBUG_LOG("durations (group/chunk/slice): %lu/%lu/%lu\n",
+ tv2ms(&g->duration), tv2ms(chunk_tv), tv2ms(&g->slice_duration));
+}
+
static int setup_next_fec_group(struct fec_client *fc, struct vss_task *vsst)
{
int ret, i, k, data_slices;
size_t len;
const char *buf, *start_buf;
- struct timeval tmp, *chunk_tv = vss_chunk_time();
struct fec_group *g = &fc->group;
unsigned slice_bytes = fc->fcp->max_slice_bytes - FEC_HEADER_SIZE;
uint32_t max_data_size;
- assert(chunk_tv);
- k = fc->fcp->data_slices_per_group + fc->num_extra_slices;
if (fc->first_stream_chunk < 0) {
- uint32_t largest = afh_get_largest_chunk_size(&mmd->afd.afhi)
- + vsst->header_len;
- uint8_t needed, want;
+ uint8_t hs, ds; /* needed header/data slices */
+ uint8_t rs = fc->fcp->slices_per_group
+ - fc->fcp->data_slices_per_group; /* redundant slices */
+ int n;
- ret = num_slices(largest, fc, &needed);
+ ret = num_slices(vsst->header_len, fc, &hs);
+ if (ret < 0)
+ return ret;
+ ret = num_slices(afh_get_largest_chunk_size(&mmd->afd.afhi),
+ fc, &ds);
+ if (ret < 0)
+ return ret;
+ k = (int)hs + ds;
+ if (k > 255)
+ return -E_BAD_CT;
+ if (k < fc->fcp->data_slices_per_group)
+ k = fc->fcp->data_slices_per_group;
+ n = k + rs;
+ fc->num_extra_slices = k - fc->fcp->data_slices_per_group;
+ PARA_NOTICE_LOG("fec parms %d:%d:%d (%d extra slices)\n",
+ slice_bytes, k, n, fc->num_extra_slices);
+ fec_free(fc->parms);
+ fc->src_data = para_realloc(fc->src_data, k * sizeof(char *));
+ ret = fec_new(k, n, &fc->parms);
if (ret < 0)
return ret;
- if (needed > fc->fcp->data_slices_per_group)
- PARA_WARNING_LOG("fec parms insufficient for this audio file\n");
- want = PARA_MAX(needed, fc->fcp->data_slices_per_group);
- if (want != k) {
- fec_free(fc->parms);
- fc->src_data = para_realloc(fc->src_data, want * sizeof(char *));
- ret = fec_new(want, want + fc->fcp->slices_per_group
- - fc->fcp->data_slices_per_group, &fc->parms);
- if (ret < 0)
- return ret;
- k = want;
- fc->num_extra_slices = 0;
- if (k > fc->fcp->data_slices_per_group) {
- fc->num_extra_slices = k - fc->fcp->data_slices_per_group;
- PARA_NOTICE_LOG("using %d extra slices\n",
- fc->num_extra_slices);
- }
- }
fc->stream_start = *now;
fc->first_stream_chunk = mmd->current_chunk;
g->first_chunk = mmd->current_chunk;
g->num = 0;
+ g->start = *now;
} else {
+ struct timeval tmp;
+ if (g->first_chunk + g->num_chunks >= mmd->afd.afhi.chunks_total)
+ return 0;
+ /*
+ * Start and duration of this group depend only on the previous
+ * group. Compute the new group start as g->start += g->duration.
+ */
+ tmp = g->start;
+ tv_add(&tmp, &g->duration, &g->start);
+ k = fc->fcp->data_slices_per_group + fc->num_extra_slices;
+ set_group_timing(fc, g);
g->first_chunk += g->num_chunks;
g->num++;
}
- if (g->first_chunk >= mmd->afd.afhi.chunks_total)
- return 0;
if (need_audio_header(fc, vsst)) {
ret = num_slices(vsst->header_len, fc, &g->num_header_slices);
if (ret < 0)
g->num_chunks = i - g->first_chunk;
assert(g->num_chunks);
fc->current_slice_num = 0;
+ if (g->num == 0)
+ set_group_timing(fc, g);
/* setup header slices */
buf = vsst->header_buf;
for (; i < k; i++)
fc->src_data[i] = (const unsigned char *)buf;
}
-
- /* setup group timing */
- tv_scale(g->first_chunk - fc->first_stream_chunk, chunk_tv, &tmp);
- tv_add(&fc->stream_start, &tmp, &g->start);
- tv_scale(g->num_chunks, chunk_tv, &tmp); /* group duration */
- tv_divide(fc->fcp->slices_per_group + fc->num_extra_slices,
- &tmp, &g->slice_duration);
-
- PARA_DEBUG_LOG("FEC group %d: %d chunks (%d - %d), %d header slices, %d data slices\n",
+ PARA_DEBUG_LOG("FEC group %d: %d chunks (%d - %d), "
+ "%d header slices, %d data slices\n",
g->num, g->num_chunks, g->first_chunk,
g->first_chunk + g->num_chunks - 1,
g->num_header_slices, data_slices
);
- PARA_DEBUG_LOG("durations (group/chunk/slice): %lu/%lu/%lu\n",
- tv2ms(&tmp), tv2ms(chunk_tv), tv2ms(&g->slice_duration));
return 1;
}
para_munmap(vsst->map, mmd->size);
vsst->map = NULL;
mmd->chunks_sent = 0;
- mmd->offset = 0;
+ //mmd->offset = 0;
mmd->afd.afhi.seconds_total = 0;
mmd->afd.afhi.chunk_tv.tv_sec = 0;
mmd->afd.afhi.chunk_tv.tv_usec = 0;
return 1;
}
+static void set_mmd_offset(void)
+{
+ struct timeval offset;
+ tv_scale(mmd->current_chunk, &mmd->afd.afhi.chunk_tv, &offset);
+ mmd->offset = tv2ms(&offset);
+}
+
/**
* Compute the timeout for the main select-loop of the scheduler.
*
mmd->chunks_sent = 0;
mmd->current_chunk = mmd->repos_request;
mmd->new_vss_status_flags &= ~VSS_REPOS;
+ set_mmd_offset();
}
if (need_to_request_new_audio_file(vsst)) {
PARA_DEBUG_LOG("ready and playing, but no audio file\n");
return 1;
}
-static void recv_afs_result(struct vss_task *vsst)
+static void recv_afs_result(struct vss_task *vsst, fd_set *rfds)
{
int ret, passed_fd, shmid;
uint32_t afs_code = 0, afs_data = 0;
struct stat statbuf;
- vsst->afsss = AFS_SOCKET_READY;
+ if (!FD_ISSET(vsst->afs_socket, rfds))
+ return;
ret = recv_afs_msg(vsst->afs_socket, &passed_fd, &afs_code, &afs_data);
+ if (ret == -ERRNO_TO_PARA_ERROR(EAGAIN))
+ return;
if (ret < 0)
goto err;
+ vsst->afsss = AFS_SOCKET_READY;
PARA_DEBUG_LOG("fd: %d, code: %u, shmid: %u\n", passed_fd, afs_code,
afs_data);
ret = -E_NOFD;
*/
static void vss_send(struct vss_task *vsst)
{
- int i, sent_something = 0;
+ int i, fec_active = 0;
struct timeval due;
struct fec_client *fc, *tmp_fc;
list_for_each_entry_safe(fc, tmp_fc, &fec_client_list, node) {
if (fc->error < 0)
continue;
- if (!next_slice_is_due(fc, NULL))
+ if (!next_slice_is_due(fc, NULL)) {
+ fec_active = 1;
continue;
+ }
if (compute_next_fec_slice(fc, vsst) <= 0)
continue;
PARA_DEBUG_LOG("sending %d:%d (%u bytes)\n", fc->group.num,
fc->fcp->max_slice_bytes,
fc->fcp->private_data);
fc->current_slice_num++;
- sent_something = 1;
+ fec_active = 1;
}
if (mmd->current_chunk >= mmd->afd.afhi.chunks_total) { /* eof */
- if (!sent_something)
+ if (!fec_active)
mmd->new_vss_status_flags |= VSS_NEXT;
return;
}
size_t len;
if (!mmd->chunks_sent) {
- struct timeval tmp;
mmd->stream_start = *now;
- tv_scale(mmd->current_chunk, &mmd->afd.afhi.chunk_tv, &tmp);
- mmd->offset = tv2ms(&tmp);
mmd->events++;
+ set_mmd_offset();
}
/*
* We call the send function also in case of empty chunks as
senders[sender_num].client_cmds[num](&mmd->sender_cmd_data);
mmd->sender_cmd_data.cmd_num = -1;
}
- if (vsst->afsss != AFS_SOCKET_CHECK_FOR_WRITE) {
- if (FD_ISSET(vsst->afs_socket, &s->rfds))
- recv_afs_result(vsst);
- } else if (FD_ISSET(vsst->afs_socket, &s->wfds)) {
+ if (vsst->afsss != AFS_SOCKET_CHECK_FOR_WRITE)
+ recv_afs_result(vsst, &s->rfds);
+ else if (FD_ISSET(vsst->afs_socket, &s->wfds)) {
PARA_NOTICE_LOG("requesting new fd from afs\n");
ret = send_buffer(vsst->afs_socket, "new");
if (ret < 0)
projects / paraslash.git / blobdiff