mirror of
https://github.com/cookiengineer/audacity
synced 2025-06-20 14:20:06 +02:00
------------------------------------------------------------------------ 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.
101 lines
4.5 KiB
C
101 lines
4.5 KiB
C
/* pvshell.h -- a generic Nyquist primitive, esp. for phase vocoder */
|
|
|
|
/* how many bytes to provide for miscellaneous state info */
|
|
#define PVSHELL_STATE_MAX 256
|
|
|
|
/* define some bits to return conditions */
|
|
#define PVSHELL_FLAG_TERMINATE 4
|
|
#define PVSHELL_FLAG_LOGICAL_STOP 8
|
|
|
|
/* this function is called to compute samples. It should compute n
|
|
* samples (floats == sample_type) and store them at out[i].
|
|
* You can return less than n samples by writing the actual number
|
|
* of samples computed into *n. Normally, you return zero.
|
|
* To indicate that the time of the FIRST sample is the logical stop
|
|
* time, return PVSHELL_FLAG_LOGICAL_STOP. (If the logical stop time
|
|
* is not at the first sample, but instead at sample j, then just
|
|
* return j samples (from 0 to j-1), save the rest of the samples,
|
|
* and the next time, the first sample will correspond to the logical
|
|
* stop time, so you can return PVSHELL_FLAG_LOGICAL_STOP.
|
|
* To indicate that the sound has terminated, return
|
|
* PVSHELL_FLAG_TERMINATE. This should be the only time you return
|
|
* zero samples. (As with logical stop time, if you have samples to
|
|
* return before termination, then do it, and return
|
|
* PVSHELL_FLAG_TERMINATE the next time you are called, at which
|
|
* point you've returned all the samples, so you can set *n = 0.
|
|
*/
|
|
struct pvshell_struct;
|
|
|
|
typedef long (*h_fn_type)(struct pvshell_struct *susp,
|
|
sample_block_values_type out, long *n,
|
|
int64_t sample_count);
|
|
typedef void (*pvs_free_fn_type)(struct pvshell_struct *susp);
|
|
|
|
typedef struct pvshell_struct {
|
|
sound_type f;
|
|
int f_cnt;
|
|
sample_block_values_type f_ptr;
|
|
|
|
sound_type g;
|
|
int g_cnt;
|
|
sample_block_values_type g_ptr;
|
|
|
|
long flags; /* for terminated and logically stopped flags */
|
|
|
|
// state is extra storage for whatever you like
|
|
char state[PVSHELL_STATE_MAX];
|
|
|
|
// h is a function that computes sound from f, g, x, y, state
|
|
h_fn_type h;
|
|
pvs_free_fn_type free_fn;
|
|
} pvshell_node, *pvshell_type;
|
|
|
|
|
|
/* to get samples from f or g, use these macros. For each sample, call
|
|
* PVSHELL_TEST_X to get logical stop and terminate flags (but do not
|
|
* fetch a sample). Then, if you want, call PVSHELL_FETCH_X to get the
|
|
* next sample. You can call PVSHELL_TEST_X multiple times before
|
|
* calling PVSHELL_FETCH_X, e.g. you can return exit a loop when you
|
|
* see a logical stop flag and later call PVSHELL_TEST_X again. You
|
|
* CANNOT call PVSHELL_FETCH_X multiples times without an intervening
|
|
* call to PVSHELL_TEST_X. Finally, the logical stop flag is only
|
|
* returned once. Normally you should write something like:
|
|
* new_flags = PVSHELL_TEST_F(susp);
|
|
* susp->flags | = new_flags; // remember flags
|
|
* if (new_flags) break;
|
|
* in the sample loop so that you will break when you see logical_stop.
|
|
* Outside the loop, you can return (*n ? 0 : susp->flags) which will
|
|
* return 0 if you computed samples before the logical stop was detected.
|
|
* Then the next time you are called, you will return the logical_stop
|
|
* flag because you saved it in susp->flags, and the flag applies to the
|
|
* *beginning* of the sample block. This code handles terminate too.
|
|
*/
|
|
long pvshell_test_f(pvshell_type susp);
|
|
long pvshell_test_g(pvshell_type susp);
|
|
#define PVSHELL_TEST_F(susp) ((susp)->f_cnt == 0 ? pvshell_test_f(susp) : 0)
|
|
#define PVSHELL_FETCH_F(susp) \
|
|
((susp)->f->scale * ((susp)->f_cnt--, *((susp)->f_ptr++)))
|
|
|
|
#define PVSHELL_TEST_G(susp) ((susp)->g_cnt == 0 ? pvshell_test_g(susp) : 0)
|
|
#define PVSHELL_FETCH_G(susp) \
|
|
((susp)->g->scale * ((susp)->g_cnt--, *((susp)->g_ptr++)))
|
|
|
|
/* snd_make_pvshell -- create an instance of pvshell.
|
|
name -- string name of the operation, for debugging & printing
|
|
(name is not copied. It must be a permanent, immutable string.)
|
|
sr -- sample rate of output sound
|
|
t0 -- start time of output sound
|
|
h -- function that computes samples of output
|
|
f -- first input sound, e.g. sound to be time-stretched
|
|
g -- second input sound, e.g. sound to control varying stretch factor
|
|
state -- initial state information needed by h. Declared as void * so
|
|
that any struct can be passed in (provided the size is less than
|
|
PVSHELL_STATE_MAX bytes)
|
|
n -- number of bytes in state (<= PVSHELL_STATE_MAX)
|
|
*/
|
|
sound_type snd_make_pvshell(char *name, rate_type sr, time_type t0,
|
|
h_fn_type h, pvs_free_fn_type free_fn,
|
|
sound_type f, sound_type g,
|
|
void *state, long n);
|
|
|