From 43d82520502bc0c76fbd11d6e949739235166021 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Mon, 1 Oct 2012 23:17:13 +0200
Subject: output/recorder, test/*: invoke encoder_read() after _open()

Make sure the file header gets written at the beginning, before
_write() gets called.
---
 src/encoder_plugin.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/encoder_plugin.h')

diff --git a/src/encoder_plugin.h b/src/encoder_plugin.h
index 33a37911..cae0c804 100644
--- a/src/encoder_plugin.h
+++ b/src/encoder_plugin.h
@@ -119,6 +119,10 @@ encoder_finish(struct encoder *encoder)
  * Before you free it, you must call encoder_close().  You may open
  * and close (reuse) one encoder any number of times.
  *
+ * After this function returns successfully and before the first
+ * encoder_write() call, you should invoke encoder_read() to obtain
+ * the file header.
+ *
  * @param encoder the encoder
  * @param audio_format the encoder's input audio format; the plugin
  * may modify the struct to adapt it to its abilities
-- 
cgit v1.2.3


From adbe8c409a17b85ec10eb131fb81e3da9036dcef Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Mon, 1 Oct 2012 23:50:50 +0200
Subject: output/{recorder,shout}: call encoder_read() in a loop

This is necessary for Ogg packets that span more than one page.
---
 NEWS                                |  1 +
 src/encoder_plugin.h                |  2 ++
 src/output/recorder_output_plugin.c | 19 +++++++++++--------
 src/output/shout_output_plugin.c    | 18 ++++++++++--------
 4 files changed, 24 insertions(+), 16 deletions(-)

(limited to 'src/encoder_plugin.h')

diff --git a/NEWS b/NEWS
index a78002e9..c08a779e 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@ ver 0.17.3 (2012/??/??)
 * output:
   - recorder: fix I/O error check
   - shout: fix memory leak in error handler
+  - recorder, shout: support Ogg packets that span more than one page
 
 ver 0.17.2 (2012/09/30)
 * protocol:
diff --git a/src/encoder_plugin.h b/src/encoder_plugin.h
index cae0c804..3a42d79f 100644
--- a/src/encoder_plugin.h
+++ b/src/encoder_plugin.h
@@ -295,6 +295,8 @@ encoder_write(struct encoder *encoder, const void *data, size_t length,
 /**
  * Reads encoded data from the encoder.
  *
+ * Call this repeatedly until no more data is returned.
+ *
  * @param encoder the encoder
  * @param dest the destination buffer to copy to
  * @param length the maximum length of the destination buffer
diff --git a/src/output/recorder_output_plugin.c b/src/output/recorder_output_plugin.c
index ac4a5210..b84cb244 100644
--- a/src/output/recorder_output_plugin.c
+++ b/src/output/recorder_output_plugin.c
@@ -160,17 +160,20 @@ recorder_output_encoder_to_file(struct recorder_output *recorder,
 {
 	assert(recorder->fd >= 0);
 
-	/* read from the encoder */
+	while (true) {
+		/* read from the encoder */
 
-	size_t size = encoder_read(recorder->encoder, recorder->buffer,
-				   sizeof(recorder->buffer));
-	if (size == 0)
-		return true;
+		size_t size = encoder_read(recorder->encoder, recorder->buffer,
+					   sizeof(recorder->buffer));
+		if (size == 0)
+			return true;
 
-	/* write everything into the file */
+		/* write everything into the file */
 
-	return recorder_write_to_file(recorder, recorder->buffer, size,
-				      error_r);
+		if (!recorder_write_to_file(recorder, recorder->buffer, size,
+					    error_r))
+			return false;
+	}
 }
 
 static bool
diff --git a/src/output/shout_output_plugin.c b/src/output/shout_output_plugin.c
index 63f1001b..56456a0e 100644
--- a/src/output/shout_output_plugin.c
+++ b/src/output/shout_output_plugin.c
@@ -342,14 +342,16 @@ write_page(struct shout_data *sd, GError **error)
 {
 	assert(sd->encoder != NULL);
 
-	size_t nbytes = encoder_read(sd->encoder,
-				     sd->buffer, sizeof(sd->buffer));
-	if (nbytes == 0)
-		return true;
-
-	int err = shout_send(sd->shout_conn, sd->buffer, nbytes);
-	if (!handle_shout_error(sd, err, error))
-		return false;
+	while (true) {
+		size_t nbytes = encoder_read(sd->encoder,
+					     sd->buffer, sizeof(sd->buffer));
+		if (nbytes == 0)
+			return true;
+
+		int err = shout_send(sd->shout_conn, sd->buffer, nbytes);
+		if (!handle_shout_error(sd, err, error))
+			return false;
+	}
 
 	return true;
 }
-- 
cgit v1.2.3