X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=vss.c;h=ba6f7c4c655134d11d79e6411ab92d63b4efd160;hp=121373dc2f4fb77bb62985d20909b8ccefc972ae;hb=e4db7671a91a7552c642acc979f0eb278f8d467f;hpb=0c9c3239eb328c8b802447b4f9d2c922085e74ee

diff --git a/vss.c b/vss.c
index 121373dc..ba6f7c4c 100644
--- a/vss.c
+++ b/vss.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2010 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -86,7 +86,7 @@ struct vss_task {
 	/** Used by the scheduler. */
 	struct task task;
 	/** Pointer to the header of the mapped audio file. */
-	const char *header_buf;
+	char *header_buf;
 	/** Length of the audio file header. */
 	size_t header_len;
 	/** Time between audio file headers are sent. */
@@ -167,6 +167,8 @@ struct fec_client {
 	struct timeval next_header_time;
 	/** Used for the last source pointer of an audio file. */
 	unsigned char *extra_src_buf;
+	/** Needed for the last slice of the audio file header. */
+	unsigned char *extra_header_buf;
 	/** Extra slices needed to store largest chunk + header. */
 	int num_extra_slices;
 	/** Contains the FEC-encoded data. */
@@ -211,10 +213,11 @@ static void write_fec_header(struct fec_client *fc, struct vss_task *vsst)
 	write_u32(buf + 14, g->bytes);
 
 	write_u8(buf + 18, fc->current_slice_num);
+	write_u8(buf + 19, 0); /* unused */
 	write_u16(buf + 20, g->slice_bytes);
 	write_u8(buf + 22, g->first_chunk? 0 : 1);
 	write_u8(buf + 23, vsst->header_len? 1 : 0);
-	memset(buf + 24, 0, 7);
+	memset(buf + 24, 0, 8);
 }
 
 static bool need_audio_header(struct fec_client *fc, struct vss_task *vsst)
@@ -326,6 +329,7 @@ static int initialize_fec_client(struct fec_client *fc, struct vss_task *vsst)
 	fc->src_data = para_realloc(fc->src_data, k * sizeof(char *));
 	fc->enc_buf = para_realloc(fc->enc_buf, fc->mps);
 	fc->extra_src_buf = para_realloc(fc->extra_src_buf, fc->mps);
+	fc->extra_header_buf = para_realloc(fc->extra_header_buf, fc->mps);
 
 	fc->state = FEC_STATE_READY_TO_RUN;
 	fc->next_header_time.tv_sec = 0;
@@ -334,6 +338,26 @@ static int initialize_fec_client(struct fec_client *fc, struct vss_task *vsst)
 	return 1;
 }
 
