/*
- * Copyright (C) 2004-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2004-2009 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
static size_t cb_read(void *buf, size_t size, size_t nmemb, void *datasource)
{
struct ogg_datasource *ods = datasource;
- size_t copy = PARA_MIN(ods->numbytes - ods->fpos, size * nmemb),
- ret = copy / size;
+ size_t copy, ret;
+
+ if (!size)
+ return 0;
+
+ assert(ods->numbytes >= ods->fpos);
+ ret = ods->numbytes - ods->fpos;
+ copy = PARA_MIN(ret, size * nmemb);
+ ret = copy / size;
if (!ret)
return 0;
memcpy(buf, ods->map + ods->fpos, copy);
struct afh_info *afhi)
{
int ret;
- size_t len = PARA_MIN(numbytes, CHUNK_SIZE);
+ size_t len = PARA_MIN(numbytes, (size_t)CHUNK_SIZE);
int serial;
char *buf;
struct afh_info *afhi, long unsigned time_total)
{
int i, ret, num;
- ssize_t max_chunk_len, pos = 0, min = 0, old_pos;
long unsigned num_chunks;
+ ogg_int64_t max = 0, min = 0, old_pos = 0;
- old_pos = 0;
- ret = 0;
num = time_total / chunk_time + 3;
PARA_DEBUG_LOG("chunk time: %g allocating %d chunk pointers\n",
chunk_time, num);
afhi->chunk_table = para_malloc((num + 1) * sizeof(size_t));
afhi->chunk_table[0] = 0;
- max_chunk_len = 0;
- for (i = 1; ret <= num; i++) {
- ogg_int64_t diff;
+ for (i = 1; i <= num; i++) {
+ ogg_int64_t diff, pos;
ret = ov_time_seek(of, i * chunk_time);
if (ret)
break;
pos = ov_raw_tell(of);
diff = pos - old_pos;
- max_chunk_len = PARA_MAX(max_chunk_len, diff);
+ max = PARA_MAX(max, diff);
min = (i == 1)? diff : PARA_MIN(min, diff);
afhi->chunk_table[i] = pos;
-// if (i < 11 || !((i - 1) % 1000)|| i > num - 11)
-// PARA_DEBUG_LOG("chunk #%d: %g secs, pos: %zd, "
-// "size: %zd\n", i - 1,
-// i * chunk_time, pos, pos - old_pos);
old_pos = pos;
}
num_chunks = i - 1;
-//fi->chunk_table[i] = pos;
- PARA_DEBUG_LOG("%lu chunks (%fs), max chunk: %zd, min chunk: %zd\n",
- num_chunks, chunk_time, max_chunk_len, min);
+ PARA_DEBUG_LOG("%lu chunks (%fs), max chunk: %lld, min chunk: %lld\n",
+ num_chunks, chunk_time, (long long)max, (long long)min);
return num_chunks;
}