X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=ogg_afh.c;h=93ad14bbf9c0b5cbade554fbf22103ef460956fa;hp=ef42c497062c228ddab10497c3388ffa2b8de90b;hb=f932f45196a8a4480ad910c455abe8aae9824967;hpb=a365b8263a0d7a1673699bdf454677c95b38eb95

diff --git a/ogg_afh.c b/ogg_afh.c
index ef42c497..93ad14bb 100644
--- a/ogg_afh.c
+++ b/ogg_afh.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2004-2011 Andre Noll <maan@systemlinux.org>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2004 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file ogg_afh.c Audio format handler for ogg/vorbis files. */
 
@@ -20,8 +16,22 @@ 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,
-		struct afh_info *afhi, void *private_data)
+		__a_unused int serial, struct afh_info *afhi, void *private_data)
 {
 	struct private_vorbis_data *pvd = private_data;
 
@@ -52,28 +62,125 @@ 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;
 }
 
-static const char* ogg_suffixes[] = {"ogg", NULL};
+static int vorbis_get_header_callback(ogg_packet *packet, int packet_num,
+		int serial, __a_unused struct afh_info *afhi, void *private_data)
+{
+	int ret;
+	struct oac_custom_header *h = private_data;
+	static unsigned char dummy_packet[] = {
+		0x03,
+		'v', 'o', 'r', 'b', 'i', 's',
+		0x06, 0x00, 0x00, 0x00,
+		'd', 'u', 'm', 'm', 'y', '\0',
+		0x00, 0x00, 0x00, 0x00, /* no comment :) */
+		0xff /* framing bit */
+	};
+
+	PARA_DEBUG_LOG("processing ogg packet #%d\n", packet_num);
+	if (packet_num == 0) {
+		oac_custom_header_init(serial, h);
+		ret = oac_custom_header_append(packet, h);
+		if (ret < 0)
+			return ret;
+		oac_custom_header_flush(h);
+		return 1;
+	}
+	if (packet_num == 1) {
+		ogg_packet replacement = *packet;
+		PARA_INFO_LOG("replacing metadata packet\n");
+		replacement.packet = dummy_packet;
+		replacement.bytes = sizeof(dummy_packet);
+		ret = oac_custom_header_append(&replacement, h);
+		return ret < 0? ret : 1;
+	}
+	assert(packet_num == 2);
+	ret = oac_custom_header_append(packet, h);
+	if (ret < 0)
+		return ret;
+	oac_custom_header_flush(h);
+	return 0;
+}
+
+static void vorbis_get_header(void *map, size_t mapsize, char **buf,
+		size_t *len)
+{
+	int ret;
+	struct oac_custom_header *h = oac_custom_header_new();
+	struct oac_callback_info cb = {
+		.packet_callback = vorbis_get_header_callback,
+		.private_data = h,
+	};
+
+	ret = oac_get_file_info(map, mapsize, NULL, &cb);
+	*len = oac_custom_header_get(buf, h);
+	if (ret < 0) {
+		PARA_ERROR_LOG("could not create ogg/vorbis header: %s\n",
+			para_strerror(-ret));
+		free(*buf);
+		*buf = NULL;
+		*len = 0;
+	} else
+		PARA_INFO_LOG("created %zu byte ogg vorbis header\n", *len);
+}
+
+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_file_info = ogg_vorbis_get_file_info;
+	afh->get_header = vorbis_get_header;
 	afh->suffixes = ogg_suffixes;
+	afh->rewrite_tags = vorbis_rewrite_tags;
 }