X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=wma_afh.c;h=ebb2f9c34c97dbb445b312dd1e8ab2004b0d5bc6;hp=b4935f0d44f30fc6091f8431b99a63f23674aed6;hb=a85b3b947174c64ce06b4d6e438677055bf3f1ae;hpb=1b9bf429a91f4c9fc1abc6030b02ca0c7739bca8

diff --git a/wma_afh.c b/wma_afh.c
index b4935f0d..ebb2f9c3 100644
--- a/wma_afh.c
+++ b/wma_afh.c
@@ -38,8 +38,7 @@ static int count_frames(const char *buf, int buf_size, uint32_t packet_size,
 		sfc++;
 	}
 	PARA_INFO_LOG("%d frames, %d superframes\n", fc, sfc);
-	if (num_superframes)
-		*num_superframes = sfc;
+	*num_superframes = sfc;
 	return fc;
 }
 
@@ -68,7 +67,7 @@ static int put_utf8(uint32_t val, char *result)
 		*out++ = in;
 		return 1;
 	}
-	bytes = (wma_log2(in) + 4) / 5;
+	bytes = DIV_ROUND_UP(wma_log2(in), 5);
 	shift = (bytes - 1) * 6;
 	*out++ = (256 - (256 >> bytes)) | (in >> shift);
 	while (shift >= 6) {
@@ -229,6 +228,7 @@ static int wma_make_chunk_table(char *buf, size_t buf_size, uint32_t packet_size
 		}
 	}
 	afhi->chunks_total = j;
+	set_max_chunk_size(afhi);
 	set_chunk_tv(frames_per_chunk, afhi->frequency, &afhi->chunk_tv);
 	return 1;
 fail:
@@ -365,8 +365,7 @@ static int make_cdo(struct taginfo *tags, const struct asf_object *cdo,
 		struct asf_object *result)
 {
 	const char *cr, *rating; /* orig data */
-	uint16_t orig_title_bytes, orig_artist_bytes, orig_cr_bytes,
-		orig_comment_bytes, orig_rating_bytes;
+	uint16_t orig_cr_bytes, orig_rating_bytes;
 	/* pointers to new UTF-16 tags */
 	char *artist = NULL, *title = NULL, *comment = NULL;
 	/* number of bytes in UTF-16 for the new tags */
@@ -389,6 +388,7 @@ static int make_cdo(struct taginfo *tags, const struct asf_object *cdo,
 	comment_bytes = ret;
 
 	if (cdo) {
+		uint16_t orig_title_bytes, orig_artist_bytes, orig_comment_bytes;
 		/*
 		 * Sizes of the five fields (stored as 16-bit numbers) are
 		 * located after the header (16 bytes) and the cdo size (8
@@ -402,10 +402,7 @@ static int make_cdo(struct taginfo *tags, const struct asf_object *cdo,
 		cr = cdo->ptr + 34 + orig_title_bytes + orig_artist_bytes;
 		rating = cr + orig_cr_bytes + orig_comment_bytes;
 	} else {
-		orig_title_bytes = 2;
-		orig_artist_bytes = 2;
 		orig_cr_bytes = 2;
-		orig_comment_bytes = 2;
 		orig_rating_bytes = 2;
 		cr = null;
 		rating = null;