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

pcm_resample: don't hard-code sample size 

Use sizeof(sample) instead of hard-coding "2".  Although we're in 16
bit right now, this will make code sharing easier when we support
other sample sizes.
This commit is contained in:
Max Kellermann 2008-10-23 20:01:08 +02:00
parent 6b1c54ef96
commit b13d656f81
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pcm_resample_fallback.c
View File

@ -30,7 +30,7 @@ pcm_resample_16(uint8_t channels,
mpd_unused struct pcm_resample_state *state)
{
unsigned src_pos, dest_pos = 0;
unsigned dest_samples = dest_size / 2;
unsigned dest_samples = dest_size / sizeof(*dest_buffer);
int16_t lsample, rsample;
switch (channels) {

6
src/pcm_resample_libsamplerate.c
View File

@ -108,14 +108,14 @@ pcm_resample_16(uint8_t channels,
if (state->error)
return 0;
data->input_frames = src_size / 2 / channels;
data->input_frames = src_size / sizeof(*src_buffer) / channels;
data_in_size = data->input_frames * sizeof(float) * channels;
if (data_in_size > state->data_in_size) {
state->data_in_size = data_in_size;
data->data_in = xrealloc(data->data_in, data_in_size);
}
data->output_frames = dest_size / 2 / channels;
data->output_frames = dest_size / sizeof(*dest_buffer) / channels;
data_out_size = data->output_frames * sizeof(float) * channels;
if (data_out_size > state->data_out_size) {
state->data_out_size = data_out_size;
@ -136,5 +136,5 @@ pcm_resample_16(uint8_t channels,
src_float_to_short_array(data->data_out, dest_buffer,
data->output_frames_gen * channels);
return data->output_frames_gen * 2 * channels;
return data->output_frames_gen * sizeof(*dest_buffer) * channels;
}