1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-04-30 15:49:41 +02:00
Leland Lucius 15b9bb96cd Update nyquist to SVN r331 (r3.16+)
------------------------------------------------------------------------
   r331 | rbd | 2020-10-13 12:40:12 -0500 (Tue, 13 Oct 2020) | 2 lines

   Also forgot to install NyquistWords.txt

   ------------------------------------------------------------------------
   r330 | rbd | 2020-10-13 12:34:06 -0500 (Tue, 13 Oct 2020) | 2 lines

   Forgot to move nyquistman.pdf from docsrc/s2h to release

   ------------------------------------------------------------------------
   r329 | rbd | 2020-10-13 11:32:33 -0500 (Tue, 13 Oct 2020) | 2 lines

   Updated some version numbers for 3.16.

   ------------------------------------------------------------------------
   r328 | rbd | 2020-10-13 11:20:52 -0500 (Tue, 13 Oct 2020) | 2 lines

   Fixed NyquistIDE antialiasing for plot text, fix format of message.

   ------------------------------------------------------------------------
   r327 | rbd | 2020-10-12 21:01:53 -0500 (Mon, 12 Oct 2020) | 2 lines

   Fixed a couple of format problems in manual. This version of Nyquist has been tested wtih macOS, Linux, 32&64-bit Windows.

   ------------------------------------------------------------------------
   r326 | rbd | 2020-10-12 20:21:38 -0500 (Mon, 12 Oct 2020) | 1 line

   Modified WIN32 32-bit XLisp to use 64-bit FIXNUMs. This allows XLisp and Nyquist to handle big sounds even on 32-bit machines. Probably at some cost, but inner loops are mostly float and int32, and the Nyquist release is 64-bit anyway. Maybe we'll have to run some benchmarks on Audacity, which is still 32-bit on Windows.
   ------------------------------------------------------------------------
   r325 | rbd | 2020-10-12 13:16:57 -0500 (Mon, 12 Oct 2020) | 1 line

   Win64 passes bigfiletest.lsp now. This version should work on all 64-bit systems now. These changes untested on Linux and macOS.
   ------------------------------------------------------------------------
   r324 | rbd | 2020-10-11 21:31:53 -0500 (Sun, 11 Oct 2020) | 2 lines

   I couldn't free enough space on my linux box, so I adjusted the bigfiletest to write 8-bit ulaw. It's still >4GB and >4G samples. Works on Linux.

   ------------------------------------------------------------------------
   r323 | rbd | 2020-10-11 19:41:25 -0500 (Sun, 11 Oct 2020) | 2 lines

   Missing file from last commit.

   ------------------------------------------------------------------------
   r322 | rbd | 2020-10-11 19:36:08 -0500 (Sun, 11 Oct 2020) | 1 line

   Found another case where WIN64 needs int64_t instead of long for sample count.
   ------------------------------------------------------------------------
   r321 | rbd | 2020-10-11 19:33:25 -0500 (Sun, 11 Oct 2020) | 3 lines

   Fixed s-save to	handle optional	and keyword parameters (which should never have	been mixed in the first	place).	Documentation cleanup - should be final for this version.

   ------------------------------------------------------------------------
   r320 | rbd | 2020-10-11 14:44:37 -0500 (Sun, 11 Oct 2020) | 2 lines

   Fixes to handle IRCAM sound format and tests for big file io working on macOS.

   ------------------------------------------------------------------------
   r319 | rbd | 2020-10-10 21:31:58 -0500 (Sat, 10 Oct 2020) | 2 lines

   Changes for linux and to avoid compiler warnings on linux.

   ------------------------------------------------------------------------
   r318 | rbd | 2020-10-10 20:50:23 -0500 (Sat, 10 Oct 2020) | 1 line

   This is the test used for Win64 version.
   ------------------------------------------------------------------------
   r317 | rbd | 2020-10-10 20:34:34 -0500 (Sat, 10 Oct 2020) | 1 line

   This version works on Win64. Need to test changes on macOS and linux.
   ------------------------------------------------------------------------
   r316 | rbd | 2020-10-10 19:59:15 -0500 (Sat, 10 Oct 2020) | 2 lines

   PWL changes to avoid compiler warning.

   ------------------------------------------------------------------------
   r315 | rbd | 2020-10-10 19:34:04 -0500 (Sat, 10 Oct 2020) | 2 lines

   A few more changes for 64-bit sample counts on Win64

   ------------------------------------------------------------------------
   r314 | rbd | 2020-10-10 13:19:42 -0500 (Sat, 10 Oct 2020) | 2 lines

   Fixed int64_t declaration in gate.alg

   ------------------------------------------------------------------------
   r313 | rbd | 2020-10-10 12:07:40 -0500 (Sat, 10 Oct 2020) | 2 lines

   Fixes to gate for long sounds

   ------------------------------------------------------------------------
   r312 | rbd | 2020-10-10 11:47:29 -0500 (Sat, 10 Oct 2020) | 2 lines

   Fixed sound_save types for intgen

   ------------------------------------------------------------------------
   r311 | rbd | 2020-10-10 11:09:01 -0500 (Sat, 10 Oct 2020) | 2 lines

   Fixed a 64-bit sample count problem in siosc.alg

   ------------------------------------------------------------------------
   r310 | rbd | 2020-10-10 11:03:12 -0500 (Sat, 10 Oct 2020) | 2 lines

   Fixed sndmax to handle 64-bit sample counts.

   ------------------------------------------------------------------------
   r309 | rbd | 2020-10-10 10:57:04 -0500 (Sat, 10 Oct 2020) | 2 lines

   Forgot to re-translate all tran/*.alg files with fix for int64 cast to int32. This version compiles on macOS and ready for test on Win64.

   ------------------------------------------------------------------------
   r308 | rbd | 2020-10-10 10:16:05 -0500 (Sat, 10 Oct 2020) | 2 lines

   Everything seems to compile and run on macOS now. Moving changes to Windows for test.

   ------------------------------------------------------------------------
   r307 | rbd | 2020-10-10 09:23:45 -0500 (Sat, 10 Oct 2020) | 1 line

   Added casts to avoid compiler warnings and to review changes to support 64-bit sample counts on Windows. Still not complete, and waiting to regenerate and compile tran directory code after updates to translation code that will insert more casts.
   ------------------------------------------------------------------------
   r306 | rbd | 2020-10-09 21:55:15 -0500 (Fri, 09 Oct 2020) | 2 lines

   Rebuilt seqfnint.c from header files.

   ------------------------------------------------------------------------
   r305 | rbd | 2020-10-09 21:53:33 -0500 (Fri, 09 Oct 2020) | 1 line

   Changed some FIXNUMS to LONG to avoid compiler warnings in seqfnint.c
   ------------------------------------------------------------------------
   r304 | rbd | 2020-10-09 21:44:03 -0500 (Fri, 09 Oct 2020) | 2 lines

   I discovered forgotten regression-test.lsp and added test that requires 64-bit sample counts to pass. Fixed a few bugs revealed by running the type-checking regression tests.

   ------------------------------------------------------------------------
   r303 | rbd | 2020-10-09 12:28:58 -0500 (Fri, 09 Oct 2020) | 2 lines

   Changes for 64-bit sample counts broke mult-channel s-save. Fixed in the commit for macOS.

   ------------------------------------------------------------------------
   r302 | rbd | 2020-10-09 10:03:39 -0500 (Fri, 09 Oct 2020) | 2 lines

   Changed snd-play to return samples computed and used that to make a test for computing long sounds that would overflow 32-bit length counts.

   ------------------------------------------------------------------------
   r301 | rbd | 2020-10-09 09:11:26 -0500 (Fri, 09 Oct 2020) | 2 lines

   corrected mistake in delaycv.alg and re-translated

   ------------------------------------------------------------------------
   r300 | rbd | 2020-10-09 09:09:06 -0500 (Fri, 09 Oct 2020) | 2 lines

   Fix to delaycv.alg -- "s" changed to "input" to avoid matching "s" in "sample_type".

   ------------------------------------------------------------------------
   r299 | rbd | 2020-10-09 09:03:33 -0500 (Fri, 09 Oct 2020) | 4 lines

   To avoid compiler warnings, XLisp interfaces to C int and long are now
   specified as LONG rather than FIXNUM, and the stubs that call the C
   functions cast FIXNUMs from XLisp into longs before calling C functions.

   ------------------------------------------------------------------------
   r298 | rbd | 2020-10-08 22:20:26 -0500 (Thu, 08 Oct 2020) | 2 lines

   This commit has many more fixes to handle long (64-bit) sounds, including a lot of fixes for warnings by Visual Studio assigning int64_t to long (works on macOS, doesn't work on VS). This was compiled and tested on macOS, and even computed a 27.1-hour sound using OSC, LP, SUM and MULT (haven't tested I/O yet).

   ------------------------------------------------------------------------
   r297 | rbd | 2020-10-07 13:04:02 -0500 (Wed, 07 Oct 2020) | 2 lines

   This is a major cleanup. It started with the goal of changing long to int64_t for sample counts so that on 64-bit windows, where long is only 32-bits, the sample counts would nevertheless be 64-bit allowing long sounds, which was a limitation for long recordings in Audacity. Since I was using compiler warnings to track possible loss-of-precision conversions from 64-bit sample counts, and there were *many* warnings, I started cleaning up *all* the warnings and ended up with a very large set of changes, including "modernizing" C declarations that date back to XLisp and CMU MIDI Toolkit code and were never changed. This version runs all the examples.sal code on macOS, but will surely have problems on Windows and Linux given the number of changes.

   ------------------------------------------------------------------------
   r296 | rbd | 2020-10-06 13:34:20 -0500 (Tue, 06 Oct 2020) | 2 lines

   More changes from long to int64_t for sample counts.

   ------------------------------------------------------------------------
   r295 | rbd | 2020-10-06 11:53:49 -0500 (Tue, 06 Oct 2020) | 2 lines

   More work on using 64-bit sample counts. Changed MAX_STOP from 32-bit to 64-bit limit.

   ------------------------------------------------------------------------
   r294 | rbd | 2020-10-06 11:48:05 -0500 (Tue, 06 Oct 2020) | 2 lines

   Made some changes so that sample counts are int64_t (for windows) instead of long to support sample counts above 31 bits.

   ------------------------------------------------------------------------
   r293 | rbd | 2020-10-04 21:30:55 -0500 (Sun, 04 Oct 2020) | 2 lines

   Fixed a few minor things for Linux and tested on Linux.

   ------------------------------------------------------------------------
   r292 | rbd | 2020-10-04 21:00:28 -0500 (Sun, 04 Oct 2020) | 2 lines

   Update extensions: all are minor changes.

   ------------------------------------------------------------------------
   r291 | rbd | 2020-09-24 13:59:31 -0500 (Thu, 24 Sep 2020) | 2 lines

   New implementation of seq and seqrep, added get-real-time, documented get-real-time, fixed examples.sal and examples.lsp which are now in lib rather than extensions (so they are now back in the basic installation), other cleanup.

   ------------------------------------------------------------------------
   r290 | rbd | 2020-08-16 16:24:52 -0500 (Sun, 16 Aug 2020) | 2 lines

   Fixed bug in snd-gate, revised GATE and NOISE-GATE to handle multi-channel sound. RMS now handles multi-channel input. S-AVG added to take multichannel input (but not used, because RMS could not be written without making SND-SRATE convert multichannel sound to vector of floats. That seems to be going toward a fully vectorized model. Not going there for now.

   ------------------------------------------------------------------------
   r289 | rbd | 2020-07-09 16:27:45 -0500 (Thu, 09 Jul 2020) | 2 lines

   Added GET-REAL-TIME function to XLISP. May not work yet on Windows. Various fixes for compiler warnings. I noticed FLAC doesn't work (I guess it never did) and I cannot figure out how this even links because flac_min seems to be undefined. Something to look at later.
2021-01-27 23:45:25 -06:00

309 lines
10 KiB
C

#include "stdio.h"
#ifndef mips
#include "stdlib.h"
#endif
#include "xlisp.h"
#include "sound.h"
#include "falloc.h"
#include "cext.h"
#include "compose.h"
/* CHANGE LOG
* --------------------------------------------------------------------
* 28Apr03 dm changes for portability and fix compiler warnings
*/
void compose_free(snd_susp_type a_susp);
typedef struct compose_susp_struct {
snd_susp_node susp;
int64_t terminate_cnt;
boolean logically_stopped;
sound_type f;
int f_cnt;
sample_block_values_type f_ptr;
sample_type f_prev;
double f_time;
double f_time_increment;
boolean started;
sound_type g;
int g_cnt;
sample_block_values_type g_ptr;
} compose_susp_node, *compose_susp_type;
/* compose_fetch -- computes f(g(t)) */
/**/
void compose_fetch(snd_susp_type a_susp, snd_list_type snd_list)
{
compose_susp_type susp = (compose_susp_type) a_susp;
int cnt = 0; /* how many samples computed */
int togo = 0;
int n;
sample_block_type out;
register sample_block_values_type out_ptr;
register sample_block_values_type out_ptr_reg;
register sample_block_values_type g_ptr_reg;
register sample_block_values_type f_ptr_reg;
falloc_sample_block(out, "compose_fetch");
out_ptr = out->samples;
snd_list->block = out;
/* make sure we are primed with first value of f */
/* This is a lot of work just to prefetch susp->f_prev! */
if (!susp->started) {
susp->started = true;
/* see comments below about susp_check_term_log_samples() */
if (susp->f_cnt == 0) {
susp_get_samples(f, f_ptr, f_cnt);
if (susp->f_ptr == zero_block->samples) {
susp->terminate_cnt = susp->susp.current;
}
}
susp->f_prev = susp_fetch_sample(f, f_ptr, f_cnt);
susp->f_time += susp->f_time_increment;
}
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 the f input sample block: */
/* most fetch routines call susp_check_term_log_samples() here
* but we can't becasue susp_check_term_log_samples() assumes
* that output time progresses at the same rate as input time.
* Here, some time warping is going on, so this doesn't work.
* Instead, check for termination of f and fix terminate_cnt to
* be the current output count rather than the current input time.
*/
if (susp->f_cnt == 0) {
susp_get_samples(f, f_ptr, f_cnt);
if (susp->f->logical_stop_cnt == susp->f->current - susp->f_cnt) {
if (susp->susp.log_stop_cnt == UNKNOWN) {
susp->susp.log_stop_cnt = susp->susp.current + cnt;
}
}
if (susp->f_ptr == zero_block->samples) {
susp->terminate_cnt = susp->susp.current + cnt;
/* we can't simply terminate here because we might have
* some output samples computed already, in which case we
* want to return them now and terminate the NEXT time we're
* called.
*/
}
}
#ifdef CUT
/* don't run past the f input sample block: */
susp_check_term_log_samples(f, f_ptr, f_cnt);
togo = MIN(togo, susp->f_cnt);
#endif
/* don't run past the g input sample block: */
susp_check_term_samples(g, g_ptr, g_cnt);
togo = MIN(togo, susp->g_cnt);
/* don't run past terminate time */
if (susp->terminate_cnt != UNKNOWN &&
susp->terminate_cnt <= susp->susp.current + cnt + togo) {
togo = (int) (susp->terminate_cnt - (susp->susp.current + cnt));
if (togo == 0) break;
}
/* don't run past logical stop time */
if (!susp->logically_stopped && susp->susp.log_stop_cnt != UNKNOWN) {
int64_t to_stop = susp->susp.log_stop_cnt -
(susp->susp.current + cnt);
if (to_stop < togo && ((togo = (int) to_stop) == 0)) break;
}
n = togo;
g_ptr_reg = susp->g_ptr;
f_ptr_reg = susp->f_ptr;
out_ptr_reg = out_ptr;
if (n) do { /* the inner sample computation loop */
double g_of_t = *g_ptr_reg;
#if 0
float tmp; /* for debugging */
nyquist_printf("output sample %d, g_of_t %g", susp->susp.current + cnt, g_of_t);
#endif
/* now we scan f and interpolate at time point g_of_t */
while (susp->f_time < g_of_t) {
susp->f_time += susp->f_time_increment;
susp->f_prev = *f_ptr_reg++;
/* nyquist_printf(", (f_time %g, f %g)", susp->f_time, *f_ptr_reg); */
susp->f_ptr++;
susp->f_cnt--;
if (susp->f_cnt == 0) {
togo -= n;
/* stdputstr("\n\tf out of samples...\n"); */
goto f_out_of_samples;
}
}
g_ptr_reg++;
*out_ptr_reg++ /* = tmp */ =
(sample_type) (*f_ptr_reg - (*f_ptr_reg - susp->f_prev) *
(susp->f_time - g_of_t) * susp->f->sr);
/* nyquist_printf(", output %g\n", tmp);*/
} while (--n); /* inner loop */
f_out_of_samples:
/* using g_ptr_reg is a bad idea on RS/6000: */
susp->g_ptr += togo;
out_ptr += togo;
susp_took(g_cnt, 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;
}
} /* compose_fetch */
void compose_toss_fetch(snd_susp_type a_susp, snd_list_type snd_list)
{
compose_susp_type susp = (compose_susp_type) a_susp;
long final_count = (long) MIN(susp->susp.current + max_sample_block_len,
susp->susp.toss_cnt);
time_type final_time = susp->susp.t0 + final_count / susp->susp.sr;
long n;
/* fetch samples from f up to final_time for this block of zeros */
while (((long) ((final_time - susp->f->t0) * susp->f->sr + 0.5)) >=
susp->f->current)
susp_get_samples(f, f_ptr, f_cnt);
/* fetch samples from g up to final_time for this block of zeros */
while (((long) ((final_time - susp->g->t0) * susp->g->sr + 0.5)) >=
susp->g->current)
susp_get_samples(g, g_ptr, g_cnt);
/* convert to normal processing when we hit final_count */
/* we want each signal positioned at final_time */
if (final_count == susp->susp.toss_cnt) {
n = ROUND32((final_time - susp->f->t0) * susp->f->sr -
(susp->f->current - susp->f_cnt));
susp->f_ptr += n;
susp_took(f_cnt, n);
n = ROUND32((final_time - susp->g->t0) * susp->g->sr -
(susp->g->current - susp->g_cnt));
susp->g_ptr += n;
susp_took(g_cnt, n);
susp->susp.fetch = susp->susp.keep_fetch;
}
snd_list->block_len = (short) (final_count - susp->susp.current);
susp->susp.current = final_count;
snd_list->u.next = snd_list_create((snd_susp_type) susp);
snd_list->block = internal_zero_block;
}
void compose_mark(snd_susp_type a_susp)
{
compose_susp_type susp = (compose_susp_type) a_susp;
sound_xlmark(susp->f);
sound_xlmark(susp->g);
}
void compose_free(snd_susp_type a_susp)
{
compose_susp_type susp = (compose_susp_type) a_susp;
sound_unref(susp->f);
sound_unref(susp->g);
ffree_generic(susp, sizeof(compose_susp_node), "compose_free");
}
void compose_print_tree(snd_susp_type a_susp, int n)
{
compose_susp_type susp = (compose_susp_type) a_susp;
indent(n);
stdputstr("f:");
sound_print_tree_1(susp->f, n);
indent(n);
stdputstr("g:");
sound_print_tree_1(susp->g, n);
}
sound_type snd_make_compose(sound_type f, sound_type g)
{
register compose_susp_type susp;
rate_type sr = g->sr;
time_type t0 = g->t0;
sample_type scale_factor = 1.0F;
time_type t0_min = t0;
/* combine scale factors of linear inputs (S1 S2) */
scale_factor *= f->scale;
f->scale = 1.0F;
/* scale factor in g effectively scales sample rate of f: */
f->sr *= g->scale;
/* BUG */
/* probably need to correct f->t0, but I don't understand this,
so I'll leave this until we have some test cases */
falloc_generic(susp, compose_susp_node, "snd_make_compose");
susp->susp.fetch = compose_fetch;
susp->terminate_cnt = UNKNOWN;
/* handle unequal start times, if any */
/* BUG: do we need to prepend to f?
if (t0 < f->t0) sound_prepend_zeros(f, t0); */
if (t0 < g->t0) sound_prepend_zeros(g, t0);
/* minimum start time over all inputs: */
t0_min = MIN(g->t0, t0);
/* how many samples to toss before t0: */
susp->susp.toss_cnt = ROUNDBIG((t0 - t0_min) * sr);
if (susp->susp.toss_cnt > 0) {
susp->susp.keep_fetch = susp->susp.fetch;
susp->susp.fetch = compose_toss_fetch;
t0 = t0_min;
}
/* initialize susp state */
susp->susp.free = compose_free;
susp->susp.sr = sr;
susp->susp.t0 = t0;
susp->susp.mark = compose_mark;
susp->susp.print_tree = compose_print_tree;
susp->susp.name = "compose";
susp->logically_stopped = false;
susp->susp.log_stop_cnt = f->logical_stop_cnt;
if (susp->susp.log_stop_cnt > g->logical_stop_cnt)
susp->susp.log_stop_cnt = g->logical_stop_cnt;
susp->susp.current = 0;
susp->f = f;
susp->f_cnt = 0;
susp->f_time = 0;
susp->f_time_increment = 1 / f->sr;
susp->g = g;
susp->g_cnt = 0;
susp->started = false;
return sound_create((snd_susp_type)susp, t0, sr, scale_factor);
}
sound_type snd_compose(sound_type f, sound_type g)
{
sound_type f_copy = sound_copy(f);
sound_type g_copy = sound_copy(g);
return snd_make_compose(f_copy, g_copy);
}