1 files changed, 101 insertions, 55 deletions

diff --git a/src/decoder/vorbis_decoder_plugin.c b/src/decoder/VorbisDecoderPlugin.cxx
index 15cdc0ca9..01a558def 100644
--- a/src/decoder/vorbis_decoder_plugin.c
+++ b/src/decoder/VorbisDecoderPlugin.cxx
@@ -18,10 +18,16 @@
  */
 
 #include "config.h"
-#include "vorbis_comments.h"
-#include "_ogg_common.h"
+#include "VorbisDecoderPlugin.h"
+#include "VorbisComments.hxx"
+#include "decoder_api.h"
+#include "OggCodec.hxx"
+
+extern "C" {
 #include "audio_check.h"
 #include "uri.h"
+}
+
 #include "tag_handler.h"
 
 #ifndef HAVE_TREMOR
@@ -48,12 +54,11 @@
 
 #undef G_LOG_DOMAIN
 #define G_LOG_DOMAIN "vorbis"
-#define OGG_CHUNK_SIZE 4096
 
 #if G_BYTE_ORDER == G_BIG_ENDIAN
-#define OGG_DECODE_USE_BIGENDIAN	1
+#define VORBIS_BIG_ENDIAN true
 #else
-#define OGG_DECODE_USE_BIGENDIAN	0
+#define VORBIS_BIG_ENDIAN false
 #endif
 
 struct vorbis_input_stream {
@@ -65,10 +70,9 @@ struct vorbis_input_stream {
 
 static size_t ogg_read_cb(void *ptr, size_t size, size_t nmemb, void *data)
 {
-	struct vorbis_input_stream *vis = data;
-	size_t ret;
-
-	ret = decoder_read(vis->decoder, vis->input_stream, ptr, size * nmemb);
+	struct vorbis_input_stream *vis = (struct vorbis_input_stream *)data;
+	size_t ret = decoder_read(vis->decoder, vis->input_stream,
+				  ptr, size * nmemb);
 
 	errno = 0;
 
@@ -77,7 +81,7 @@ static size_t ogg_read_cb(void *ptr, size_t size, size_t nmemb, void *data)
 
 static int ogg_seek_cb(void *data, ogg_int64_t offset, int whence)
 {
-	struct vorbis_input_stream *vis = data;
+	struct vorbis_input_stream *vis = (struct vorbis_input_stream *)data;
 
 	return vis->seekable &&
 		(!vis->decoder || decoder_get_command(vis->decoder) != DECODE_COMMAND_STOP) &&
@@ -93,16 +97,16 @@ static int ogg_close_cb(G_GNUC_UNUSED void *data)
 
 static long ogg_tell_cb(void *data)
 {
-	const struct vorbis_input_stream *vis = data;
+	struct vorbis_input_stream *vis = (struct vorbis_input_stream *)data;
 
 	return (long)vis->input_stream->offset;
 }
 
 static const ov_callbacks vorbis_is_callbacks = {
-	.read_func = ogg_read_cb,
-	.seek_func = ogg_seek_cb,
-	.close_func = ogg_close_cb,
-	.tell_func = ogg_tell_cb,
+	ogg_read_cb,
+	ogg_seek_cb,
+	ogg_close_cb,
+	ogg_tell_cb,
 };
 
 static const char *
@@ -135,9 +139,7 @@ vorbis_is_open(struct vorbis_input_stream *vis, OggVorbis_File *vf,
 {
 	vis->decoder = decoder;
 	vis->input_stream = input_stream;
-	vis->seekable = input_stream->seekable &&
-		(input_stream->uri == NULL ||
-		 !uri_has_scheme(input_stream->uri));
+	vis->seekable = input_stream_cheap_seeking(input_stream);
 
 	int ret = ov_open_callbacks(vis, vf, NULL, 0, vorbis_is_callbacks);
 	if (ret < 0) {
@@ -155,9 +157,7 @@ static void
 vorbis_send_comments(struct decoder *decoder, struct input_stream *is,
 		     char **comments)
 {
-	struct tag *tag;
-
-	tag = vorbis_comments_to_tag(comments);
+	struct tag *tag = vorbis_comments_to_tag(comments);
 	if (!tag)
 		return;
 
@@ -165,55 +165,79 @@ vorbis_send_comments(struct decoder *decoder, struct input_stream *is,
 	tag_free(tag);
 }
 
+#ifndef HAVE_TREMOR
+static void
+vorbis_interleave(float *dest, const float *const*src,
+		  unsigned nframes, unsigned channels)
+{
+	for (const float *const*src_end = src + channels;
+	     src != src_end; ++src, ++dest) {
+		float *d = dest;
+		for (const float *s = *src, *s_end = s + nframes;
+		     s != s_end; ++s, d += channels)
+			*d = *s;
+	}
+}
+#endif
+
 /* public */
 static void
 vorbis_stream_decode(struct decoder *decoder,
 		     struct input_stream *input_stream)
 {
 	GError *error = NULL;
-	OggVorbis_File vf;
-	struct vorbis_input_stream vis;
-	struct audio_format audio_format;
-	float total_time;
-	int current_section;
-	int prev_section = -1;
-	long ret;
-	char chunk[OGG_CHUNK_SIZE];
-	long bitRate = 0;
-	long test;
-	const vorbis_info *vi;
-	enum decoder_command cmd = DECODE_COMMAND_NONE;
-
-	if (ogg_stream_type_detect(input_stream) != VORBIS)
+
+	if (ogg_codec_detect(decoder, input_stream) != OGG_CODEC_VORBIS)
 		return;
 
-	/* rewind the stream, because ogg_stream_type_detect() has
+	/* rewind the stream, because ogg_codec_detect() has
 	   moved it */
 	input_stream_lock_seek(input_stream, 0, SEEK_SET, NULL);
 
+	struct vorbis_input_stream vis;
+	OggVorbis_File vf;
 	if (!vorbis_is_open(&vis, &vf, decoder, input_stream))
 		return;
 
-	vi = ov_info(&vf, -1);
+	const vorbis_info *vi = ov_info(&vf, -1);
 	if (vi == NULL) {
 		g_warning("ov_info() has failed");
 		return;
 	}
 
+	struct audio_format audio_format;
 	if (!audio_format_init_checked(&audio_format, vi->rate,
+#ifdef HAVE_TREMOR
 				       SAMPLE_FORMAT_S16,
+#else
+				       SAMPLE_FORMAT_FLOAT,
+#endif
 				       vi->channels, &error)) {
 		g_warning("%s", error->message);
 		g_error_free(error);
 		return;
 	}
 
-	total_time = ov_time_total(&vf, -1);
+	float total_time = ov_time_total(&vf, -1);
 	if (total_time < 0)
 		total_time = 0;
 
 	decoder_initialized(decoder, &audio_format, vis.seekable, total_time);
 
+	enum decoder_command cmd = decoder_get_command(decoder);
+
+#ifdef HAVE_TREMOR
+	char buffer[4096];
+#else
+	float buffer[2048];
+	const int frames_per_buffer =
+		G_N_ELEMENTS(buffer) / audio_format.channels;
+	const unsigned frame_size = sizeof(buffer[0]) * audio_format.channels;
+#endif
+
+	int prev_section = -1;
+	unsigned kbit_rate = 0;
+
 	do {
 		if (cmd == DECODE_COMMAND_SEEK) {
 			double seek_where = decoder_seek_where(decoder);
@@ -223,17 +247,33 @@ vorbis_stream_decode(struct decoder *decoder,
 				decoder_seek_error(decoder);
 		}
 
-		ret = ov_read(&vf, chunk, sizeof(chunk),
-			      OGG_DECODE_USE_BIGENDIAN, 2, 1, &current_section);
-		if (ret == OV_HOLE) /* bad packet */
-			ret = 0;
-		else if (ret <= 0)
+		int current_section;
+
+#ifdef HAVE_TREMOR
+		long nbytes = ov_read(&vf, buffer, sizeof(buffer),
+				      VORBIS_BIG_ENDIAN, 2, 1,
+				      &current_section);
+#else
+		float **per_channel;
+		long nframes = ov_read_float(&vf, &per_channel,
+					     frames_per_buffer,
+					     &current_section);
+		long nbytes = nframes;
+		if (nframes > 0) {
+			vorbis_interleave(buffer,
+					  (const float*const*)per_channel,
+					  nframes, audio_format.channels);
+			nbytes *= frame_size;
+		}
+#endif
+
+		if (nbytes == OV_HOLE) /* bad packet */
+			nbytes = 0;
+		else if (nbytes <= 0)
 			/* break on EOF or other error */
 			break;
 
 		if (current_section != prev_section) {
-			char **comments;
-
 			vi = ov_info(&vf, -1);
 			if (vi == NULL) {
 				g_warning("ov_info() has failed");
@@ -248,7 +288,7 @@ vorbis_stream_decode(struct decoder *decoder,
 				break;
 			}
 
-			comments = ov_comment(&vf, -1)->user_comments;
+			char **comments = ov_comment(&vf, -1)->user_comments;
 			vorbis_send_comments(decoder, input_stream, comments);
 
 			struct replay_gain_info rgi;
@@ -258,12 +298,13 @@ vorbis_stream_decode(struct decoder *decoder,
 			prev_section = current_section;
 		}
 
-		if ((test = ov_bitrate_instant(&vf)) > 0)
-			bitRate = test / 1000;
+		long test = ov_bitrate_instant(&vf);
+		if (test > 0)
+			kbit_rate = test / 1000;
 
 		cmd = decoder_data(decoder, input_stream,
-				   chunk, ret,
-				   bitRate);
+				   buffer, nbytes,
+				   kbit_rate);
 	} while (cmd != DECODE_COMMAND_STOP);
 
 	ov_clear(&vf);
@@ -306,9 +347,14 @@ static const char *const vorbis_mime_types[] = {
 };
 
 const struct decoder_plugin vorbis_decoder_plugin = {
-	.name = "vorbis",
-	.stream_decode = vorbis_stream_decode,
-	.scan_stream = vorbis_scan_stream,
-	.suffixes = vorbis_suffixes,
-	.mime_types = vorbis_mime_types
+	"vorbis",
+	nullptr,
+	nullptr,
+	vorbis_stream_decode,
+	nullptr,
+	nullptr,
+	vorbis_scan_stream,
+	nullptr,
+	vorbis_suffixes,
+	vorbis_mime_types
 };