X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mp3_afh.c;h=969a230c8d5172bb5a0fe73e8c64eb23aea9230b;hp=41874b86404cfc239a24891c30dcb6545b887f38;hb=becb57ea3aec697bfe953a0c3608e4c255b6d24b;hpb=8eb5a15bfcc068e8d2504bb84b14455e9fc7c3ba

diff --git a/mp3_afh.c b/mp3_afh.c
index 41874b86..969a230c 100644
--- a/mp3_afh.c
+++ b/mp3_afh.c
@@ -16,6 +16,7 @@
  *			 Johannes Overmann <overmann@iname.com>
  */
 
+#include <osl.h>
 #include "para.h"
 #include "error.h"
 #include "afh.h"
@@ -394,8 +395,8 @@ static int find_valid_start(unsigned char *map, size_t numbytes, off_t *fpos,
 static int mp3_read_info(unsigned char *map, size_t numbytes, int fd,
 		struct afh_info *afhi)
 {
-	long freq_avg = 0, br_avg = 0;
-	int ret, len = 0, old_br = -1, vbr = 0;
+	uint64_t freq_sum = 0, br_sum = 0;
+	int fl = 0, ret, len = 0, old_br = -1, vbr = 0;
 	struct timeval total_time = {0, 0};
 	unsigned chunk_table_size = 1000; /* gets increased on demand */
 	off_t fpos = 0;
@@ -403,15 +404,23 @@ static int mp3_read_info(unsigned char *map, size_t numbytes, int fd,
 	char *taginfo;
 
 	afhi->chunks_total = 0;
-	afhi->chunk_table = para_malloc(chunk_table_size * sizeof(size_t));
+	afhi->chunk_table = para_malloc(chunk_table_size * sizeof(uint32_t));
 	taginfo = mp3_get_id3(map, numbytes, fd);
 	while (1) {
-		unsigned long freq, br, fl;
+		int freq, br;
 		struct timeval tmp, cct; /* current chunk time */
 		fpos += len;
 		len = find_valid_start(map, numbytes, &fpos, &header);
-		if (len <= 0)
+		if (len <= 0) {
+			size_t end;
+			ret = -E_MP3_INFO;
+			if (!afhi->chunks_total)
+				goto err_out;
+			end = afhi->chunk_table[afhi->chunks_total - 1] + fl;
+			afhi->chunk_table[afhi->chunks_total]
+				= PARA_MIN(end, numbytes);
 			break;
+		}
 		ret = header_frequency(&header);
 		if (ret < 0)
 			continue;
@@ -429,35 +438,24 @@ static int mp3_read_info(unsigned char *map, size_t numbytes, int fd,
 		tv_divide(br * 125, &tmp, &cct);
 		tv_add(&cct, &total_time, &tmp);
 		total_time = tmp;
-		//PARA_DEBUG_LOG("%s: br: %d, freq: %d, fl: %d, cct: %lu\n", __func__, br, freq, fl, cct.tv_usec);
 		if (afhi->chunks_total >= chunk_table_size) {
 			chunk_table_size *= 2;
 			afhi->chunk_table = para_realloc(afhi->chunk_table,
-				chunk_table_size * sizeof(size_t));
+				chunk_table_size * sizeof(uint32_t));
 		}
 		afhi->chunk_table[afhi->chunks_total] = fpos;
-//		if (afhi->chunks_total < 10 || !(afhi->chunks_total % 1000))
-//			PARA_INFO_LOG("chunk #%lu: %zd\n", afhi->chunks_total,
-//				afhi->chunk_table[afhi->chunks_total]);
 		afhi->chunks_total++;
-		if (afhi->chunks_total == 1) {
-			freq_avg = freq;
-			br_avg = br;
-			old_br = br;
-			continue;
-		}
-		freq_avg += ((long)freq - freq_avg) / ((long)afhi->chunks_total + 1);
-		br_avg += ((long)br - br_avg) / ((long)afhi->chunks_total + 1);
-		if (old_br != br)
+		freq_sum += freq;
+		br_sum += br;
+		if (afhi->chunks_total != 1 && old_br != br)
 			vbr = 1;
 		old_br = br;
 	}
 	ret = -E_MP3_INFO;
-	if (!afhi->chunks_total || !freq_avg || !br_avg)
+	if (!freq_sum || !br_sum)
 		goto err_out;
-	afhi->chunk_table[afhi->chunks_total] = numbytes - 1;
-	afhi->bitrate = br_avg;
-	afhi->frequency = freq_avg;
+	afhi->bitrate = br_sum / afhi->chunks_total;
+	afhi->frequency = freq_sum / afhi->chunks_total;
 	afhi->channels = header_channels(&header);
 	afhi->seconds_total = (tv2ms(&total_time) + 500) / 1000;
 	tv_divide(afhi->chunks_total, &total_time, &afhi->chunk_tv);