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

pcm_resample_fallback: corrected the sample calculation 

Due to rounding errors, it was possible that the fallback resampler
returned partial frames.
This commit is contained in:
Max Kellermann 2009-01-16 18:52:01 +01:00
parent 285a741b27
commit 953b258e5e
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -29,6 +29,7 @@ MPD 0.14.1 - not yet released
- honour http_proxy_* config directives
- fix assertion failure on "connection refused"
- fix assertion failure with empty HTTP responses
* corrected the sample calculation in the fallback resampler
* log: automatically append newline
* fix setenv() conflict on Solaris
* configure.ac: check for pkg-config before using it

14
src/pcm_resample_fallback.c
View File

@ -37,9 +37,10 @@ pcm_resample_16(struct pcm_resample_state *state,
size_t *dest_size_r)
{
unsigned src_pos, dest_pos = 0;
unsigned src_samples = src_size / sizeof(*src_buffer);
unsigned dest_samples =
(src_samples * dest_rate + src_rate - 1) / src_rate;
unsigned src_frames = src_size / channels / sizeof(*src_buffer);
unsigned dest_frames =
(src_frames * dest_rate + src_rate - 1) / src_rate;
unsigned dest_samples = dest_frames * channels;
size_t dest_size = dest_samples * sizeof(*src_buffer);
int16_t *dest_buffer = pcm_buffer_get(&state->buffer, dest_size);
@ -77,9 +78,10 @@ pcm_resample_24(struct pcm_resample_state *state,
size_t *dest_size_r)
{
unsigned src_pos, dest_pos = 0;
unsigned src_samples = src_size / sizeof(*src_buffer);
unsigned dest_samples =
(src_samples * dest_rate + src_rate - 1) / src_rate;
unsigned src_frames = src_size / channels / sizeof(*src_buffer);
unsigned dest_frames =
(src_frames * dest_rate + src_rate - 1) / src_rate;
unsigned dest_samples = dest_frames * channels;
size_t dest_size = dest_samples * sizeof(*src_buffer);
int32_t *dest_buffer = pcm_buffer_get(&state->buffer, dest_size);