Commit 19971be3 authored by Max Kellermann's avatar Max Kellermann

flac: added special functions for 8 and 32 bit

Same optimization for 8 and 32 bit files, like the previous patch for 16 bit. Along the way, this patch adds 24 bit FLAC support!
parent 8c2bde70
...@@ -232,6 +232,35 @@ flac_convert_16(int16_t *dest, ...@@ -232,6 +232,35 @@ flac_convert_16(int16_t *dest,
*dest++ = buf[c_chan][position]; *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(unsigned char *dest, static void flac_convert(unsigned char *dest,
unsigned int num_channels, unsigned int num_channels,
unsigned int bytes_per_sample, unsigned int bytes_per_sample,
...@@ -282,6 +311,14 @@ flac_common_write(FlacData *data, const FLAC__Frame * frame, ...@@ -282,6 +311,14 @@ flac_common_write(FlacData *data, const FLAC__Frame * frame,
flac_convert_16((int16_t*)data->chunk, flac_convert_16((int16_t*)data->chunk,
num_channels, buf, c_samp, num_channels, buf, c_samp,
c_samp + num_samples); c_samp + num_samples);
else if (bytes_per_sample == 4)
flac_convert_32((int32_t*)data->chunk,
num_channels, buf, c_samp,
c_samp + num_samples);
else if (bytes_per_sample == 1)
flac_convert_8((int8_t*)data->chunk,
num_channels, buf, c_samp,
c_samp + num_samples);
else else
flac_convert(data->chunk, flac_convert(data->chunk,
num_channels, bytes_per_sample, buf, num_channels, bytes_per_sample, buf,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment