1 files changed, 17 insertions, 21 deletions

diff --git a/src/decoder/_flac_common.c b/src/decoder/_flac_common.c
index e096750f3..2eaeb2449 100644
--- a/src/decoder/_flac_common.c
+++ b/src/decoder/_flac_common.c
@@ -170,11 +170,11 @@ flac_parse_comment(struct tag *tag, const char *char_tnum,
 	assert(tag != NULL);
 
 	if (flac_copy_comment(tag, entry, VORBIS_COMMENT_TRACK_KEY,
-			      TAG_ITEM_TRACK, char_tnum) ||
+			      TAG_TRACK, char_tnum) ||
 	    flac_copy_comment(tag, entry, VORBIS_COMMENT_DISC_KEY,
-			      TAG_ITEM_DISC, char_tnum) ||
+			      TAG_DISC, char_tnum) ||
 	    flac_copy_comment(tag, entry, "album artist",
-			      TAG_ITEM_ALBUM_ARTIST, char_tnum))
+			      TAG_ALBUM_ARTIST, char_tnum))
 		return;
 
 	for (unsigned i = 0; i < TAG_NUM_OF_ITEM_TYPES; ++i)
@@ -201,9 +201,8 @@ void flac_metadata_common_cb(const FLAC__StreamMetadata * block,
 
 	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;
+		audio_format_init(&data->audio_format, si->sample_rate,
+				  si->bits_per_sample, si->channels);
 		data->total_time = ((float)si->total_samples) / (si->sample_rate);
 		break;
 	case FLAC__METADATA_TYPE_VORBIS_COMMENT:
@@ -291,14 +290,14 @@ flac_convert_8(int8_t *dest,
 			*dest++ = buf[c_chan][position];
 }
 
-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)
+static void
+flac_convert(void *dest,
+	     unsigned int num_channels, unsigned sample_format,
+	     const FLAC__int32 *const buf[],
+	     unsigned int position, unsigned int end)
 {
-	switch (bytes_per_sample) {
-	case 2:
+	switch (sample_format) {
+	case 16:
 		if (num_channels == 2)
 			flac_convert_stereo16((int16_t*)dest, buf,
 					      position, end);
@@ -307,12 +306,13 @@ static void flac_convert(unsigned char *dest,
 					position, end);
 		break;
 
-	case 4:
+	case 24:
+	case 32:
 		flac_convert_32((int32_t*)dest, num_channels, buf,
 				position, end);
 		break;
 
-	case 1:
+	case 8:
 		flac_convert_8((int8_t*)dest, num_channels, buf,
 			       position, end);
 		break;
@@ -324,6 +324,7 @@ flac_common_write(struct flac_data *data, const FLAC__Frame * frame,
 		  const FLAC__int32 *const buf[])
 {
 	unsigned int c_samp;
+	const unsigned sample_format = data->audio_format.bits;
 	const unsigned int num_channels = frame->header.channels;
 	const unsigned int bytes_per_sample =
 		audio_format_sample_size(&data->audio_format);
@@ -333,11 +334,6 @@ flac_common_write(struct flac_data *data, const FLAC__Frame * frame,
 	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 */
-		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;
@@ -345,7 +341,7 @@ flac_common_write(struct flac_data *data, const FLAC__Frame * frame,
 			num_samples = max_samples;
 
 		flac_convert(data->chunk,
-			     num_channels, bytes_per_sample, buf,
+			     num_channels, sample_format, buf,
 			     c_samp, c_samp + num_samples);
 
 		cmd = decoder_data(data->decoder, data->input_stream,