mirror of
https://github.com/cookiengineer/audacity
synced 2025-10-10 16:43:33 +02:00
Update Nyquist to v3.09.
This commit is contained in:
Leland Lucius
@@ -9,17 +9,27 @@
|
||||
#include "cext.h"
|
||||
#include "amosc.h"
|
||||
|
||||
void amosc_free();
|
||||
void amosc_free(snd_susp_type a_susp);
|
||||
|
||||
|
||||
typedef struct amosc_susp_struct {
|
||||
snd_susp_node susp;
|
||||
boolean started;
|
||||
long terminate_cnt;
|
||||
boolean logically_stopped;
|
||||
sound_type amod;
|
||||
long amod_cnt;
|
||||
sample_block_values_type amod_ptr;
|
||||
|
||||
/* support for interpolation of amod */
|
||||
sample_type amod_x1_sample;
|
||||
double amod_pHaSe;
|
||||
double amod_pHaSe_iNcR;
|
||||
|
||||
/* support for ramp between samples of amod */
|
||||
double output_per_amod;
|
||||
long amod_n;
|
||||
|
||||
double ph_incr;
|
||||
table_type the_table;
|
||||
sample_type *table_ptr;
|
||||
@@ -28,8 +38,9 @@ typedef struct amosc_susp_struct {
|
||||
} amosc_susp_node, *amosc_susp_type;
|
||||
|
||||
|
||||
void amosc_s_fetch(register amosc_susp_type susp, snd_list_type snd_list)
|
||||
void amosc_s_fetch(snd_susp_type a_susp, snd_list_type snd_list)
|
||||
{
|
||||
amosc_susp_type susp = (amosc_susp_type) a_susp;
|
||||
int cnt = 0; /* how many samples computed */
|
||||
int togo;
|
||||
int n;
|
||||
@@ -61,6 +72,7 @@ void amosc_s_fetch(register amosc_susp_type susp, snd_list_type snd_list)
|
||||
if (susp->terminate_cnt != UNKNOWN &&
|
||||
susp->terminate_cnt <= susp->susp.current + cnt + togo) {
|
||||
togo = susp->terminate_cnt - (susp->susp.current + cnt);
|
||||
if (togo < 0) togo = 0; /* avoids rounding errros */
|
||||
if (togo == 0) break;
|
||||
}
|
||||
|
||||
@@ -72,6 +84,7 @@ void amosc_s_fetch(register amosc_susp_type susp, snd_list_type snd_list)
|
||||
* AND cnt > 0 (we're not at the beginning of the
|
||||
* output block).
|
||||
*/
|
||||
if (to_stop < 0) to_stop = 0; /* avoids rounding errors */
|
||||
if (to_stop < togo) {
|
||||
if (to_stop == 0) {
|
||||
if (cnt) {
|
||||
@@ -97,14 +110,14 @@ void amosc_s_fetch(register amosc_susp_type susp, snd_list_type snd_list)
|
||||
amod_ptr_reg = susp->amod_ptr;
|
||||
out_ptr_reg = out_ptr;
|
||||
if (n) do { /* the inner sample computation loop */
|
||||
|
||||
long table_index = (long) phase_reg;
|
||||
double x1 = (double) (table_ptr_reg[table_index]);
|
||||
*out_ptr_reg++ = (sample_type) (x1 + (phase_reg - table_index) *
|
||||
(table_ptr_reg[table_index + 1] - x1)) * (amod_scale_reg * *amod_ptr_reg++);
|
||||
phase_reg += ph_incr_reg;
|
||||
while (phase_reg > table_len_reg) phase_reg -= table_len_reg;
|
||||
;
|
||||
{
|
||||
long table_index = (long) phase_reg;
|
||||
double x1 = (double) (table_ptr_reg[table_index]);
|
||||
*out_ptr_reg++ = (sample_type) ((x1 + (phase_reg - table_index) *
|
||||
(table_ptr_reg[table_index + 1] - x1)) * (amod_scale_reg * *amod_ptr_reg++));
|
||||
phase_reg += ph_incr_reg;
|
||||
while (phase_reg > table_len_reg) phase_reg -= table_len_reg;
|
||||
};
|
||||
} while (--n); /* inner loop */
|
||||
|
||||
susp->phase = phase_reg;
|
||||
@@ -131,11 +144,263 @@ void amosc_s_fetch(register amosc_susp_type susp, snd_list_type snd_list)
|
||||
} /* amosc_s_fetch */
|
||||
|
||||
|
||||
void amosc_toss_fetch(susp, snd_list)
|
||||
register amosc_susp_type susp;
|
||||
snd_list_type snd_list;
|
||||
void amosc_i_fetch(snd_susp_type a_susp, snd_list_type snd_list)
|
||||
{
|
||||
long final_count = susp->susp.toss_cnt;
|
||||
amosc_susp_type susp = (amosc_susp_type) a_susp;
|
||||
int cnt = 0; /* how many samples computed */
|
||||
sample_type amod_x2_sample;
|
||||
int togo;
|
||||
int n;
|
||||
sample_block_type out;
|
||||
register sample_block_values_type out_ptr;
|
||||
|
||||
register sample_block_values_type out_ptr_reg;
|
||||
|
||||
register double ph_incr_reg;
|
||||
register sample_type * table_ptr_reg;
|
||||
register double table_len_reg;
|
||||
register double phase_reg;
|
||||
register double amod_pHaSe_iNcR_rEg = susp->amod_pHaSe_iNcR;
|
||||
register double amod_pHaSe_ReG;
|
||||
register sample_type amod_x1_sample_reg;
|
||||
falloc_sample_block(out, "amosc_i_fetch");
|
||||
out_ptr = out->samples;
|
||||
snd_list->block = out;
|
||||
|
||||
/* make sure sounds are primed with first values */
|
||||
if (!susp->started) {
|
||||
susp->started = true;
|
||||
susp_check_term_log_samples(amod, amod_ptr, amod_cnt);
|
||||
susp->amod_x1_sample = susp_fetch_sample(amod, amod_ptr, amod_cnt);
|
||||
}
|
||||
|
||||
susp_check_term_log_samples(amod, amod_ptr, amod_cnt);
|
||||
amod_x2_sample = susp_current_sample(amod, amod_ptr);
|
||||
|
||||
while (cnt < max_sample_block_len) { /* outer loop */
|
||||
/* first compute how many samples to generate in inner loop: */
|
||||
/* don't overflow the output sample block: */
|
||||
togo = max_sample_block_len - cnt;
|
||||
|
||||
/* don't run past terminate time */
|
||||
if (susp->terminate_cnt != UNKNOWN &&
|
||||
susp->terminate_cnt <= susp->susp.current + cnt + togo) {
|
||||
togo = susp->terminate_cnt - (susp->susp.current + cnt);
|
||||
if (togo < 0) togo = 0; /* avoids rounding errros */
|
||||
if (togo == 0) break;
|
||||
}
|
||||
|
||||
|
||||
/* don't run past logical stop time */
|
||||
if (!susp->logically_stopped && susp->susp.log_stop_cnt != UNKNOWN) {
|
||||
int to_stop = susp->susp.log_stop_cnt - (susp->susp.current + cnt);
|
||||
/* break if to_stop == 0 (we're at the logical stop)
|
||||
* AND cnt > 0 (we're not at the beginning of the
|
||||
* output block).
|
||||
*/
|
||||
if (to_stop < 0) to_stop = 0; /* avoids rounding errors */
|
||||
if (to_stop < togo) {
|
||||
if (to_stop == 0) {
|
||||
if (cnt) {
|
||||
togo = 0;
|
||||
break;
|
||||
} else /* keep togo as is: since cnt == 0, we
|
||||
* can set the logical stop flag on this
|
||||
* output block
|
||||
*/
|
||||
susp->logically_stopped = true;
|
||||
} else /* limit togo so we can start a new
|
||||
* block at the LST
|
||||
*/
|
||||
togo = to_stop;
|
||||
}
|
||||
}
|
||||
|
||||
n = togo;
|
||||
ph_incr_reg = susp->ph_incr;
|
||||
table_ptr_reg = susp->table_ptr;
|
||||
table_len_reg = susp->table_len;
|
||||
phase_reg = susp->phase;
|
||||
amod_pHaSe_ReG = susp->amod_pHaSe;
|
||||
amod_x1_sample_reg = susp->amod_x1_sample;
|
||||
out_ptr_reg = out_ptr;
|
||||
if (n) do { /* the inner sample computation loop */
|
||||
if (amod_pHaSe_ReG >= 1.0) {
|
||||
amod_x1_sample_reg = amod_x2_sample;
|
||||
/* pick up next sample as amod_x2_sample: */
|
||||
susp->amod_ptr++;
|
||||
susp_took(amod_cnt, 1);
|
||||
amod_pHaSe_ReG -= 1.0;
|
||||
susp_check_term_log_samples_break(amod, amod_ptr, amod_cnt, amod_x2_sample);
|
||||
}
|
||||
{
|
||||
long table_index = (long) phase_reg;
|
||||
double x1 = (double) (table_ptr_reg[table_index]);
|
||||
*out_ptr_reg++ = (sample_type) ((x1 + (phase_reg - table_index) *
|
||||
(table_ptr_reg[table_index + 1] - x1)) *
|
||||
(amod_x1_sample_reg * (1 - amod_pHaSe_ReG) + amod_x2_sample * amod_pHaSe_ReG));
|
||||
phase_reg += ph_incr_reg;
|
||||
while (phase_reg > table_len_reg) phase_reg -= table_len_reg;
|
||||
};
|
||||
amod_pHaSe_ReG += amod_pHaSe_iNcR_rEg;
|
||||
} while (--n); /* inner loop */
|
||||
|
||||
togo -= n;
|
||||
susp->phase = phase_reg;
|
||||
susp->amod_pHaSe = amod_pHaSe_ReG;
|
||||
susp->amod_x1_sample = amod_x1_sample_reg;
|
||||
out_ptr += togo;
|
||||
cnt += togo;
|
||||
} /* outer loop */
|
||||
|
||||
/* test for termination */
|
||||
if (togo == 0 && cnt == 0) {
|
||||
snd_list_terminate(snd_list);
|
||||
} else {
|
||||
snd_list->block_len = cnt;
|
||||
susp->susp.current += cnt;
|
||||
}
|
||||
/* test for logical stop */
|
||||
if (susp->logically_stopped) {
|
||||
snd_list->logically_stopped = true;
|
||||
} else if (susp->susp.log_stop_cnt == susp->susp.current) {
|
||||
susp->logically_stopped = true;
|
||||
}
|
||||
} /* amosc_i_fetch */
|
||||
|
||||
|
||||
void amosc_r_fetch(snd_susp_type a_susp, snd_list_type snd_list)
|
||||
{
|
||||
amosc_susp_type susp = (amosc_susp_type) a_susp;
|
||||
int cnt = 0; /* how many samples computed */
|
||||
sample_type amod_DeLtA;
|
||||
sample_type amod_val;
|
||||
sample_type amod_x2_sample;
|
||||
int togo;
|
||||
int n;
|
||||
sample_block_type out;
|
||||
register sample_block_values_type out_ptr;
|
||||
|
||||
register sample_block_values_type out_ptr_reg;
|
||||
|
||||
register double ph_incr_reg;
|
||||
register sample_type * table_ptr_reg;
|
||||
register double table_len_reg;
|
||||
register double phase_reg;
|
||||
falloc_sample_block(out, "amosc_r_fetch");
|
||||
out_ptr = out->samples;
|
||||
snd_list->block = out;
|
||||
|
||||
/* make sure sounds are primed with first values */
|
||||
if (!susp->started) {
|
||||
susp->started = true;
|
||||
susp->amod_pHaSe = 1.0;
|
||||
}
|
||||
|
||||
susp_check_term_log_samples(amod, amod_ptr, amod_cnt);
|
||||
amod_x2_sample = susp_current_sample(amod, amod_ptr);
|
||||
|
||||
while (cnt < max_sample_block_len) { /* outer loop */
|
||||
/* first compute how many samples to generate in inner loop: */
|
||||
/* don't overflow the output sample block: */
|
||||
togo = max_sample_block_len - cnt;
|
||||
|
||||
/* grab next amod_x2_sample when phase goes past 1.0; */
|
||||
/* we use amod_n (computed below) to avoid roundoff errors: */
|
||||
if (susp->amod_n <= 0) {
|
||||
susp->amod_x1_sample = amod_x2_sample;
|
||||
susp->amod_ptr++;
|
||||
susp_took(amod_cnt, 1);
|
||||
susp->amod_pHaSe -= 1.0;
|
||||
susp_check_term_log_samples(amod, amod_ptr, amod_cnt);
|
||||
amod_x2_sample = susp_current_sample(amod, amod_ptr);
|
||||
/* amod_n gets number of samples before phase exceeds 1.0: */
|
||||
susp->amod_n = (long) ((1.0 - susp->amod_pHaSe) *
|
||||
susp->output_per_amod);
|
||||
}
|
||||
togo = min(togo, susp->amod_n);
|
||||
amod_DeLtA = (sample_type) ((amod_x2_sample - susp->amod_x1_sample) * susp->amod_pHaSe_iNcR);
|
||||
amod_val = (sample_type) (susp->amod_x1_sample * (1.0 - susp->amod_pHaSe) +
|
||||
amod_x2_sample * susp->amod_pHaSe);
|
||||
|
||||
/* don't run past terminate time */
|
||||
if (susp->terminate_cnt != UNKNOWN &&
|
||||
susp->terminate_cnt <= susp->susp.current + cnt + togo) {
|
||||
togo = susp->terminate_cnt - (susp->susp.current + cnt);
|
||||
if (togo < 0) togo = 0; /* avoids rounding errros */
|
||||
if (togo == 0) break;
|
||||
}
|
||||
|
||||
|
||||
/* don't run past logical stop time */
|
||||
if (!susp->logically_stopped && susp->susp.log_stop_cnt != UNKNOWN) {
|
||||
int to_stop = susp->susp.log_stop_cnt - (susp->susp.current + cnt);
|
||||
/* break if to_stop == 0 (we're at the logical stop)
|
||||
* AND cnt > 0 (we're not at the beginning of the
|
||||
* output block).
|
||||
*/
|
||||
if (to_stop < 0) to_stop = 0; /* avoids rounding errors */
|
||||
if (to_stop < togo) {
|
||||
if (to_stop == 0) {
|
||||
if (cnt) {
|
||||
togo = 0;
|
||||
break;
|
||||
} else /* keep togo as is: since cnt == 0, we
|
||||
* can set the logical stop flag on this
|
||||
* output block
|
||||
*/
|
||||
susp->logically_stopped = true;
|
||||
} else /* limit togo so we can start a new
|
||||
* block at the LST
|
||||
*/
|
||||
togo = to_stop;
|
||||
}
|
||||
}
|
||||
|
||||
n = togo;
|
||||
ph_incr_reg = susp->ph_incr;
|
||||
table_ptr_reg = susp->table_ptr;
|
||||
table_len_reg = susp->table_len;
|
||||
phase_reg = susp->phase;
|
||||
out_ptr_reg = out_ptr;
|
||||
if (n) do { /* the inner sample computation loop */
|
||||
{
|
||||
long table_index = (long) phase_reg;
|
||||
double x1 = (double) (table_ptr_reg[table_index]);
|
||||
*out_ptr_reg++ = (sample_type) ((x1 + (phase_reg - table_index) *
|
||||
(table_ptr_reg[table_index + 1] - x1)) * amod_val);
|
||||
phase_reg += ph_incr_reg;
|
||||
while (phase_reg > table_len_reg) phase_reg -= table_len_reg;
|
||||
};
|
||||
amod_val += amod_DeLtA;
|
||||
} while (--n); /* inner loop */
|
||||
|
||||
susp->phase = phase_reg;
|
||||
out_ptr += togo;
|
||||
susp->amod_pHaSe += togo * susp->amod_pHaSe_iNcR;
|
||||
susp->amod_n -= togo;
|
||||
cnt += togo;
|
||||
} /* outer loop */
|
||||
|
||||
/* test for termination */
|
||||
if (togo == 0 && cnt == 0) {
|
||||
snd_list_terminate(snd_list);
|
||||
} else {
|
||||
snd_list->block_len = cnt;
|
||||
susp->susp.current += cnt;
|
||||
}
|
||||
/* test for logical stop */
|
||||
if (susp->logically_stopped) {
|
||||
snd_list->logically_stopped = true;
|
||||
} else if (susp->susp.log_stop_cnt == susp->susp.current) {
|
||||
susp->logically_stopped = true;
|
||||
}
|
||||
} /* amosc_r_fetch */
|
||||
|
||||
|
||||
void amosc_toss_fetch(snd_susp_type a_susp, snd_list_type snd_list)
|
||||
{
|
||||
amosc_susp_type susp = (amosc_susp_type) a_susp;
|
||||
time_type final_time = susp->susp.t0;
|
||||
long n;
|
||||
|
||||
@@ -150,26 +415,29 @@ void amosc_toss_fetch(susp, snd_list)
|
||||
susp->amod_ptr += n;
|
||||
susp_took(amod_cnt, n);
|
||||
susp->susp.fetch = susp->susp.keep_fetch;
|
||||
(*(susp->susp.fetch))(susp, snd_list);
|
||||
(*(susp->susp.fetch))(a_susp, snd_list);
|
||||
}
|
||||
|
||||
|
||||
void amosc_mark(amosc_susp_type susp)
|
||||
void amosc_mark(snd_susp_type a_susp)
|
||||
{
|
||||
amosc_susp_type susp = (amosc_susp_type) a_susp;
|
||||
sound_xlmark(susp->amod);
|
||||
}
|
||||
|
||||
|
||||
void amosc_free(amosc_susp_type susp)
|
||||
void amosc_free(snd_susp_type a_susp)
|
||||
{
|
||||
amosc_susp_type susp = (amosc_susp_type) a_susp;
|
||||
table_unref(susp->the_table);
|
||||
sound_unref(susp->amod);
|
||||
ffree_generic(susp, sizeof(amosc_susp_node), "amosc_free");
|
||||
}
|
||||
|
||||
|
||||
void amosc_print_tree(amosc_susp_type susp, int n)
|
||||
void amosc_print_tree(snd_susp_type a_susp, int n)
|
||||
{
|
||||
amosc_susp_type susp = (amosc_susp_type) a_susp;
|
||||
indent(n);
|
||||
stdputstr("amod:");
|
||||
sound_print_tree_1(susp->amod, n);
|
||||
@@ -191,7 +459,23 @@ sound_type snd_make_amosc(sound_type input, double step, rate_type sr, double hz
|
||||
susp->table_len = susp->the_table->length;
|
||||
susp->phase = compute_phase(phase, step, (long) susp->table_len,
|
||||
input->sr, sr, hz, &susp->ph_incr);
|
||||
susp->susp.fetch = amosc_s_fetch;
|
||||
|
||||
/* make sure no sample rate is too high */
|
||||
if (amod->sr > sr) {
|
||||
sound_unref(amod);
|
||||
snd_badsr();
|
||||
}
|
||||
|
||||
/* select a susp fn based on sample rates */
|
||||
interp_desc = (interp_desc << 2) + interp_style(amod, sr);
|
||||
switch (interp_desc) {
|
||||
case INTERP_n: /* handled below */
|
||||
case INTERP_s: susp->susp.fetch = amosc_s_fetch; break;
|
||||
case INTERP_i: susp->susp.fetch = amosc_i_fetch; break;
|
||||
case INTERP_r: susp->susp.fetch = amosc_r_fetch; break;
|
||||
default: snd_badsr(); break;
|
||||
}
|
||||
|
||||
susp->terminate_cnt = UNKNOWN;
|
||||
/* handle unequal start times, if any */
|
||||
if (t0 < amod->t0) sound_prepend_zeros(amod, t0);
|
||||
@@ -200,8 +484,8 @@ sound_type snd_make_amosc(sound_type input, double step, rate_type sr, double hz
|
||||
/* how many samples to toss before t0: */
|
||||
susp->susp.toss_cnt = (long) ((t0 - t0_min) * sr + 0.5);
|
||||
if (susp->susp.toss_cnt > 0) {
|
||||
susp->susp.keep_fetch = susp->susp.fetch;
|
||||
susp->susp.fetch = amosc_toss_fetch;
|
||||
susp->susp.keep_fetch = susp->susp.fetch;
|
||||
susp->susp.fetch = amosc_toss_fetch;
|
||||
}
|
||||
|
||||
/* initialize susp state */
|
||||
@@ -213,9 +497,14 @@ sound_type snd_make_amosc(sound_type input, double step, rate_type sr, double hz
|
||||
susp->susp.name = "amosc";
|
||||
susp->logically_stopped = false;
|
||||
susp->susp.log_stop_cnt = logical_stop_cnt_cvt(amod);
|
||||
susp->started = false;
|
||||
susp->susp.current = 0;
|
||||
susp->amod = amod;
|
||||
susp->amod_cnt = 0;
|
||||
susp->amod_pHaSe = 0.0;
|
||||
susp->amod_pHaSe_iNcR = amod->sr / sr;
|
||||
susp->amod_n = 0;
|
||||
susp->output_per_amod = sr / amod->sr;
|
||||
return sound_create((snd_susp_type)susp, t0, sr, scale_factor);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user