shout: moved code to audioOutput_shout_ogg.c

Begin dividing audioOutput_shout.c: move everything OGG Vorbis related
to audioOutput_shout_ogg.c.  The header audioOutput_shout.h has to
keep its dependency on vorbis/vorbisenc.h, because it needs the vorbis
encoder types.

For this patch, we have to export several internal functions with
generic names to the ABI; these will be removed later when the encoder
plugin patches are merged.

src/Makefile.am

@@ -3,6 +3,7 @@ SUBDIRS = $(MP4FF_SUBDIR)
 
 mpd_audioOutputs = \
 	audioOutputs/audioOutput_shout.c \
+	audioOutputs/audioOutput_shout_ogg.c \
 	audioOutputs/audioOutput_null.c \
 	audioOutputs/audioOutput_fifo.c \
 	audioOutputs/audioOutput_alsa.c \

src/audioOutputs/audioOutput_shout.c

@@ -248,7 +248,7 @@ static int handle_shout_error(struct shout_data *sd, int err)
 	return 0;
 }
 
-static int write_page(struct shout_data *sd)
+int write_page(struct shout_data *sd)
 {
 	int err;
 
@@ -263,39 +263,6 @@ static int write_page(struct shout_data *sd)
 	return 0;
 }
 
-static void finish_encoder(struct shout_data *sd)
-{
-	vorbis_analysis_wrote(&sd->vd, 0);
-
-	while (vorbis_analysis_blockout(&sd->vd, &sd->vb) == 1) {
-		vorbis_analysis(&sd->vb, NULL);
-		vorbis_bitrate_addblock(&sd->vb);
-		while (vorbis_bitrate_flushpacket(&sd->vd, &sd->op)) {
-			ogg_stream_packetin(&sd->os, &sd->op);
-		}
-	}
-}
-
-static int flush_encoder(struct shout_data *sd)
-{
-	return (ogg_stream_pageout(&sd->os, &sd->og) > 0);
-}
-
-static void shout_ogg_encoder_clear_encoder(struct shout_data *sd)
-{
-	finish_encoder(sd);
-	while (1 == flush_encoder(sd)) {
-		if (!sd->shout_error)
-			write_page(sd);
-	}
-
-	vorbis_comment_clear(&sd->vc);
-	ogg_stream_clear(&sd->os);
-	vorbis_block_clear(&sd->vb);
-	vorbis_dsp_clear(&sd->vd);
-	vorbis_info_clear(&sd->vi);
-}
-
 static void close_shout_conn(struct shout_data *sd)
 {
 	if (sd->opened)
@@ -346,72 +313,6 @@ static void my_shout_close_device(struct audio_output *audio_output)
 	audio_output->open = 0;
 }
 
