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

flac: use signed integers in flac_convert_stereo16()

Browse Source 
By mistake, I casted the sample value to uint16_t, which is wrong.
This patch simplifies the code by using a int16_t pointer instead of
casting to int16_t* every time.
This commit is contained in:
Max Kellermann 2008-09-23 23:59:54 +02:00
parent 8bcbe90b25
commit 7486c15088
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/inputPlugins/_flac_common.c
View File

@ -209,15 +209,13 @@ static inline int flacSendChunk(FlacData * data)
return 0; return 0;
} }
static void flac_convert_stereo16(unsigned char *dest, static void flac_convert_stereo16(int16_t *dest,
const FLAC__int32 * const buf[], const FLAC__int32 * const buf[],
unsigned int position, unsigned int end) unsigned int position, unsigned int end)
{ {
for (; position < end; ++position) { for (; position < end; ++position) {
*(uint16_t*)dest = buf[0][position]; *dest++ = buf[0][position];
dest += 2; *dest++ = buf[1][position];
*(uint16_t*)dest = buf[1][position];
dest += 2;
} }
} }
@ -264,7 +262,7 @@ flac_common_write(FlacData *data, const FLAC__Frame * frame,
num_samples = max_samples; num_samples = max_samples;
if (num_channels == 2 && bytes_per_sample == 2) if (num_channels == 2 && bytes_per_sample == 2)
flac_convert_stereo16(data->chunk, flac_convert_stereo16((int16_t*)data->chunk,
buf, c_samp, buf, c_samp,
c_samp + num_samples); c_samp + num_samples);
else else