Update of /cvsroot/alsa/alsa-lib/src/pcm
In directory sc8-pr-cvs1:/tmp/cvs-serv514
Modified Files:
pcm_rate.c
Log Message:
corrections in the last changes.
samples are exapnded properly in linear interpolation now.
Index: pcm_rate.c
===================================================================
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm_rate.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- pcm_rate.c 9 Sep 2003 19:04:22 -0000 1.73
+++ pcm_rate.c 10 Sep 2003 11:02:57 -0000 1.74
@@ -126,29 +126,25 @@
dst_step = snd_pcm_channel_area_step(dst_area);
src_frames1 = 0;
dst_frames1 = 0;
- if (states->init) {
+ if (! states->init) {
sample = initial_sample(src, getidx);
- src_frames1++;
- states->init = 0;
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) {
- pos += DIV;
- if (pos >= get_threshold) {
+ while (dst_frames1 < dst_frames) {
+ if (states->init == 2) {
old_sample = new_sample;
- pos -= get_threshold;
goto *get;
#define GET16_END after_get
#include "plugin_ops.h"
#undef GET16_END
after_get:
new_sample = sample;
- src += src_step;
- src_frames1++;
+ states->init = 1;
}
sample = (((int64_t)old_sample * (int64_t)(get_threshold -
pos)) + ((int64_t)new_sample * pos)) / get_threshold;
- put_sample:
goto *put;
#define PUT16_END after_put
#include "plugin_ops.h"
@@ -156,7 +152,16 @@
after_put:
dst += dst_step;
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->new_sample = new_sample;
states->pos = pos;
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