-static void add_tag(struct shout_data *sd, const char *name, char *value)
-{
-	if (value) {
-		union const_hack u;
-		u.in = name;
-		vorbis_comment_add_tag(&(sd->vc), u.out, value);
-	}
-}
-
-static void copy_tag_to_vorbis_comment(struct shout_data *sd)
-{
-	if (sd->tag) {
-		int i;
-
-		for (i = 0; i < sd->tag->numOfItems; i++) {
-			switch (sd->tag->items[i]->type) {
-			case TAG_ITEM_ARTIST:
-				add_tag(sd, "ARTIST", sd->tag->items[i]->value);
-				break;
-			case TAG_ITEM_ALBUM:
-				add_tag(sd, "ALBUM", sd->tag->items[i]->value);
-				break;
-			case TAG_ITEM_TITLE:
-				add_tag(sd, "TITLE", sd->tag->items[i]->value);
-				break;
-			default:
-				break;
-			}
-		}
-	}
-}
-
-static int init_encoder(struct shout_data *sd)
-{
-	vorbis_info_init(&(sd->vi));
-
-	if (sd->quality >= -1.0) {
-		if (0 != vorbis_encode_init_vbr(&(sd->vi),
-						sd->audio_format.channels,
-						sd->audio_format.sampleRate,
-						sd->quality * 0.1)) {
-			ERROR("problem setting up vorbis encoder for shout\n");
-			vorbis_info_clear(&(sd->vi));
-			return -1;
-		}
-	} else {
-		if (0 != vorbis_encode_init(&(sd->vi),
-					    sd->audio_format.channels,
-					    sd->audio_format.sampleRate, -1.0,
-					    sd->bitrate * 1000, -1.0)) {
-			ERROR("problem setting up vorbis encoder for shout\n");
-			vorbis_info_clear(&(sd->vi));
-			return -1;
-		}
-	}
-
-	vorbis_analysis_init(&(sd->vd), &(sd->vi));
-	vorbis_block_init(&(sd->vd), &(sd->vb));
-
-	ogg_stream_init(&(sd->os), rand());
-
-	vorbis_comment_init(&(sd->vc));
-
-	return 0;
-}
-
 static int shout_connect(struct shout_data *sd)
 {
 	time_t t = time(NULL);
@@ -486,13 +387,7 @@ static int open_shout_conn(struct audio_output *audio_output)
 
 	copy_tag_to_vorbis_comment(sd);
 
-	vorbis_analysis_headerout(&(sd->vd), &(sd->vc), &(sd->header_main),
+	send_ogg_vorbis_header(sd);
-				  &(sd->header_comments),
-				  &(sd->header_codebooks));
-
-	ogg_stream_packetin(&(sd->os), &(sd->header_main));
-	ogg_stream_packetin(&(sd->os), &(sd->header_comments));
-	ogg_stream_packetin(&(sd->os), &(sd->header_codebooks));
 
 	sd->opened = 1;
 	sd->tag_to_send = 0;
@@ -531,25 +426,9 @@ static void send_metadata(struct shout_data * sd)
 	if (!sd->opened || !sd->tag)
 		return;
 
-	shout_ogg_encoder_clear_encoder(sd);
+	if (shout_ogg_encoder_send_metadata(sd)) {
-	if (init_encoder(sd) < 0)
+		close_shout_conn(sd);
 		return;
-
-	copy_tag_to_vorbis_comment(sd);
-
-	vorbis_analysis_headerout(&(sd->vd), &(sd->vc), &(sd->header_main),
-				  &(sd->header_comments),
-				  &(sd->header_codebooks));
-
-	ogg_stream_packetin(&(sd->os), &(sd->header_main));
-	ogg_stream_packetin(&(sd->os), &(sd->header_comments));
-	ogg_stream_packetin(&(sd->os), &(sd->header_codebooks));
-
-	while (ogg_stream_flush(&(sd->os), &(sd->og))) {
-		if (write_page(sd) < 0) {
-			close_shout_conn(sd);
-			return;
-		}
 	}
 
 	sd->tag_to_send = 0;
@@ -558,12 +437,7 @@ static void send_metadata(struct shout_data * sd)
 static int my_shout_play(struct audio_output *audio_output,
 			 const char *chunk, size_t size)
 {
-	unsigned int i;
-	int j;
 	struct shout_data *sd = (struct shout_data *) audio_output->data;
-	float **vorbbuf;
-	unsigned int samples;
-	int bytes = sd->audio_format.bits / 8;
 	int status;
 
 	if (!sd->timer->started)
@@ -585,29 +459,7 @@ static int my_shout_play(struct audio_output *audio_output,
 		}
 	}
 
-	samples = size / (bytes * sd->audio_format.channels);
+	shout_ogg_encoder_encode(sd, chunk, size);
-
-	/* this is for only 16-bit audio */
-
-	vorbbuf = vorbis_analysis_buffer(&(sd->vd), samples);
-
-	for (i = 0; i < samples; i++) {
-		for (j = 0; j < sd->audio_format.channels; j++) {
-			vorbbuf[j][i] = (*((const mpd_sint16 *) chunk)) / 32768.0;
-			chunk += bytes;
-		}
-	}
-
-	vorbis_analysis_wrote(&(sd->vd), samples);
-
-	while (1 == vorbis_analysis_blockout(&(sd->vd), &(sd->vb))) {
-		vorbis_analysis(&(sd->vb), NULL);
-		vorbis_bitrate_addblock(&(sd->vb));
-
-		while (vorbis_bitrate_flushpacket(&(sd->vd), &(sd->op))) {
-			ogg_stream_packetin(&(sd->os), &(sd->op));
-		}
-	}
 
 	while (ogg_stream_pageout(&(sd->os), &(sd->og)) != 0) {
 		if (write_page(sd) < 0) {

src/audioOutputs/audioOutput_shout.h

@@ -63,6 +63,21 @@ struct shout_data {
 	struct audio_format audio_format;
 };
 
+int write_page(struct shout_data *sd);
+
+void copy_tag_to_vorbis_comment(struct shout_data *sd);
+
+void send_ogg_vorbis_header(struct shout_data *sd);
+
+void shout_ogg_encoder_clear_encoder(struct shout_data *sd);
+
+int init_encoder(struct shout_data *sd);
+
+int shout_ogg_encoder_send_metadata(struct shout_data * sd);
+
+void shout_ogg_encoder_encode(struct shout_data *sd,
+			      const char *chunk, size_t len);
+
 #endif
 
 #endif

src/audioOutputs/audioOutput_shout_ogg.c

@@ -0,0 +1,190 @@
+/* the Music Player Daemon (MPD)
+ * Copyright (C) 2003-2007 by Warren Dukes (warren.dukes@gmail.com)
+ * This project's homepage is: http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "audioOutput_shout.h"
+
+#ifdef HAVE_SHOUT
+
+#include "../utils.h"
+
+static void add_tag(struct shout_data *sd, const char *name, char *value)
+{
+	if (value) {
+		union const_hack u;
+		u.in = name;
+		vorbis_comment_add_tag(&(sd->vc), u.out, value);
+	}
+}
+
+void copy_tag_to_vorbis_comment(struct shout_data *sd)
+{
+	if (sd->tag) {
+		int i;
+
+		for (i = 0; i < sd->tag->numOfItems; i++) {
+			switch (sd->tag->items[i]->type) {
+			case TAG_ITEM_ARTIST:
+				add_tag(sd, "ARTIST", sd->tag->items[i]->value);
+				break;
+			case TAG_ITEM_ALBUM:
+				add_tag(sd, "ALBUM", sd->tag->items[i]->value);
+				break;
+			case TAG_ITEM_TITLE:
+				add_tag(sd, "TITLE", sd->tag->items[i]->value);
+				break;
+			default:
+				break;
+			}
+		}
+	}
+}
+
+void send_ogg_vorbis_header(struct shout_data *sd)
+{
+	vorbis_analysis_headerout(&(sd->vd), &(sd->vc), &(sd->header_main),
+				  &(sd->header_comments),
+				  &(sd->header_codebooks));
+
+	ogg_stream_packetin(&(sd->os), &(sd->header_main));
+	ogg_stream_packetin(&(sd->os), &(sd->header_comments));
+	ogg_stream_packetin(&(sd->os), &(sd->header_codebooks));
+}
+
+static void finish_encoder(struct shout_data *sd)
+{
+	vorbis_analysis_wrote(&sd->vd, 0);
+
+	while (vorbis_analysis_blockout(&sd->vd, &sd->vb) == 1) {
+		vorbis_analysis(&sd->vb, NULL);
+		vorbis_bitrate_addblock(&sd->vb);
+		while (vorbis_bitrate_flushpacket(&sd->vd, &sd->op)) {
+			ogg_stream_packetin(&sd->os, &sd->op);
+		}
+	}
+}
+
+static int flush_encoder(struct shout_data *sd)
+{
+	return (ogg_stream_pageout(&sd->os, &sd->og) > 0);
+}
+
+void shout_ogg_encoder_clear_encoder(struct shout_data *sd)
+{
+	finish_encoder(sd);
+	while (1 == flush_encoder(sd)) {
+		if (!sd->shout_error)
+			write_page(sd);
+	}
+
+	vorbis_comment_clear(&sd->vc);
+	ogg_stream_clear(&sd->os);
+	vorbis_block_clear(&sd->vb);
+	vorbis_dsp_clear(&sd->vd);
+	vorbis_info_clear(&sd->vi);
+}
+
+int init_encoder(struct shout_data *sd)
+{
+	vorbis_info_init(&(sd->vi));
+
+	if (sd->quality >= -1.0) {
+		if (0 != vorbis_encode_init_vbr(&(sd->vi),
+						sd->audio_format.channels,
+						sd->audio_format.sampleRate,
+						sd->quality * 0.1)) {
+			ERROR("problem setting up vorbis encoder for shout\n");
+			vorbis_info_clear(&(sd->vi));
+			return -1;
+		}
+	} else {
+		if (0 != vorbis_encode_init(&(sd->vi),
+					    sd->audio_format.channels,
+					    sd->audio_format.sampleRate, -1.0,
+					    sd->bitrate * 1000, -1.0)) {
+			ERROR("problem setting up vorbis encoder for shout\n");
+			vorbis_info_clear(&(sd->vi));
+			return -1;
+		}
+	}
+
+	vorbis_analysis_init(&(sd->vd), &(sd->vi));
+	vorbis_block_init(&(sd->vd), &(sd->vb));
+	ogg_stream_init(&(sd->os), rand());
+	vorbis_comment_init(&(sd->vc));
+
+	return 0;
+}
+
+int shout_ogg_encoder_send_metadata(struct shout_data * sd)
+{
+	shout_ogg_encoder_clear_encoder(sd);
+	if (init_encoder(sd) < 0)
+		return 0;
+
+	copy_tag_to_vorbis_comment(sd);
+
+	vorbis_analysis_headerout(&(sd->vd), &(sd->vc), &(sd->header_main),
+				  &(sd->header_comments),
+				  &(sd->header_codebooks));
+
+	ogg_stream_packetin(&(sd->os), &(sd->header_main));
+	ogg_stream_packetin(&(sd->os), &(sd->header_comments));
+	ogg_stream_packetin(&(sd->os), &(sd->header_codebooks));
+
+	while (ogg_stream_flush(&sd->os, &sd->og)) {
+		if (write_page(sd) < 0)
+			return -1;
+	}
+
+	return 0;
+}
+
+void shout_ogg_encoder_encode(struct shout_data *sd,
+			      const char *chunk, size_t size)
+{
+	unsigned int i;
+	int j;
+	float **vorbbuf;
+	unsigned int samples;
+	int bytes = sd->audio_format.bits / 8;
+
+	samples = size / (bytes * sd->audio_format.channels);
+	vorbbuf = vorbis_analysis_buffer(&(sd->vd), samples);
+
+	/* this is for only 16-bit audio */
+
+	for (i = 0; i < samples; i++) {
+		for (j = 0; j < sd->audio_format.channels; j++) {
+			vorbbuf[j][i] = (*((const mpd_sint16 *) chunk)) / 32768.0;
+			chunk += bytes;
+		}
+	}
+
+	vorbis_analysis_wrote(&(sd->vd), samples);
+
+	while (1 == vorbis_analysis_blockout(&(sd->vd), &(sd->vb))) {
+		vorbis_analysis(&(sd->vb), NULL);
+		vorbis_bitrate_addblock(&(sd->vb));
+
+		while (vorbis_bitrate_flushpacket(&(sd->vd), &(sd->op))) {
+			ogg_stream_packetin(&(sd->os), &(sd->op));
+		}
+	}
+}
+
+#endif