X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=ogg_afh.c;h=40aa6b64e9e81d58345ee4039ca68cc6a466c764;hp=f223b57f5fe6be547caf0dc8d01eb4ed26a90bcb;hb=becb57ea3aec697bfe953a0c3608e4c255b6d24b;hpb=9207a81bf1bb5b6bd4db7e2640994e0cfc5f9a3f

diff --git a/ogg_afh.c b/ogg_afh.c
index f223b57f..40aa6b64 100644
--- a/ogg_afh.c
+++ b/ogg_afh.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2004-2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -9,6 +9,7 @@
 #include <ogg/ogg.h>
 #include <vorbis/codec.h>
 #include <vorbis/vorbisfile.h>
+#include <osl.h>
 
 #include "para.h"
 #include "afh.h"
@@ -34,8 +35,15 @@ struct ogg_datasource {
 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);
@@ -115,7 +123,7 @@ static int ogg_compute_header_len(char *map, size_t numbytes,
 		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;
 
@@ -157,7 +165,6 @@ static int ogg_compute_header_len(char *map, size_t numbytes,
 		goto err2;
 	PARA_DEBUG_LOG("channels: %i, rate: %li\n", vi.channels, vi.rate);
 	ogg_stream_packetin(stream_out, &packet);
-
 	ret = ogg_sync_pageout(sync_in, &page);
 	if (ret <= 0) {
 		ret = -E_SYNC_PAGEOUT;
@@ -201,44 +208,58 @@ static long unsigned ogg_compute_chunk_table(OggVorbis_File *of,
 	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;
 }
 
+static void ogg_write_info_string(OggVorbis_File *vf, struct afh_info *afhi)
+{
+	char *taginfo;
+	vorbis_comment *vc = ov_comment(vf,-1);
+
+	if (vc) {
+		char *artist, *title, *album, *year, *comment;
+		artist = vorbis_comment_query(vc, "artist", 0);
+		title = vorbis_comment_query(vc, "title", 0);
+		album = vorbis_comment_query(vc, "album", 0);
+		year = vorbis_comment_query(vc, "year", 0);
+		comment = vorbis_comment_query(vc, "comment", 0);
+		taginfo = make_taginfo(title, artist, album, year, comment);
+	} else
+		taginfo = make_message("%s: (no vorbis comments found)\n%s:\n",
+			status_item_list[SI_TAGINFO1],
+			status_item_list[SI_TAGINFO2]);
+	afhi->info_string = make_message("%s:\n%s",
+		status_item_list[SI_AUDIO_FILE_INFO], taginfo);
+	free(taginfo);
+}
+
 /*
  * Init oggvorbis file and write some tech data to given pointers.
  */
-static int ogg_get_file_info(char *map, size_t numbytes,
+static int ogg_get_file_info(char *map, size_t numbytes, __a_unused int fd,
 		struct afh_info *afhi)
 {
 	int ret;
@@ -267,15 +288,10 @@ static int ogg_get_file_info(char *map, size_t numbytes,
 	afhi->bitrate = ov_bitrate(&of, 0) / 1000;
 	afhi->channels = vi->channels;
 	afhi->chunks_total = ogg_compute_chunk_table(&of, afhi, afhi->seconds_total);
-	afhi->info_string[0] = '\0';
-	sprintf(afhi->info_string, "%s:\n%s:\n%s:\n",
-		status_item_list[SI_AUDIO_FILE_INFO],
-		status_item_list[SI_TAG_INFO1],
-		status_item_list[SI_TAG_INFO2]
-	);
 	afhi->chunk_tv.tv_sec = 0;
 	afhi->chunk_tv.tv_usec = 250 * 1000;
-	tv_scale(3, &afhi->chunk_tv, &afhi->eof_tv);
+	tv_scale(10 / afhi->channels, &afhi->chunk_tv, &afhi->eof_tv);
+	ogg_write_info_string(&of, afhi);
 	ret = 1;
 err:
 	ov_clear(&of); /* keeps the file open */