X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=vss.c;h=c6c57845e0b7f682e2fbe6d697e09b2403f9b899;hb=26a032fffa6c6e6f092ed3d14c2b5f08e5c736d6;hp=a4dfa94ed5a20f136ed83b8c4d003afd3f187886;hpb=c20e3e67fc2be1d5f8778b9c482271e023bbdcb8;p=paraslash.git

diff --git a/vss.c b/vss.c
index a4dfa94e..c6c57845 100644
--- a/vss.c
+++ b/vss.c
@@ -335,10 +335,10 @@ static int initialize_fec_client(struct fec_client *fc, struct vss_task *vsst)
 	ret = fec_new(k, n, &fc->parms);
 	if (ret < 0)
 		return ret;
-	fc->src_data = para_malloc(k * sizeof(char *));
+	fc->src_data = alloc(k * sizeof(char *));
 	for (i = 0; i < k; i++)
-		fc->src_data[i] = para_malloc(fc->mps);
-	fc->enc_buf = para_malloc(fc->mps);
+		fc->src_data[i] = alloc(fc->mps);
+	fc->enc_buf = alloc(fc->mps);
 
 	fc->state = FEC_STATE_READY_TO_RUN;
 	fc->next_header_time.tv_sec = 0;
@@ -348,7 +348,7 @@ static int initialize_fec_client(struct fec_client *fc, struct vss_task *vsst)
 }
 
 static int vss_get_chunk(int chunk_num, struct vss_task *vsst,
-		char **buf, size_t *sz)
+		char **buf, uint32_t *len)
 {
 	int ret;
 
@@ -363,15 +363,15 @@ static int vss_get_chunk(int chunk_num, struct vss_task *vsst,
 	if (chunk_num == 0 && vsst->header_len > 0) {
 		assert(vsst->header_buf);
 		*buf = vsst->header_buf; /* stripped header */
-		*sz = vsst->header_len;
+		*len = vsst->header_len;
 		return 0;
 	}
 	ret = afh_get_chunk(chunk_num, &mmd->afd.afhi,
 		mmd->afd.audio_format_id, vsst->map, vsst->mapsize,
-		(const char **)buf, sz, &vsst->afh_context);
+		(const char **)buf, len, &vsst->afh_context);
 	if (ret < 0) {
 		*buf = NULL;
-		*sz = 0;
+		*len = 0;
 	}
 	return ret;
 }
@@ -380,7 +380,7 @@ static int compute_group_size(struct vss_task *vsst, struct fec_group *g,
 		int max_bytes)
 {
 	char *buf;
-	size_t len;
+	uint32_t len;
 	int ret, i, max_chunks = PARA_MAX(1LU, 150 / tv2ms(vss_chunk_time()));
 
 	if (g->first_chunk == 0) {
@@ -587,7 +587,7 @@ static int setup_next_fec_group(struct fec_client *fc, struct vss_task *vsst)
 	slice_copied = 0;
 	for (c = g->first_chunk; c < g->first_chunk + g->num_chunks; c++) {
 		char *buf;
-		size_t src_len;
+		uint32_t src_len;
 		ret = vss_get_chunk(c, vsst, &buf, &src_len);
 		if (ret < 0)
 			return ret;
@@ -671,7 +671,7 @@ size_t vss_get_fec_eof_packet(const char **buf)
 struct fec_client *vss_add_fec_client(struct sender_client *sc,
 				      struct fec_client_parms *fcp)
 {
-	struct fec_client *fc = para_calloc(sizeof(*fc));
+	struct fec_client *fc = zalloc(sizeof(*fc));
 
 	fc->sc  = sc;
 	fc->fcp = fcp;
@@ -845,7 +845,6 @@ static void vss_compute_timeout(struct sched *s, struct vss_task *vsst)
 
 static void vss_eof(struct vss_task *vsst)
 {
-
 	if (!vsst->map)
 		return;
 	if (mmd->new_vss_status_flags & VSS_NOMORE)
@@ -856,8 +855,8 @@ static void vss_eof(struct vss_task *vsst)
 	para_munmap(vsst->map, vsst->mapsize);
 	vsst->map = NULL;
 	mmd->chunks_sent = 0;
-	//mmd->offset = 0;
 	mmd->afd.afhi.seconds_total = 0;
+	mmd->afd.afhi.chunks_total = 0;
 	mmd->afd.afhi.chunk_tv.tv_sec = 0;
 	mmd->afd.afhi.chunk_tv.tv_usec = 0;
 	free(mmd->afd.afhi.chunk_table);
@@ -1030,7 +1029,7 @@ static void vss_send(struct vss_task *vsst)
 	struct timeval due;
 	struct fec_client *fc, *tmp_fc;
 	char *buf;
-	size_t len;
+	uint32_t len;
 
 	if (!vsst->map || !vss_playing())
 		return;