1 files changed, 85 insertions, 261 deletions

diff --git a/src/decoder/_flac_common.c b/src/decoder/_flac_common.c
index 7c8fe9875..4dd2b46ea 100644
--- a/src/decoder/_flac_common.c
+++ b/src/decoder/_flac_common.c
@@ -21,7 +21,11 @@
  * Common data structures and functions used by FLAC and OggFLAC
  */
 
+#include "config.h"
 #include "_flac_common.h"
+#include "flac_metadata.h"
+#include "flac_pcm.h"
+#include "audio_check.h"
 
 #include <glib.h>
 
@@ -31,186 +35,96 @@ void
 flac_data_init(struct flac_data *data, struct decoder * decoder,
 	       struct input_stream *input_stream)
 {
-	data->time = 0;
+	pcm_buffer_init(&data->buffer);
+
+	data->have_stream_info = false;
+	data->first_frame = 0;
+	data->next_frame = 0;
+
 	data->position = 0;
-	data->bit_rate = 0;
 	data->decoder = decoder;
 	data->input_stream = input_stream;
 	data->replay_gain_info = NULL;
 	data->tag = NULL;
 }
 
-static void
-flac_find_float_comment(const FLAC__StreamMetadata *block,
-			const char *cmnt, float *fl, bool *found_r)
-{
-	int offset;
-	size_t pos;
-	int len;
-	unsigned char tmp, *p;
-
-	offset = FLAC__metadata_object_vorbiscomment_find_entry_from(block, 0,
-								     cmnt);
-	if (offset < 0)
-		return;
-
-	pos = strlen(cmnt) + 1; /* 1 is for '=' */
-	len = block->data.vorbis_comment.comments[offset].length - pos;
-	if (len <= 0)
-		return;
-
-	p = &block->data.vorbis_comment.comments[offset].entry[pos];
-	tmp = p[len];
-	p[len] = '\0';
-	*fl = (float)atof((char *)p);
-	p[len] = tmp;
-
-	*found_r = true;
-}
-
-static void
-flac_parse_replay_gain(const FLAC__StreamMetadata *block,
-		       struct flac_data *data)
+void
+flac_data_deinit(struct flac_data *data)
 {
-	bool found = false;
+	pcm_buffer_deinit(&data->buffer);
 
-	if (data->replay_gain_info)
+	if (data->replay_gain_info != NULL)
 		replay_gain_info_free(data->replay_gain_info);
 
-	data->replay_gain_info = replay_gain_info_new();
-
-	flac_find_float_comment(block, "replaygain_album_gain",
-				&data->replay_gain_info->tuples[REPLAY_GAIN_ALBUM].gain,
-				&found);
-	flac_find_float_comment(block, "replaygain_album_peak",
-				&data->replay_gain_info->tuples[REPLAY_GAIN_ALBUM].peak,
-				&found);
-	flac_find_float_comment(block, "replaygain_track_gain",
-				&data->replay_gain_info->tuples[REPLAY_GAIN_TRACK].gain,
-				&found);
-	flac_find_float_comment(block, "replaygain_track_peak",
-				&data->replay_gain_info->tuples[REPLAY_GAIN_TRACK].peak,
-				&found);
-
-	if (!found) {
-		replay_gain_info_free(data->replay_gain_info);
-		data->replay_gain_info = NULL;
-	}
+	if (data->tag != NULL)
+		tag_free(data->tag);
 }
 
-/**
- * Checks if the specified name matches the entry's name, and if yes,
- * returns the comment value (not null-temrinated).
- */
-static const char *
-flac_comment_value(const FLAC__StreamMetadata_VorbisComment_Entry *entry,
-		   const char *name, const char *char_tnum, size_t *length_r)
+static enum sample_format
+flac_sample_format(const FLAC__StreamMetadata_StreamInfo *si)
 {
-	size_t name_length = strlen(name);
-	size_t char_tnum_length = 0;
-	const char *comment = (const char*)entry->entry;
+	switch (si->bits_per_sample) {
+	case 8:
+		return SAMPLE_FORMAT_S8;
 
-	if (entry->length <= name_length ||
-	    g_ascii_strncasecmp(comment, name, name_length) != 0)
-		return NULL;
+	case 16:
+		return SAMPLE_FORMAT_S16;
 
-	if (char_tnum != NULL) {
-		char_tnum_length = strlen(char_tnum);
-		if (entry->length > name_length + char_tnum_length + 2 &&
-		    comment[name_length] == '[' &&
-		    g_ascii_strncasecmp(comment + name_length + 1,
-					char_tnum, char_tnum_length) == 0 &&
-		    comment[name_length + char_tnum_length + 1] == ']')
-			name_length = name_length + char_tnum_length + 2;
-		else if (entry->length > name_length + char_tnum_length &&
-			 g_ascii_strncasecmp(comment + name_length,
-					     char_tnum, char_tnum_length) == 0)
-			name_length = name_length + char_tnum_length;
-	}
+	case 24:
+		return SAMPLE_FORMAT_S24_P32;
 
-	if (comment[name_length] == '=') {
-		*length_r = entry->length - name_length - 1;
-		return comment + name_length + 1;
-	}
+	case 32:
+		return SAMPLE_FORMAT_S32;
 
-	return NULL;
+	default:
+		return SAMPLE_FORMAT_UNDEFINED;
+	}
 }
 