+static void vss_get_chunk(int chunk_num, struct vss_task *vsst,
+		char **buf, size_t *sz)
+{
+	/*
+	 * Chunk zero is special for header streams: It is the first portion of
+	 * the audio file which consists of the audio file header. It may be
+	 * arbitrary large due to embedded meta data. Audio format handlers may
+	 * replace the header by a stripped one with meta data omitted which is
+	 * of bounded size. We always use the stripped header for streaming
+	 * rather than the unmodified header (chunk zero).
+	 */
+	if (chunk_num == 0 && vsst->header_len > 0) {
+		*buf = vsst->header_buf; /* stripped header */
+		*sz = vsst->header_len;
+		return;
+	}
+	afh_get_chunk(chunk_num, &mmd->afd.afhi, vsst->map, (const char **)buf,
+		sz);
+}
+
 static void compute_group_size(struct vss_task *vsst, struct fec_group *g,
 		int max_bytes)
 {
@@ -348,7 +372,7 @@ static void compute_group_size(struct vss_task *vsst, struct fec_group *g,
 	 * of exactly one chunk for these audio formats.
 	 */
 	for (i = 0;; i++) {
-		const char *buf;
+		char *buf;
 		size_t len;
 		int chunk_num = g->first_chunk + i;
 
@@ -356,7 +380,7 @@ static void compute_group_size(struct vss_task *vsst, struct fec_group *g,
 			break;
 		if (chunk_num >= mmd->afd.afhi.chunks_total) /* eof */
 			break;
-		afh_get_chunk(chunk_num, &mmd->afd.afhi, vsst->map, &buf, &len);
+		vss_get_chunk(chunk_num, vsst, &buf, &len);
 		if (g->bytes + len > max_bytes)
 			break;
 		/* Include this chunk */
@@ -478,7 +502,7 @@ static int setup_next_fec_group(struct fec_client *fc, struct vss_task *vsst)
 {
 	int ret, i, k, n, data_slices;
 	size_t len;
-	const char *buf;
+	char *buf;
 	struct fec_group *g = &fc->group;
 
 	if (fc->state == FEC_STATE_NONE) {
@@ -515,22 +539,36 @@ static int setup_next_fec_group(struct fec_client *fc, struct vss_task *vsst)
 	fc->current_slice_num = 0;
 	if (g->num == 0)
 		set_group_timing(fc, vsst);
-
 	/* setup header slices */
 	buf = vsst->header_buf;
 	for (i = 0; i < g->num_header_slices; i++) {
-		fc->src_data[i] = (const unsigned char *)buf;
-		buf += g->slice_bytes;
+		if (buf + g->slice_bytes <= vsst->header_buf + vsst->header_len) {
+			fc->src_data[i] = (const unsigned char *)buf;
+			buf += g->slice_bytes;
+			continue;
+		}
+		/*
+		 * Can not use vss->header_buf for this slice as it
+		 * goes beyond the buffer. This slice will not be fully
+		 * used.
+		 */
+		uint32_t payload_size = vsst->header_buf
+			+ vsst->header_len - buf;
+		memcpy(fc->extra_header_buf, buf, payload_size);
+		if (payload_size < g->slice_bytes)
+			memset(fc->extra_header_buf + payload_size, 0,
+				g->slice_bytes - payload_size);
+		fc->src_data[i] = fc->extra_header_buf;
+		assert(i == g->num_header_slices - 1);
 	}
 
 	/* setup data slices */
-	afh_get_chunk(g->first_chunk, &mmd->afd.afhi, vsst->map, &buf, &len);
+	vss_get_chunk(g->first_chunk, vsst, &buf, &len);
 	for (; i < g->num_header_slices + data_slices; i++) {
 		if (buf + g->slice_bytes > vsst->map + mmd->size) {
 			/*
 			 * Can not use the memory mapped audio file for this
-			 * slice as it goes beyond the map. This slice will not
-			 * be fully used.
+			 * slice as it goes beyond the map.
 			 */
 			uint32_t payload_size = vsst->map + mmd->size - buf;
 			memcpy(fc->extra_src_buf, buf, payload_size);
@@ -626,6 +664,7 @@ void vss_del_fec_client(struct fec_client *fc)
 	free(fc->src_data);
 	free(fc->enc_buf);
 	free(fc->extra_src_buf);
+	free(fc->extra_header_buf);
 	fec_free(fc->parms);
 	free(fc);
 }
@@ -806,6 +845,8 @@ static void vss_eof(struct vss_task *vsst)
 	if (mmd->new_vss_status_flags & VSS_NOMORE)
 		mmd->new_vss_status_flags = VSS_NEXT;
 	set_eof_barrier(vsst);
+	afh_free_header(vsst->header_buf, mmd->afd.audio_format_id);
+	vsst->header_buf = NULL;
 	para_munmap(vsst->map, mmd->size);
 	vsst->map = NULL;
 	mmd->chunks_sent = 0;
@@ -984,8 +1025,8 @@ static void recv_afs_result(struct vss_task *vsst, fd_set *rfds)
 	mmd->events++;
 	mmd->num_played++;
 	mmd->new_vss_status_flags &= (~VSS_NEXT);
-	afh_get_header(&mmd->afd.afhi, vsst->map, &vsst->header_buf,
-		&vsst->header_len);
+	afh_get_header(&mmd->afd.afhi, mmd->afd.audio_format_id,
+		vsst->map, mmd->size, &vsst->header_buf, &vsst->header_len);
 	return;
 err:
 	free(mmd->afd.afhi.chunk_table);
@@ -1041,7 +1082,7 @@ static void vss_send(struct vss_task *vsst)
 	compute_chunk_time(mmd->chunks_sent, &mmd->afd.afhi.chunk_tv,
 		&mmd->stream_start, &due);
 	if (tv_diff(&due, now, NULL) <= 0) {
-		const char *buf;
+		char *buf;
 		size_t len;
 
 		if (!mmd->chunks_sent) {
@@ -1054,8 +1095,7 @@ static void vss_send(struct vss_task *vsst)
 		 * they might have still some data queued which can be sent in
 		 * this case.
 		 */
-		afh_get_chunk(mmd->current_chunk, &mmd->afd.afhi, vsst->map,
-			&buf, &len);
+		vss_get_chunk(mmd->current_chunk, vsst, &buf, &len);
 		for (i = 0; senders[i].name; i++) {
 			if (!senders[i].send)
 				continue;
@@ -1146,5 +1186,6 @@ void init_vss_task(int afs_socket)
 		tv_add(&vsst->autoplay_barrier, &vsst->announce_tv,
 			&vsst->data_send_barrier);
 	}
+	sprintf(vsst->task.status, "vss task");
 	register_task(&vsst->task);
 }