X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=ogg_afh_common.c;h=62cde3d465ab7c86a23d6c539b8a2b447d465f78;hp=6e5a89347e383340f943e591254f64f05cc6f358;hb=f932f45196a8a4480ad910c455abe8aae9824967;hpb=4d067435b1167dbf5217c875ac9fd7ac69ad91bd

diff --git a/ogg_afh_common.c b/ogg_afh_common.c
index 6e5a8934..62cde3d4 100644
--- a/ogg_afh_common.c
+++ b/ogg_afh_common.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2004 Andre Noll <maan@tuebingen.mpg.de>
- *
- * 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_common.c Functions common to all ogg/ codecs. */
 
@@ -19,7 +15,7 @@
 /* Taken from decoder_example.c of libvorbis-1.2.3. */
 static int process_packets_2_and_3(ogg_sync_state *oss,
 		ogg_stream_state *stream, struct afh_info *afhi,
-		struct ogg_afh_callback_info *ci)
+		struct oac_callback_info *ci)
 {
 	ogg_page page;
 	ogg_packet packet;
@@ -60,7 +56,7 @@ static int process_packets_2_and_3(ogg_sync_state *oss,
 }
 
 static int process_ogg_packets(ogg_sync_state *oss, struct afh_info *afhi,
-		struct ogg_afh_callback_info *ci)
+		struct oac_callback_info *ci)
 {
 	ogg_packet packet;
 	ogg_stream_state stream;
@@ -122,8 +118,8 @@ static void set_chunk_tv(int frames_per_chunk, int frequency,
  *
  * \return Standard.
  */
-int ogg_get_file_info(char *map, size_t numbytes, struct afh_info *afhi,
-		struct ogg_afh_callback_info *ci)
+int oac_get_file_info(char *map, size_t numbytes, struct afh_info *afhi,
+		struct oac_callback_info *ci)
 {
 	ogg_sync_state oss;
 	ogg_page op;
@@ -158,7 +154,7 @@ int ogg_get_file_info(char *map, size_t numbytes, struct afh_info *afhi,
 	afhi->seconds_total = num_frames / afhi->frequency;
 	/* use roughly one page per chunk */
 	frames_per_chunk = num_frames / i;
-	PARA_INFO_LOG("%" PRIu32 "seconds, %d frames/chunk\n",
+	PARA_INFO_LOG("%" PRIu32 " seconds, %d frames/chunk\n",
 		afhi->seconds_total, frames_per_chunk);
 	ct_size = 250;
 	afhi->chunk_table = para_malloc(ct_size * sizeof(uint32_t));
@@ -181,6 +177,7 @@ int ogg_get_file_info(char *map, size_t numbytes, struct afh_info *afhi,
 		}
 	}
 	afhi->chunks_total = j;
+	set_max_chunk_size(afhi);
 	set_chunk_tv(frames_per_chunk, afhi->frequency, &afhi->chunk_tv);
 	ret = 0;
 out:
@@ -215,7 +212,7 @@ static int write_ogg_page(int fd, const ogg_page *op)
  *
  * \return Standard.
  */
-int ogg_rewrite_tags(const char *map, size_t map_sz, int fd,
+int oac_rewrite_tags(const char *map, size_t map_sz, int fd,
 		char *meta_packet, size_t meta_sz)
 {
 	ogg_sync_state oss_in, oss_out;
@@ -331,3 +328,108 @@ out:
 		ogg_stream_clear(so);
 	return ret;
 }
+
+/* Structure for providing custom headers for streaming. */
+struct oac_custom_header {
+	char *buf;
+	size_t len;
+	ogg_stream_state oss;
+};
+
+/**
+ * Allocate and return a custom header structure.
+ *
+ * For some audio codecs which employ the ogg container format, the server side
+ * wants to replace the meta tags at the beginning of the file because they are
+ * not needed for streaming and can be arbitrary large. The structure returned
+ * by this function is typically used as the ->private field of struct \ref
+ * oac_callback_info for \ref oac_get_file_info(). This allows the audio format
+ * handler to set up a custom header which is identical to the original header,
+ * but with the meta data part replaced by fixed length dummy contents.
+ *
+ * \return The returned memory must be initialized with the serial number of
+ * the ogg stream before ogg packets can be submitted to it. This is not done
+ * here because the header structure is allocated before \ref
+ * oac_get_file_info() is called, and the serial number is not known at this
+ * point.
+ *
+ * \sa \ref oac_custom_header_init().
+ */
+struct oac_custom_header *oac_custom_header_new(void)
+{
+	return para_calloc(sizeof(struct oac_custom_header));
+}
+
+/**
+ * Set the serial number of an allocated header structure.
+ *
+ * \param serial Passed to the callback function.
+ * \param h As returned from \ref oac_custom_header_new().
+ *
+ * This function must be called before any packets are submitted.
+ */
+void oac_custom_header_init(int serial, struct oac_custom_header *h)
+{
+	ogg_stream_init(&h->oss, serial);
+}
+
+/**
+ * Submit an ogg packet to a custom header structure.
+ *
+ * \param op The packet to append.
+ * \param h Must be initialized.
+ *
+ * The packet may be the one which was passed to the callback, or a completely
+ * different one, like a dummy metadata packet.
+ *
+ * \return Standard.
+ */
+int oac_custom_header_append(ogg_packet *op, struct oac_custom_header *h)
+{
+	return ogg_stream_packetin(&h->oss, op) < 0? -E_OGG_PACKET_IN : 1;
+}
+
+/**
+ * Force remaining packets into an ogg page.
+ *
+ * \param h Should contain submitted but not yet flushed packets.
+ *
+ * This is called after the first packet has been submitted with \ref
+ * oac_custom_header_append() to make sure the first ogg page contains only
+ * this packet. Also when header processing is complete, the callbacks call
+ * this to force the previously submitted packets into a page.
+ */
+void oac_custom_header_flush(struct oac_custom_header *h)
+{
+	ogg_page og;
+
+	while (ogg_stream_flush(&h->oss, &og)) {
+		size_t len = og.header_len + og.body_len;
+		h->buf = para_realloc(h->buf, h->len + len);
+		memcpy(h->buf + h->len, og.header, og.header_len);
+		memcpy(h->buf + h->len + og.header_len, og.body, og.body_len);
+		h->len += len;
+	}
+}
+
+/**
+ * Return the custom header buffer and deallocate resources.
+ *
+ * This is called after the ogg packets which comprise the header have been
+ * submitted and flushed.
+ *
+ * \param buf Result pointer.
+ * \param h Must not be used any more after the call.
+ *
+ * \return The size of the header. This is the sum of the sizes of all ogg
+ * pages that have been flushed out.
+ */
+size_t oac_custom_header_get(char **buf, struct oac_custom_header *h)
+{
+	size_t ret = h->len;
+
+	*buf = h->buf;
+	ogg_stream_clear(&h->oss);
+	free(h);
+	return ret;
+}