-/**
- * Check if the comment's name equals the passed name, and if so, copy
- * the comment value into the tag.
- */
-static bool
-flac_copy_comment(struct tag *tag,
-		  const FLAC__StreamMetadata_VorbisComment_Entry *entry,
-		  const char *name, enum tag_type tag_type,
-		  const char *char_tnum)
+bool
+flac_data_get_audio_format(struct flac_data *data,
+			   struct audio_format *audio_format)
 {
-	const char *value;
-	size_t value_length;
+	GError *error = NULL;
 
-	value = flac_comment_value(entry, name, char_tnum, &value_length);
-	if (value != NULL) {
-		tag_add_item_n(tag, tag_type, value, value_length);
-		return true;
+	if (!data->have_stream_info) {
+		g_warning("no STREAMINFO packet found");
+		return false;
 	}
 
-	return false;
-}
-
-/* tracknumber is used in VCs, MPD uses "track" ..., all the other
- * tag names match */
-static const char *VORBIS_COMMENT_TRACK_KEY = "tracknumber";
-static const char *VORBIS_COMMENT_DISC_KEY = "discnumber";
+	data->sample_format = flac_sample_format(&data->stream_info);
 
-static void
-flac_parse_comment(struct tag *tag, const char *char_tnum,
-		   const FLAC__StreamMetadata_VorbisComment_Entry *entry)
-{
-	assert(tag != NULL);
-
-	if (flac_copy_comment(tag, entry, VORBIS_COMMENT_TRACK_KEY,
-			      TAG_ITEM_TRACK, char_tnum) ||
-	    flac_copy_comment(tag, entry, VORBIS_COMMENT_DISC_KEY,
-			      TAG_ITEM_DISC, char_tnum) ||
-	    flac_copy_comment(tag, entry, "album artist",
-			      TAG_ITEM_ALBUM_ARTIST, char_tnum))
-		return;
+	if (!audio_format_init_checked(audio_format,
+				       data->stream_info.sample_rate,
+				       data->sample_format,
+				       data->stream_info.channels, &error)) {
+		g_warning("%s", error->message);
+		g_error_free(error);
+		return false;
+	}
 
-	for (unsigned i = 0; i < TAG_NUM_OF_ITEM_TYPES; ++i)
-		if (flac_copy_comment(tag, entry,
-				      tag_item_names[i], i, char_tnum))
-			return;
-}
+	data->frame_size = audio_format_frame_size(audio_format);
 
-void
-flac_vorbis_comments_to_tag(struct tag *tag, const char *char_tnum,
-			    const FLAC__StreamMetadata *block)
-{
-	FLAC__StreamMetadata_VorbisComment_Entry *comments =
-		block->data.vorbis_comment.comments;
-
-	for (unsigned i = block->data.vorbis_comment.num_comments; i > 0; --i)
-		flac_parse_comment(tag, char_tnum, comments++);
+	return true;
 }
 
 void flac_metadata_common_cb(const FLAC__StreamMetadata * block,
 			     struct flac_data *data)
 {
-	const FLAC__StreamMetadata_StreamInfo *si = &(block->data.stream_info);
-
 	switch (block->type) {
 	case FLAC__METADATA_TYPE_STREAMINFO:
-		data->audio_format.bits = (int8_t)si->bits_per_sample;
-		data->audio_format.sample_rate = si->sample_rate;
-		data->audio_format.channels = (int8_t)si->channels;
-		data->total_time = ((float)si->total_samples) / (si->sample_rate);
+		data->stream_info = block->data.stream_info;
+		data->have_stream_info = true;
 		break;
+
 	case FLAC__METADATA_TYPE_VORBIS_COMMENT:
-		flac_parse_replay_gain(block, data);
+		if (data->replay_gain_info)
+			replay_gain_info_free(data->replay_gain_info);
+		data->replay_gain_info = flac_parse_replay_gain(block);
 
 		if (data->tag != NULL)
-			flac_vorbis_comments_to_tag(data->tag, NULL, block);
+			flac_vorbis_comments_to_tag(data->tag, NULL,
+						    &block->data.vorbis_comment);
 
 	default:
 		break;
@@ -239,133 +153,43 @@ void flac_error_common_cb(const char *plugin,
 	}
 }
 
-static void flac_convert_stereo16(int16_t *dest,
-				  const FLAC__int32 * const buf[],
-				  unsigned int position, unsigned int end)
-{
-	for (; position < end; ++position) {
-		*dest++ = buf[0][position];
-		*dest++ = buf[1][position];
-	}
-}
-
-static void
-flac_convert_16(int16_t *dest,
-		unsigned int num_channels,
-		const FLAC__int32 * const buf[],
-		unsigned int position, unsigned int end)
-{
-	unsigned int c_chan;
-
-	for (; position < end; ++position)
-		for (c_chan = 0; c_chan < num_channels; c_chan++)
-			*dest++ = buf[c_chan][position];
-}
-
-/**
- * Note: this function also handles 24 bit files!
- */
-static void
-flac_convert_32(int32_t *dest,
-		unsigned int num_channels,
-		const FLAC__int32 * const buf[],
-		unsigned int position, unsigned int end)
-{
-	unsigned int c_chan;
-
-	for (; position < end; ++position)
-		for (c_chan = 0; c_chan < num_channels; c_chan++)
-			*dest++ = buf[c_chan][position];
-}
-
-static void
-flac_convert_8(int8_t *dest,
-	       unsigned int num_channels,
-	       const FLAC__int32 * const buf[],
-	       unsigned int position, unsigned int end)
+FLAC__StreamDecoderWriteStatus
+flac_common_write(struct flac_data *data, const FLAC__Frame * frame,
+		  const FLAC__int32 *const buf[],
+		  FLAC__uint64 nbytes)
 {
-	unsigned int c_chan;
-
-	for (; position < end; ++position)
-		for (c_chan = 0; c_chan < num_channels; c_chan++)
-			*dest++ = buf[c_chan][position];
-}
+	enum decoder_command cmd;
+	size_t buffer_size = frame->header.blocksize * data->frame_size;
+	void *buffer;
+	unsigned bit_rate;
 
-static void flac_convert(unsigned char *dest,
-			 unsigned int num_channels,
-			 unsigned int bytes_per_sample,
-			 const FLAC__int32 * const buf[],
-			 unsigned int position, unsigned int end)
-{
-	switch (bytes_per_sample) {
-	case 2:
-		if (num_channels == 2)
-			flac_convert_stereo16((int16_t*)dest, buf,
-					      position, end);
-		else
-			flac_convert_16((int16_t*)dest, num_channels, buf,
-					position, end);
-		break;
+	buffer = pcm_buffer_get(&data->buffer, buffer_size);
 
-	case 4:
-		flac_convert_32((int32_t*)dest, num_channels, buf,
-				position, end);
-		break;
+	flac_convert(buffer, frame->header.channels,
+		     data->sample_format, buf,
+		     0, frame->header.blocksize);
 
-	case 1:
-		flac_convert_8((int8_t*)dest, num_channels, buf,
-			       position, end);
+	if (nbytes > 0)
+		bit_rate = nbytes * 8 * frame->header.sample_rate /
+			(1000 * frame->header.blocksize);
+	else
+		bit_rate = 0;
+
+	cmd = decoder_data(data->decoder, data->input_stream,
+			   buffer, buffer_size,
+			   bit_rate,
+			   data->replay_gain_info);
+	data->next_frame += frame->header.blocksize;
+	switch (cmd) {
+	case DECODE_COMMAND_NONE:
+	case DECODE_COMMAND_START:
 		break;
-	}
-}
-
-FLAC__StreamDecoderWriteStatus
-flac_common_write(struct flac_data *data, const FLAC__Frame * frame,
-		  const FLAC__int32 *const buf[])
-{
-	unsigned int c_samp;
-	const unsigned int num_channels = frame->header.channels;
-	const unsigned int bytes_per_sample =
-		audio_format_sample_size(&data->audio_format);
-	const unsigned int bytes_per_channel =
-		bytes_per_sample * frame->header.channels;
-	const unsigned int max_samples = FLAC_CHUNK_SIZE / bytes_per_channel;
-	unsigned int num_samples;
-	enum decoder_command cmd;
 
-	if (bytes_per_sample != 1 && bytes_per_sample != 2 &&
-	    bytes_per_sample != 4)
-		/* exotic unsupported bit rate */
+	case DECODE_COMMAND_STOP:
 		return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
 
-	for (c_samp = 0; c_samp < frame->header.blocksize;
-	     c_samp += num_samples) {
-		num_samples = frame->header.blocksize - c_samp;
-		if (num_samples > max_samples)
-			num_samples = max_samples;
-
-		flac_convert(data->chunk,
-			     num_channels, bytes_per_sample, buf,
-			     c_samp, c_samp + num_samples);
-
-		cmd = decoder_data(data->decoder, data->input_stream,
-				   data->chunk,
-				   num_samples * bytes_per_channel,
-				   data->time, data->bit_rate,
-				   data->replay_gain_info);
-		switch (cmd) {
-		case DECODE_COMMAND_NONE:
-		case DECODE_COMMAND_START:
-			break;
-
-		case DECODE_COMMAND_STOP:
-			return
-				FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
-
-		case DECODE_COMMAND_SEEK:
-			return
-				FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
-		}
+	case DECODE_COMMAND_SEEK:
+		return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
 	}
 
 	return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;