flac: moved code from flacWrite() to _flac_common.c

There is still a lot of duplicated code in flac_plugin.c and
oggflac_plugin.c.  Move code from flac_plugin.c to _flac_common.c, and
use the new function flac_common_write() also in oggflac_plugin.c,
porting lots of optimizations over to it.

1 files changed, 91 insertions, 0 deletions

diff --git a/src/inputPlugins/_flac_common.c b/src/inputPlugins/_flac_common.c
index e0c251489..5a98e63bc 100644
--- a/src/inputPlugins/_flac_common.c
+++ b/src/inputPlugins/_flac_common.c
@@ -196,4 +196,95 @@ void flac_error_common_cb(const char *plugin,
 	}
 }
 
+/* keep this inlined, this is just macro but prettier :) */
+static inline int flacSendChunk(FlacData * data)
+{
+	if (decoder_data(data->decoder, data->inStream,
+			 1, data->chunk,
+			 data->chunk_length, data->time,
+			 data->bitRate,
+			 data->replayGainInfo) == DECODE_COMMAND_STOP)
+		return -1;
+
+	return 0;
+}
+
+static void flac_convert_stereo16(unsigned char *dest,
+				  const FLAC__int32 * const buf[],
+				  unsigned int position, unsigned int end)
+{
+	for (; position < end; ++position) {
+		*(uint16_t*)dest = buf[0][position];
+		dest += 2;
+		*(uint16_t*)dest = buf[1][position];
+		dest += 2;
+	}
+}
+
+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)
+{
+	unsigned int c_chan, i;
+	FLAC__uint16 u16;
+	unsigned char *uc;
+
+	for (; position < end; ++position) {
+		for (c_chan = 0; c_chan < num_channels; c_chan++) {
+			u16 = buf[c_chan][position];
+			uc = (unsigned char *)&u16;
+			for (i = 0; i < bytes_per_sample; i++) {
+				*dest++ = *uc++;
+			}
+		}
+	}
+}
+
+FLAC__StreamDecoderWriteStatus
+flac_common_write(FlacData *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;
+
+	assert(data->audio_format.bits > 0);
+
+	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;
+
+		if (num_channels == 2 && bytes_per_sample == 2)
+			flac_convert_stereo16(data->chunk,
+					      buf, c_samp,
+					      c_samp + num_samples);
+		else
+			flac_convert(data->chunk,
+				     num_channels, bytes_per_sample, buf,
+				     c_samp, c_samp + num_samples);
+		data->chunk_length = num_samples * bytes_per_channel;
+
+		if (flacSendChunk(data) < 0) {
+			return
+				FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
+		}
+		data->chunk_length = 0;
+		if (decoder_get_command(data->decoder) == DECODE_COMMAND_SEEK) {
+			return
+				FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
+		}
+	}
+
+	return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
+}
+
 #endif /* HAVE_FLAC || HAVE_OGGFLAC */