Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2026-01-12 15:45:54 +01:00
Code Issues Releases Wiki Activity

Steve Daulton's patch to fix bug 410

Browse Source
This commit is contained in:
v.audacity
2012-02-14 00:25:35 +00:00
parent 0d08f11504
commit c25514cb03
1 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib-src/libnyquist/nyquist/nyqsrc/avg.c
View File

@@ -223,6 +223,16 @@ sound_type snd_make_avg(sound_type s, long blocksize, long stepsize, long op)
time_type t0 = s->t0; time_type t0 = s->t0;
time_type t0_min = t0; time_type t0_min = t0;
/* ASSUME 32-BIT INTS */
/* Later, we will compute togo, the number of input samples to process
for one block of output. We read stepsize of input for each sample
of output, so the total is stepsize * max_sample_block_len, but
this could be very big and cause integer overflow, so here, we
prevent the overflow by limiting stepsize */
if (stepsize > (0x7FFFFFFF / max_sample_block_len)) {
xlerror("In SND-AVG, stepsize is too big", s_unbound);
}
falloc_generic(susp, avg_susp_node, "snd_make_avg"); falloc_generic(susp, avg_susp_node, "snd_make_avg");
susp->susp.fetch = avg_s_fetch; susp->susp.fetch = avg_s_fetch;
susp->terminate_cnt = UNKNOWN; susp->terminate_cnt = UNKNOWN;
@@ -233,9 +243,9 @@ sound_type snd_make_avg(sound_type s, long blocksize, long stepsize, long op)
/* how many samples to toss before t0: */ /* how many samples to toss before t0: */
susp->susp.toss_cnt = ROUND((t0 - t0_min) * sr); susp->susp.toss_cnt = ROUND((t0 - t0_min) * sr);
if (susp->susp.toss_cnt > 0) { if (susp->susp.toss_cnt > 0) {
susp->susp.keep_fetch = susp->susp.fetch; susp->susp.keep_fetch = susp->susp.fetch;
susp->susp.fetch = avg_toss_fetch; susp->susp.fetch = avg_toss_fetch;
t0 = t0_min; t0 = t0_min;
} }
/* initialize susp state */ /* initialize susp state */
@@ -252,11 +262,17 @@ sound_type snd_make_avg(sound_type s, long blocksize, long stepsize, long op)
susp->s_cnt = 0; susp->s_cnt = 0;
susp->blocksize = blocksize; susp->blocksize = blocksize;
susp->stepsize = stepsize; susp->stepsize = stepsize;
/* We need at least blocksize samples in buffer, but if stepsize > blocksize, /* We need at least blocksize samples in buffer,
but if stepsize > blocksize,
it is convenient to put stepsize samples in buffer. This allows us to it is convenient to put stepsize samples in buffer. This allows us to
step ahead by stepsize samples just by flushing the buffer. */ step ahead by stepsize samples just by flushing the buffer. */
buffersize = MAX(blocksize, stepsize); buffersize = MAX(blocksize, stepsize);
susp->buffer = (sample_type *) malloc(buffersize * sizeof(sample_type)); susp->buffer = (sample_type *) malloc(buffersize * sizeof(sample_type));
if (!susp->buffer) {
sound_unref(susp->s);
ffree_generic(susp, sizeof(avg_susp_node), "avg_free");
xlerror("memory allocation failed in SND-AVG", s_unbound);
}
susp->fillptr = susp->buffer; susp->fillptr = susp->buffer;
susp->endptr = susp->buffer + buffersize; susp->endptr = susp->buffer + buffersize;
susp->process_block = average_block; susp->process_block = average_block;