From: Andre Noll <maan@systemlinux.org>
Date: Sun, 4 Mar 2007 20:07:33 +0000 (+0100)
Subject: unify all audio format handlers
X-Git-Tag: v0.2.16~67
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=5d1e222d208a8505c6d0e0522ecd79599db57aa8

unify all audio format handlers

This changes the ogg vorbis audio format handler such that its read_chunk and
reposition_stream functions coincide with those of the other audio format
handlers.
---

diff --git a/aac_afh.c b/aac_afh.c
index f29e55bb..338b7827 100644
--- a/aac_afh.c
+++ b/aac_afh.c
@@ -209,8 +209,10 @@ static char *aac_read_chunk(long unsigned current_chunk, ssize_t *len)
 	*len = 0;
 	if (current_chunk >= num_chunks)
 		return NULL;
-	pos = chunk_table[current_chunk];
 	*len = chunk_table[current_chunk + 1] - chunk_table[current_chunk];
+	if (!*len) /* nothing to send for this run */
+		return inbuf;
+	pos = chunk_table[current_chunk];
 	if (inbuf_size < *len) {
 		PARA_INFO_LOG("increasing inbuf for chunk #%lu/%zu to %zd bytes\n",
 			current_chunk, num_chunks, *len);
diff --git a/mp3_afh.c b/mp3_afh.c
index ca487efc..4ed134fa 100644
--- a/mp3_afh.c
+++ b/mp3_afh.c
@@ -474,8 +474,10 @@ static char *mp3_read_chunk(long unsigned current_chunk, ssize_t *len)
 	*len = 0;
 	if (current_chunk >= num_chunks)
 		return NULL;
-	pos = chunk_table[current_chunk];
 	*len = chunk_table[current_chunk + 1] - chunk_table[current_chunk];
+	if (!*len) /* nothing to send for this run */
+		return inbuf;
+	pos = chunk_table[current_chunk];
 	if (inbuf_size < *len) {
 		PARA_INFO_LOG("increasing inbuf for chunk #%lu/%zu to %zd bytes\n",
 			current_chunk, num_chunks, *len);
diff --git a/ogg_afh.c b/ogg_afh.c
index fcc88362..81f5ac1a 100644
--- a/ogg_afh.c
+++ b/ogg_afh.c
@@ -28,6 +28,7 @@
 #include "afh.h"
 #include "error.h"
 #include "string.h"
+#include "fd.h"
 
 /** must be big enough to hold header */
 #define CHUNK_SIZE 32768
@@ -37,10 +38,9 @@ static OggVorbis_File *oggvorbis_file;
 static FILE *infile;
 static int header_len, inbuf_size, vi_channels;
 static char *header, *inbuf;
-static ssize_t *chunk_table, max_chunk_len;
+static ssize_t *chunk_table, max_chunk_len, num_chunks;
 static struct audio_format_handler *af;
-static long vi_sampling_rate, vi_bitrate, vi_bitrate_nominal,
-	num_chunks;
+static long vi_sampling_rate, vi_bitrate, vi_bitrate_nominal;
 
 static int ogg_compute_header_len(void)
 {
@@ -182,7 +182,7 @@ static void ogg_compute_chunk_table(double time_total)
 	num_chunks = i - 1;
 	chunk_table[i] = pos;
 	tunetable();
-	PARA_INFO_LOG("%li chunks (%fs), max chunk: %zd, min chunk: %zd\n",
+	PARA_INFO_LOG("%zu chunks (%fs), max chunk: %zd, min chunk: %zd\n",
 		num_chunks, chunk_time, max_chunk_len, min);
 	rewind(infile);
 }
@@ -259,7 +259,7 @@ static int ogg_get_file_info(FILE *file, char *info_str, long unsigned *frames,
 	vi_channels = vi->channels;
 	ogg_compute_chunk_table(time_total);
 	*frames = num_chunks;
-	sprintf(info_str, "audio_file_info1:%lu x %lu, %ldkHz, %d channels, %ldkbps\n"
+	sprintf(info_str, "audio_file_info1:%zu x %lu, %ldkHz, %d channels, %ldkbps\n"
 		"audio_file_info2: \n"
 		"audio_file_info3: \n",
 		num_chunks, (long unsigned) (chunk_time * 1000 * 1000),
@@ -272,71 +272,40 @@ err:
 	return ret;
 }
 
-/*
- * Simple stream reposition routine
- */
-static int ogg_reposition_stream(long unsigned request)
+static int ogg_reposition_stream(__a_unused long unsigned new_frame)
 {
-	int ret;
-	long seek;
-
-	seek = chunk_table[request];
-	ret = fseek(infile, seek, SEEK_SET);
-	PARA_DEBUG_LOG("seek to %li returned %d. offset:%li\n", seek,
-		ret, ftell(infile));
-	return ret < 0? -E_OGG_REPOS : 1;
-}
-
-static ogg_int64_t get_chunk_size(long unsigned chunk_num)
-{
-	ogg_int64_t ret;
-	if (chunk_num >= num_chunks)
-		return -1;
-	ret = chunk_table[chunk_num + 1] - chunk_table[chunk_num];
-	if (!ret)
-		return ret;
-#if 0
-	PARA_DEBUG_LOG("chunk %d: %lli-%lli (%lli bytes)\n",
-		chunk_num,
-		chunk_table[chunk_num],
-		chunk_table[chunk_num + 1] - 1,
-		ret);
-#endif
-	return ret;
+	return 1;
 }
 
 static char *ogg_read_chunk(long unsigned current_chunk, ssize_t *len)
 {
 	int ret;
-	ogg_int64_t cs = get_chunk_size(current_chunk);
-	if (!cs) { /* nothing to send for this run */
-		*len = 0;
-		return inbuf;
-	}
-	if (cs < 0) { /* eof */
-		*len = 0;
+	size_t pos;
+
+	*len = 0;
+	if (current_chunk >= num_chunks)
 		return NULL;
-	}
-	*len = cs;
-	if (!inbuf || inbuf_size < *len) {
-		PARA_INFO_LOG("increasing ogg buffer size (%d -> %zu)\n",
-			inbuf_size, *len);
+	*len = chunk_table[current_chunk + 1] - chunk_table[current_chunk];
+	if (!*len) /* nothing to send for this run */
+		return inbuf;
+	pos = chunk_table[current_chunk];
+	if (inbuf_size < *len) {
+		PARA_INFO_LOG("increasing inbuf for chunk #%lu/%zu to %zd bytes\n",
+			current_chunk, num_chunks, *len);
 		inbuf = para_realloc(inbuf, *len);
 		inbuf_size = *len;
 	}
-	ret = read(fileno(infile), inbuf, *len);
-	if (!ret) {
-		*len = 0;
-		return NULL;
-	}
-	if (ret < 0) {
-		*len = -E_OGG_READ;
+//	PARA_DEBUG_LOG("reading chunk #%lu@%zd (%zd bytes)\n", current_chunk,
+//		pos, *len);
+	ret = fseek(infile, pos, SEEK_SET);
+	if (ret < 0)
 		return NULL;
-	}
+	ret = para_fread(inbuf, *len, 1, infile);
 	if (ret != *len)
-		PARA_WARNING_LOG("short read (%d/%zd)\n", ret, *len);
-	*len = ret;
-	return inbuf;
+		return NULL;
+//	PARA_DEBUG_LOG("ret: %d, inbuf[0]: %lx - %lx\n", ret, (long unsigned) inbuf[0],
+//		(long unsigned) inbuf[4]);
+	return (char *)inbuf;
 }
 
 static char *ogg_get_header_info(int *len)