X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=vss.c;h=1a038f060bd1f0e2ecfd842e9f08fd7f704f70e2;hp=40a18e5cdf475ac312e8581508d10de20881b82d;hb=d96c06ff93493c125b9f4d36655e77d7029ca309;hpb=5000a12ad288893d494ccd04d061752ed022d1d0

diff --git a/vss.c b/vss.c
index 40a18e5c..1a038f06 100644
--- a/vss.c
+++ b/vss.c
@@ -123,6 +123,8 @@ struct fec_group {
 	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. */
@@ -234,15 +236,16 @@ static int num_slices(long unsigned bytes, struct fec_client *fc, uint8_t *resul
 	return 1;
 }
 
-static void set_slice_duration(struct fec_client *fc, struct fec_group *g)
+/* set group start and group duration */
+static void set_group_timing(struct fec_client *fc, struct fec_group *g)
 {
-	struct timeval group_duration, *chunk_tv = vss_chunk_time();
+	struct timeval *chunk_tv = vss_chunk_time();
 
-	tv_scale(g->num_chunks, chunk_tv, &group_duration);
+	tv_scale(g->num_chunks, chunk_tv, &g->duration);
 	tv_divide(fc->fcp->slices_per_group + fc->num_extra_slices,
-		&group_duration, &g->slice_duration);
+		&g->duration, &g->slice_duration);
 	PARA_DEBUG_LOG("durations (group/chunk/slice): %lu/%lu/%lu\n",
-		tv2ms(&group_duration), tv2ms(chunk_tv), tv2ms(&g->slice_duration));
+		tv2ms(&g->duration), tv2ms(chunk_tv), tv2ms(&g->slice_duration));
 }
 
 static int setup_next_fec_group(struct fec_client *fc, struct vss_task *vsst)
@@ -250,46 +253,51 @@ 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 {
-		/* use duration of the previous group for the timing of this group */
-		set_slice_duration(fc, g);
+		/*
+		 * Start and duration of this group depend only on the previous
+		 * group. Compute the new group start as g->start += g->duration.
+		 */
+		struct timeval 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++;
 	}
@@ -317,7 +325,7 @@ static int setup_next_fec_group(struct fec_client *fc, struct vss_task *vsst)
 	assert(g->num_chunks);
 	fc->current_slice_num = 0;
 	if (g->num == 0)
-		set_slice_duration(fc, g);
+		set_group_timing(fc, g);
 
 	/* setup header slices */
 	buf = vsst->header_buf;
@@ -355,14 +363,6 @@ static int setup_next_fec_group(struct fec_client *fc, struct vss_task *vsst)
 		g->first_chunk + g->num_chunks - 1,
 		g->num_header_slices, data_slices
 	);
-	/* set group start */
-	if (g->num != 0 && vsst->header_len != 0 && fc->first_stream_chunk == 0)
-		/* chunk #0 is the audio file header */
-		tv_scale(g->first_chunk - 1, chunk_tv, &tmp);
-	else
-		tv_scale(g->first_chunk - fc->first_stream_chunk,
-			chunk_tv, &tmp);
-	tv_add(&fc->stream_start, &tmp, &g->start);
 	return 1;
 }
 
@@ -636,7 +636,7 @@ static void vss_eof(struct vss_task *vsst)
 	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;
@@ -677,6 +677,13 @@ static int need_to_request_new_audio_file(struct vss_task *vsst)
 	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.
  *
@@ -721,6 +728,7 @@ static void vss_pre_select(struct sched *s, struct task *t)
 		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");
@@ -875,11 +883,9 @@ static void vss_send(struct vss_task *vsst)
 		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