diff options
| author | Max Kellermann <max@duempel.org> | 2008-09-23 23:59:55 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2008-09-23 23:59:55 +0200 |
| commit | 8c2bde70b0e845b11693e487ea52a74d83cd1639 (patch) | |
| tree | a52b8e94184f337b86fd21f042ef6149a6e52df0 /src/inputPlugins/_flac_common.c | |
| parent | 7486c1508898d1dd135effd3c7430552583a7737 (diff) | |
| download | mpd-8c2bde70b0e845b11693e487ea52a74d83cd1639.tar.gz mpd-8c2bde70b0e845b11693e487ea52a74d83cd1639.tar.xz mpd-8c2bde70b0e845b11693e487ea52a74d83cd1639.zip | |
flac: added optimized converter for 16 bit
flac_convert_16() runs a lot faster than the generic (and quite buggy)
function flac_convert(). flac_convert_16() is only used for
non-stereo files, since there is already flac_convert_stereo16().
Diffstat (limited to 'src/inputPlugins/_flac_common.c')
| -rw-r--r-- | src/inputPlugins/_flac_common.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/src/inputPlugins/_flac_common.c b/src/inputPlugins/_flac_common.c index 427956c39..23c31a829 100644 --- a/src/inputPlugins/_flac_common.c +++ b/src/inputPlugins/_flac_common.c @@ -219,6 +219,19 @@ static void flac_convert_stereo16(int16_t *dest, } } +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]; +} + static void flac_convert(unsigned char *dest, unsigned int num_channels, unsigned int bytes_per_sample, @@ -265,6 +278,10 @@ flac_common_write(FlacData *data, const FLAC__Frame * frame, flac_convert_stereo16((int16_t*)data->chunk, buf, c_samp, c_samp + num_samples); + else if (bytes_per_sample == 2) + flac_convert_16((int16_t*)data->chunk, + num_channels, buf, c_samp, + c_samp + num_samples); else flac_convert(data->chunk, num_channels, bytes_per_sample, buf, |