1 files changed, 35 insertions, 34 deletions

diff --git a/src/decoder/faad_plugin.c b/src/decoder/faad_plugin.c
index 7b2806a4c..2272963b9 100644
--- a/src/decoder/faad_plugin.c
+++ b/src/decoder/faad_plugin.c
@@ -17,9 +17,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "../decoder_api.h"
-#include "decoder_buffer.h"
 #include "config.h"
+#include "decoder_api.h"
+#include "decoder_buffer.h"
+#include "audio_check.h"
 
 #define AAC_MAX_CHANNELS	6
 
@@ -37,6 +38,15 @@ static const unsigned adts_sample_rates[] =
 };
 
 /**
+ * The GLib quark used for errors reported by this plugin.
+ */
+static inline GQuark
+faad_decoder_quark(void)
+{
+	return g_quark_from_static_string("faad");
+}
+
+/**
  * Check whether the buffer head is an AAC frame, and return the frame
  * length.  Returns 0 if it is not a frame.
  */
@@ -195,7 +205,7 @@ faad_song_duration(struct decoder_buffer *buffer, struct input_stream *is)
 		/* obtain the duration from the ADTS header */
 		float song_length = adts_song_duration(buffer);
 
-		input_stream_seek(is, tagsize, SEEK_SET);
+		input_stream_seek(is, tagsize, SEEK_SET, NULL);
 
 		data = decoder_buffer_read(buffer, &length);
 		if (data != NULL)
@@ -232,7 +242,7 @@ faad_song_duration(struct decoder_buffer *buffer, struct input_stream *is)
  */
 static bool
 faad_decoder_init(faacDecHandle decoder, struct decoder_buffer *buffer,
-		  struct audio_format *audio_format)
+		  struct audio_format *audio_format, GError **error_r)
 {
 	union {
 		/* deconst hack for libfaad */
@@ -247,32 +257,33 @@ faad_decoder_init(faacDecHandle decoder, struct decoder_buffer *buffer,
 	/* neaacdec.h declares all arguments as "unsigned long", but
 	   internally expects uint32_t pointers.  To avoid gcc
 	   warnings, use this workaround. */
-	unsigned long *sample_rate_r = (unsigned long *)(void *)&sample_rate;
+	unsigned long *sample_rate_p = (unsigned long *)(void *)&sample_rate;
 #else
-	uint32_t *sample_rate_r = &sample_rate;
+	uint32_t *sample_rate_p = &sample_rate;
 #endif
 
 	u.in = decoder_buffer_read(buffer, &length);
-	if (u.in == NULL)
+	if (u.in == NULL) {
+		g_set_error(error_r, faad_decoder_quark(), 0,
+			    "Empty file");
 		return false;
+	}
 
 	nbytes = faacDecInit(decoder, u.out,
 #ifdef HAVE_FAAD_BUFLEN_FUNCS
 			     length,
 #endif
-			     sample_rate_r, &channels);
-	if (nbytes < 0)
+			     sample_rate_p, &channels);
+	if (nbytes < 0) {
+		g_set_error(error_r, faad_decoder_quark(), 0,
+			    "Not an AAC stream");
 		return false;
+	}
 
 	decoder_buffer_consume(buffer, nbytes);
 
-	*audio_format = (struct audio_format){
-		.bits = 16,
-		.channels = channels,
-		.sample_rate = sample_rate,
-	};
-
-	return true;
+	return audio_format_init_checked(audio_format, sample_rate,
+					 SAMPLE_FORMAT_S16, channels, error_r);
 }
 
 /**
@@ -319,7 +330,7 @@ faad_get_file_time_float(const char *file)
 	faacDecConfigurationPtr config;
 	struct input_stream is;
 
-	if (!input_stream_open(&is, file))
+	if (!input_stream_open(&is, file, NULL))
 		return -1;
 
 	buffer = decoder_buffer_new(NULL, &is,
@@ -338,8 +349,8 @@ faad_get_file_time_float(const char *file)
 
 		decoder_buffer_fill(buffer);
 
-		ret = faad_decoder_init(decoder, buffer, &audio_format);
-		if (ret && audio_format_valid(&audio_format))
+		ret = faad_decoder_init(decoder, buffer, &audio_format, NULL);
+		if (ret)
 			length = 0;
 
 		faacDecClose(decoder);
@@ -371,7 +382,7 @@ faad_get_file_time(const char *file)
 static void
 faad_stream_decode(struct decoder *mpd_decoder, struct input_stream *is)
 {
-	float file_time;
+	GError *error = NULL;
 	float total_time = 0;
 	faacDecHandle decoder;
 	struct audio_format audio_format;
@@ -408,15 +419,10 @@ faad_stream_decode(struct decoder *mpd_decoder, struct input_stream *is)
 
 	/* initialize it */
 
-	ret = faad_decoder_init(decoder, buffer, &audio_format);
+	ret = faad_decoder_init(decoder, buffer, &audio_format, &error);
 	if (!ret) {
-		g_warning("Error not a AAC stream.\n");
-		faacDecClose(decoder);
-		return;
-	}
-
-	if (!audio_format_valid(&audio_format)) {
-		g_warning("invalid audio format\n");
+		g_warning("%s", error->message);
+		g_error_free(error);
 		faacDecClose(decoder);
 		return;
 	}
@@ -427,8 +433,6 @@ faad_stream_decode(struct decoder *mpd_decoder, struct input_stream *is)
 
 	/* the decoder loop */
 
-	file_time = 0.0;
-
 	do {
 		size_t frame_size;
 		const void *decoded;
@@ -474,15 +478,12 @@ faad_stream_decode(struct decoder *mpd_decoder, struct input_stream *is)
 			bit_rate = frame_info.bytesconsumed * 8.0 *
 			    frame_info.channels * audio_format.sample_rate /
 			    frame_info.samples / 1000 + 0.5;
-			file_time +=
-			    (float)(frame_info.samples) / frame_info.channels /
-			    audio_format.sample_rate;
 		}
 
 		/* send PCM samples to MPD */
 
 		cmd = decoder_data(mpd_decoder, is, decoded,
-				   (size_t)frame_info.samples * 2, file_time,
+				   (size_t)frame_info.samples * 2,
 				   bit_rate, NULL);
 	} while (cmd != DECODE_COMMAND_STOP);