oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

decoder/flac: moved code to flac_pcm.c

Browse Source
This commit is contained in:
Max Kellermann
2009-11-11 07:59:22 +01:00
parent f6e7dffada
commit d605329f83
4 changed files with 135 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
src/decoder/_flac_common.c
View File

@@ -23,6 +23,7 @@
#include "_flac_common.h"
#include "flac_metadata.h"
#include "flac_pcm.h"
#include <glib.h>
@@ -102,87 +103,6 @@ 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)
{
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(void *dest,
unsigned int num_channels, unsigned sample_format,
const FLAC__int32 *const buf[],
unsigned int position, unsigned int end)
{
switch (sample_format) {
case 16:
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;
case 24:
case 32:
flac_convert_32((int32_t*)dest, num_channels, buf,
position, end);
break;
case 8:
flac_convert_8((int8_t*)dest, num_channels, buf,
position, end);
break;
}
}
FLAC__StreamDecoderWriteStatus
flac_common_write(struct flac_data *data, const FLAC__Frame * frame,
const FLAC__int32 *const buf[])