Skip to content

M
miniaudio
Commit eabc7768 authored by David Reid's avatar David Reid
Browse files
Options

Fix erroneous output with the resampler when in/out rates are the same.

parent 4c49c495
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 8 deletions
miniaudio.h
View file @ eabc7768
...@@ -51322,8 +51322,10 @@ static ma_result ma_linear_resampler_process_pcm_frames_s16_downsample(ma_linear ...@@ -51322,8 +51322,10 @@ static ma_result ma_linear_resampler_process_pcm_frames_s16_downsample(ma_linear
} }
} }
/* Filter. */ /* Filter. Do not apply filtering if sample rates are the same or else you'll get dangerous glitching. */
ma_lpf_process_pcm_frame_s16(&pResampler->lpf, pResampler->x1.s16, pResampler->x1.s16); if (pResampler->config.sampleRateIn != pResampler->config.sampleRateOut) {
ma_lpf_process_pcm_frame_s16(&pResampler->lpf, pResampler->x1.s16, pResampler->x1.s16);
}
framesProcessedIn += 1; framesProcessedIn += 1;
pResampler->inTimeInt -= 1; pResampler->inTimeInt -= 1;
...@@ -51409,8 +51411,10 @@ static ma_result ma_linear_resampler_process_pcm_frames_s16_upsample(ma_linear_r ...@@ -51409,8 +51411,10 @@ static ma_result ma_linear_resampler_process_pcm_frames_s16_upsample(ma_linear_r
MA_ASSERT(pResampler->inTimeInt == 0); MA_ASSERT(pResampler->inTimeInt == 0);
ma_linear_resampler_interpolate_frame_s16(pResampler, pFramesOutS16); ma_linear_resampler_interpolate_frame_s16(pResampler, pFramesOutS16);
/* Filter. */ /* Filter. Do not apply filtering if sample rates are the same or else you'll get dangerous glitching. */
ma_lpf_process_pcm_frame_s16(&pResampler->lpf, pFramesOutS16, pFramesOutS16); if (pResampler->config.sampleRateIn != pResampler->config.sampleRateOut) {
ma_lpf_process_pcm_frame_s16(&pResampler->lpf, pFramesOutS16, pFramesOutS16);
}
pFramesOutS16 += pResampler->config.channels; pFramesOutS16 += pResampler->config.channels;
} }
...@@ -51482,8 +51486,10 @@ static ma_result ma_linear_resampler_process_pcm_frames_f32_downsample(ma_linear ...@@ -51482,8 +51486,10 @@ static ma_result ma_linear_resampler_process_pcm_frames_f32_downsample(ma_linear
} }
} }
/* Filter. */ /* Filter. Do not apply filtering if sample rates are the same or else you'll get dangerous glitching. */
ma_lpf_process_pcm_frame_f32(&pResampler->lpf, pResampler->x1.f32, pResampler->x1.f32); if (pResampler->config.sampleRateIn != pResampler->config.sampleRateOut) {
ma_lpf_process_pcm_frame_f32(&pResampler->lpf, pResampler->x1.f32, pResampler->x1.f32);
}
framesProcessedIn += 1; framesProcessedIn += 1;
pResampler->inTimeInt -= 1; pResampler->inTimeInt -= 1;
...@@ -51569,8 +51575,10 @@ static ma_result ma_linear_resampler_process_pcm_frames_f32_upsample(ma_linear_r ...@@ -51569,8 +51575,10 @@ static ma_result ma_linear_resampler_process_pcm_frames_f32_upsample(ma_linear_r
MA_ASSERT(pResampler->inTimeInt == 0); MA_ASSERT(pResampler->inTimeInt == 0);
ma_linear_resampler_interpolate_frame_f32(pResampler, pFramesOutF32); ma_linear_resampler_interpolate_frame_f32(pResampler, pFramesOutF32);
/* Filter. */ /* Filter. Do not apply filtering if sample rates are the same or else you'll get dangerous glitching. */
ma_lpf_process_pcm_frame_f32(&pResampler->lpf, pFramesOutF32, pFramesOutF32); if (pResampler->config.sampleRateIn != pResampler->config.sampleRateOut) {
ma_lpf_process_pcm_frame_f32(&pResampler->lpf, pFramesOutF32, pFramesOutF32);
}
pFramesOutF32 += pResampler->config.channels; pFramesOutF32 += pResampler->config.channels;
} }
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