mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-12-17 08:56:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

corrections in the last changes.

Browse source 
samples are exapnded properly in linear interpolation now.
This commit is contained in:
Takashi Iwai 2003-09-10 11:02:57 +00:00
parent 60585e25fc
commit 1adfe9fd0d
1 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/pcm/pcm_rate.c
View file

@ -126,29 +126,25 @@ static snd_pcm_uframes_t snd_pcm_rate_expand(const snd_pcm_channel_area_t *dst_a
dst_step = snd_pcm_channel_area_step(dst_area); dst_step = snd_pcm_channel_area_step(dst_area);
src_frames1 = 0; src_frames1 = 0;
dst_frames1 = 0; dst_frames1 = 0;
if (states->init) { if (! states->init) {
sample = initial_sample(src, getidx); sample = initial_sample(src, getidx);
src_frames1++;
states->init = 0;
old_sample = new_sample = sample; old_sample = new_sample = sample;
goto put_sample; src += src_step;
src_frames1++;
states->init = 2; /* get a new sample */
} }
while (dst_frames1 < dst_frames && src_frames1 < src_frames) { while (dst_frames1 < dst_frames) {
pos += DIV; if (states->init == 2) {
if (pos >= get_threshold) {
old_sample = new_sample; old_sample = new_sample;
pos -= get_threshold;
goto *get; goto *get;
#define GET16_END after_get #define GET16_END after_get
#include "plugin_ops.h" #include "plugin_ops.h"
#undef GET16_END #undef GET16_END
after_get: after_get:
new_sample = sample; new_sample = sample;
src += src_step; states->init = 1;
src_frames1++;
} }
sample = (((int64_t)old_sample * (int64_t)(get_threshold - pos)) + ((int64_t)new_sample * pos)) / get_threshold; sample = (((int64_t)old_sample * (int64_t)(get_threshold - pos)) + ((int64_t)new_sample * pos)) / get_threshold;
put_sample:
goto *put; goto *put;
#define PUT16_END after_put #define PUT16_END after_put
#include "plugin_ops.h" #include "plugin_ops.h"
@ -156,6 +152,15 @@ static snd_pcm_uframes_t snd_pcm_rate_expand(const snd_pcm_channel_area_t *dst_a
after_put: after_put:
dst += dst_step; dst += dst_step;
dst_frames1++; dst_frames1++;
pos += DIV;
if (pos >= get_threshold) {
pos -= get_threshold;
src += src_step;
src_frames1++;
states->init = 2; /* get a new sample */
if (src_frames1 >= src_frames)
break;
}
} }
states->old_sample = old_sample; states->old_sample = old_sample;
states->new_sample = new_sample; states->new_sample = new_sample;