X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=ogg_afh.c;h=8a64fcc53b8635d6d14d472da4bb836f4401ab3b;hb=34d4086123256e31003aaddd76a0cb27fa7d0306;hp=2837db61c7de43a732564c8d46fec14ef6b4331e;hpb=f0c195e0ee6baefae0046db0e10df2e45f72ca41;p=paraslash.git

diff --git a/ogg_afh.c b/ogg_afh.c
index 2837db61..8a64fcc5 100644
--- a/ogg_afh.c
+++ b/ogg_afh.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2004 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -20,6 +20,20 @@ struct private_vorbis_data {
 	vorbis_comment vc;
 };
 
+/*
+ * Vorbis uses three header packets, all of which are required: the
+ * identification header, the comments header, and the setup header.
+ *
+ * The identification header identifies the bitstream as Vorbis. It contains
+ * the Vorbis version and simple audio characteristics of the stream such as
+ * sample rate and number of channels.
+ *
+ * The comment header includes user text comments (tags) and a vendor string
+ * for the application/library that produced the bitstream.
+ *
+ * The setup header includes extensive CODEC setup information as well as the
+ * complete VQ and Huffman codebooks needed for decoding.
+ */
 static int vorbis_packet_callback(ogg_packet *packet, int packet_num,
 		__a_unused int serial, struct afh_info *afhi, void *private_data)
 {
@@ -52,14 +66,14 @@ static int ogg_vorbis_get_file_info(char *map, size_t numbytes, __a_unused int f
 {
 	int ret;
 	struct private_vorbis_data pvd;
-	struct ogg_afh_callback_info vorbis_callback_info = {
+	struct oac_callback_info vorbis_callback_info = {
 		.packet_callback = vorbis_packet_callback,
 		.private_data = &pvd,
 	};
 
 	vorbis_info_init(&pvd.vi);
 	vorbis_comment_init(&pvd.vc);
-	ret = ogg_get_file_info(map, numbytes, afhi, &vorbis_callback_info);
+	ret = oac_get_file_info(map, numbytes, afhi, &vorbis_callback_info);
 	vorbis_info_clear(&pvd.vi);
 	vorbis_comment_clear(&pvd.vc);
 	return ret;
@@ -81,7 +95,7 @@ static void add_ogg_page(ogg_page *og, struct vorbis_get_header_data *vghd)
 	memcpy(p + og->header_len, og->body, og->body_len);
 	vghd->buf = buf;
 	vghd->len = new_len;
-	PARA_DEBUG_LOG("header/body/old/new: %lu/%lu/%zu/%zu\n",
+	PARA_DEBUG_LOG("header/body/old/new: %li/%li/%zu/%zu\n",
 		og->header_len, og->body_len, old_len, new_len);
 }
 
@@ -105,7 +119,6 @@ static int vorbis_get_header_callback(ogg_packet *packet, int packet_num,
 		return 0;
 	if (packet_num == 0) {
 		ogg_stream_init(&vghd->os, serial);
-		ret = -E_OGG_PACKET_IN;
 		ret = ogg_stream_packetin(&vghd->os, packet);
 		if (ret < 0)
 			goto out;
@@ -116,8 +129,8 @@ static int vorbis_get_header_callback(ogg_packet *packet, int packet_num,
 		return 1;
 	}
 	if (packet_num == 1) {
-		PARA_INFO_LOG("replacing metadata packet\n");
 		ogg_packet replacement = *packet;
+		PARA_INFO_LOG("replacing metadata packet\n");
 		replacement.packet = dummy_packet;
 		replacement.bytes = sizeof(dummy_packet);
 		ret = ogg_stream_packetin(&vghd->os, &replacement);
@@ -129,10 +142,8 @@ static int vorbis_get_header_callback(ogg_packet *packet, int packet_num,
 	ret = -E_OGG_PACKET_IN;
 	if (ogg_stream_packetin(&vghd->os, packet) < 0)
 		goto out;
-	ret = -E_OGG_STREAM_FLUSH;
-	if (ogg_stream_flush(&vghd->os, &og) == 0)
-		goto out;
-	add_ogg_page(&og, vghd);
+	while (ogg_stream_flush(&vghd->os, &og))
+		add_ogg_page(&og, vghd);
 	ret = 0;
 out:
 	ogg_stream_clear(&vghd->os);
@@ -144,12 +155,12 @@ static void vorbis_get_header(void *map, size_t mapsize, char **buf,
 {
 	int ret;
 	struct vorbis_get_header_data vghd = {.len = 0};
-	struct ogg_afh_callback_info cb = {
+	struct oac_callback_info cb = {
 		.packet_callback = vorbis_get_header_callback,
 		.private_data = &vghd,
 	};
 
-	ret = ogg_get_file_info(map, mapsize, NULL, &cb);
+	ret = oac_get_file_info(map, mapsize, NULL, &cb);
 	if (ret < 0)
 		goto fail;
 	*buf = vghd.buf;
@@ -160,16 +171,51 @@ fail:
 	PARA_ERROR_LOG("%s\n", para_strerror(-ret));
 }
 
-static const char* ogg_suffixes[] = {"ogg", NULL};
+static int vorbis_make_meta_packet(struct taginfo *tags, ogg_packet *result)
+{
+	vorbis_comment vc;
+	int ret;
+
+	vorbis_comment_init(&vc);
+	vorbis_comment_add_tag(&vc, "artist", tags->artist);
+	vorbis_comment_add_tag(&vc, "title", tags->title);
+	vorbis_comment_add_tag(&vc, "album", tags->album);
+	vorbis_comment_add_tag(&vc, "year", tags->year);
+	vorbis_comment_add_tag(&vc, "comment", tags->comment);
+	ret = vorbis_commentheader_out(&vc, result);
+	vorbis_comment_clear(&vc);
+	if (ret != 0)
+		return -E_VORBIS_COMMENTHEADER;
+	return 1;
+}
+
+static int vorbis_rewrite_tags(const char *map, size_t mapsize,
+		struct taginfo *tags, int output_fd,
+		__a_unused const char *filename)
+{
+	int ret;
+	ogg_packet packet;
+
+	ret = vorbis_make_meta_packet(tags, &packet);
+	if (ret < 0)
+		return ret;
+	ret = oac_rewrite_tags(map, mapsize, output_fd, (char *)packet.packet,
+		packet.bytes);
+	free(packet.packet);
+	return ret;
+}
+
+static const char * const ogg_suffixes[] = {"ogg", NULL};
 
 /**
  * The init function of the ogg vorbis audio format handler.
  *
  * \param afh Pointer to the struct to initialize.
  */
-void ogg_init(struct audio_format_handler *afh)
+void ogg_afh_init(struct audio_format_handler *afh)
 {
 	afh->get_file_info = ogg_vorbis_get_file_info;
 	afh->get_header = vorbis_get_header;
 	afh->suffixes = ogg_suffixes;
+	afh->rewrite_tags = vorbis_rewrite_tags;
 }