mirror of
https://github.com/cookiengineer/audacity
synced 2025-10-25 15:53:52 +02:00
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.
This commit is contained in:
Leland Lucius
@@ -9,7 +9,7 @@
|
||||
#include "stdefs.h"
|
||||
|
||||
/* used for *AUDIO-MARKERS* */
|
||||
extern long sound_frames;
|
||||
extern int64_t sound_frames;
|
||||
extern double sound_srate;
|
||||
|
||||
extern long max_sample_blocks;
|
||||
@@ -25,7 +25,7 @@ extern int nosc_enabled; /* enable polling for OSC messages */
|
||||
#define PERMS 0644 /* -rw-r--r-- */
|
||||
|
||||
/* default stop sample count (for clipping) */
|
||||
#define MAX_STOP 0x7FFFFFFF
|
||||
#define MAX_STOP 0x7FFFFFFFFFFFFFFF
|
||||
|
||||
/* default stop time (for clipping) */
|
||||
#define MAX_STOP_TIME 10E20
|
||||
@@ -228,7 +228,7 @@ extern int nosc_enabled; /* enable polling for OSC messages */
|
||||
#define INTERP_SHIFT 2
|
||||
|
||||
LVAL snd_badsr(void);
|
||||
long check_terminate_cnt(long tc);
|
||||
int64_t check_terminate_cnt(int64_t tc);
|
||||
|
||||
typedef double time_type;
|
||||
typedef double rate_type;
|
||||
@@ -248,8 +248,8 @@ typedef double promoted_sample_type;
|
||||
production
|
||||
*/
|
||||
/* leave a few words short of 1024 in case we allocate powers of 2 */
|
||||
#define max_sample_block_len 1020
|
||||
/* #define max_sample_block_len 4 */
|
||||
#define max_sample_block_len 1016
|
||||
// #define max_sample_block_len 4
|
||||
|
||||
/* longest allowed sample is basically 2^31 but a bit lower to
|
||||
allow for rounding */
|
||||
@@ -274,25 +274,18 @@ typedef struct {
|
||||
/* forward declaration for circular type dependencies */
|
||||
typedef struct snd_list_struct *snd_list_type;
|
||||
|
||||
struct snd_susp_struct;
|
||||
|
||||
typedef void (*snd_fetch_fn)(struct snd_susp_struct *, snd_list_type snd_list);
|
||||
typedef void (*snd_free_fn)(struct snd_susp_struct *);
|
||||
typedef void (*snd_mark_fn)(struct snd_susp_struct *); /* marks LVAL nodes for GC */
|
||||
typedef void (*snd_print_tree_fn)(struct snd_susp_struct *, int);
|
||||
|
||||
typedef struct snd_susp_struct {
|
||||
snd_fetch_fn fetch;
|
||||
void (*fetch)(struct snd_susp_struct *, snd_list_type snd_list);
|
||||
void (*keep_fetch)(struct snd_susp_struct *, snd_list_type snd_list);
|
||||
snd_free_fn free;
|
||||
snd_mark_fn mark;
|
||||
snd_print_tree_fn print_tree; /* debugging */
|
||||
void (*free)(struct snd_susp_struct *);
|
||||
void (*mark)(struct snd_susp_struct *); /* marks LVAL nodes for GC */
|
||||
void (*print_tree)(struct snd_susp_struct *, int); /* debugging */
|
||||
char *name; /* string name for debugging */
|
||||
long toss_cnt; /* return this many zeros, then compute */
|
||||
long current; /* current sample number */
|
||||
int64_t toss_cnt; /* return this many zeros, then compute */
|
||||
int64_t current; /* current sample number */
|
||||
double sr; /* sample rate */
|
||||
time_type t0; /* starting time */
|
||||
long log_stop_cnt; /* logical stop count */
|
||||
int64_t log_stop_cnt; /* logical stop count */
|
||||
/* other susp dependent stuff will be here... */
|
||||
} snd_susp_node, *snd_susp_type;
|
||||
|
||||
@@ -325,26 +318,26 @@ typedef struct table_struct {
|
||||
#define UNKNOWN (-10-max_sample_block_len)
|
||||
|
||||
typedef struct sound_struct {
|
||||
sample_block_type (*get_next)(struct sound_struct *snd, long *cnt);
|
||||
sample_block_type (*get_next)(struct sound_struct *snd, int *cnt);
|
||||
time_type time; /* logical starting time */
|
||||
time_type t0; /* quantized time of first sample */
|
||||
long stop; /* stop (clipping) sample no. */
|
||||
int64_t stop; /* stop (clipping) sample no. */
|
||||
time_type true_t0; /* exact time of first sample */
|
||||
rate_type sr; /* sample rate */
|
||||
long current; /* current sample number,
|
||||
int64_t current; /* current sample number,
|
||||
if negative, then the first
|
||||
-current samples must be dropped
|
||||
in order to find the first sample */
|
||||
long logical_stop_cnt; /* log stop sample no, -1=unknwn */
|
||||
int64_t logical_stop_cnt; /* log stop sample no, -1=unknwn */
|
||||
snd_list_type list; /* sample block list, starting at curr. samp */
|
||||
sample_type scale; /* scale factor for the result */
|
||||
long prepend_cnt; /* how many zeros to prepend */
|
||||
int64_t prepend_cnt; /* how many zeros to prepend */
|
||||
/* function to use as get_next after prepended zeros are generated: */
|
||||
sample_block_type (*after_prepend)
|
||||
(struct sound_struct * snd, long * cnt);
|
||||
(struct sound_struct * snd, int *cnt);
|
||||
table_type table; /* pointer to table-ized version of this sound */
|
||||
long *extra; /* used for extra state information, first word of extra
|
||||
state should be the length of the extra state
|
||||
int64_t *extra; /* used for extra state information, extra[0]
|
||||
should be the length of the extra state
|
||||
(see sound_unref()) */
|
||||
} sound_node, *sound_type;
|
||||
|
||||
@@ -359,7 +352,7 @@ extern snd_list_type zero_snd_list;
|
||||
|
||||
extern sound_type printing_this_sound; /* debugging global */
|
||||
|
||||
long snd_set_max_audio_mem(long m);
|
||||
int64_t snd_set_max_audio_mem(int64_t m);
|
||||
/* LISP: (SND-SET-MAX-AUDIO-MEM FIXNUM) */
|
||||
|
||||
extern double sound_latency; /* controls output latency */
|
||||
@@ -379,10 +372,10 @@ void snd_list_unref(snd_list_type list);
|
||||
LVAL cvsound(sound_type);
|
||||
extern LVAL a_sound;
|
||||
|
||||
sample_block_type SND_get_next(sound_type snd, long * cnt);
|
||||
sample_block_type SND_get_first(sound_type snd, long * cnt);
|
||||
sample_block_type SND_get_zeros(sound_type snd, long * cnt);
|
||||
sample_block_type SND_flush(sound_type snd, long * cnt);
|
||||
sample_block_type SND_get_next(sound_type snd, int *cnt);
|
||||
sample_block_type SND_get_first(sound_type snd, int *cnt);
|
||||
sample_block_type SND_get_zeros(sound_type snd, int *cnt);
|
||||
sample_block_type SND_flush(sound_type snd, int *cnt);
|
||||
|
||||
double hz_to_step(double); /* LISP: (HZ-TO-STEP ANYNUM) */
|
||||
int interp_style(sound_type s, rate_type sr);
|
||||
@@ -415,7 +408,7 @@ sound_type snd_xform(sound_type snd, rate_type sr, time_type time,
|
||||
sound_type sound_create(snd_susp_type susp, time_type t0, rate_type sr,
|
||||
promoted_sample_type scale);
|
||||
|
||||
void min_cnt(long *cnt_ptr, sound_type sound, snd_susp_type susp, long cnt);
|
||||
void min_cnt(int64_t *cnt_ptr, sound_type sound, snd_susp_type susp, long cnt);
|
||||
void indent(int n);
|
||||
void sound_prepend_zeros(sound_type snd, time_type t0);
|
||||
|
||||
@@ -426,18 +419,20 @@ void sound_prepend_zeros(sound_type snd, time_type t0);
|
||||
extern long blocks_to_watch_len;
|
||||
extern sample_block_type blocks_to_watch[blocks_to_watch_max];
|
||||
|
||||
void block_watch(long sample_block);
|
||||
void block_watch(int64_t sample_block);
|
||||
/* LISP: (BLOCK-WATCH FIXNUM) */
|
||||
long sound_nth_block(sound_type snd, long n);
|
||||
/* LISP: (SOUND-NTH-BLOCK SOUND FIXNUM) */
|
||||
int64_t sound_nth_block(sound_type snd, long n);
|
||||
/* LISP: (SOUND-NTH-BLOCK SOUND LONG) */
|
||||
#endif
|
||||
|
||||
LVAL sound_array_copy(LVAL sa);
|
||||
|
||||
sound_type sound_copy(sound_type snd);
|
||||
/* LISP: (SND-COPY SOUND) */
|
||||
void sound_xlmark(void *a_sound);
|
||||
void sound_print(LVAL snd_expr, long n);
|
||||
/* LISP: (SND-PRINT ANY FIXNUM) */
|
||||
void sound_play(LVAL snd_expr);
|
||||
/* LISP: (SND-PRINT ANY LONG) */
|
||||
int64_t sound_play(LVAL snd_expr);
|
||||
/* LISP: (SND-PLAY ANY) */
|
||||
void stats(void);
|
||||
/* LISP: (STATS) */
|
||||
@@ -545,32 +540,22 @@ double step_to_hz(double);
|
||||
*/
|
||||
#define susp_check_term_log_block_samples(sound, sample_block_ptr, sample_ptr, sample_cnt, bit, all) \
|
||||
if (susp->sample_cnt == 0) { \
|
||||
susp_get_block_samples(sound, sample_block_ptr, sample_ptr, sample_cnt); \
|
||||
/*OLD if (susp->sound->logical_stop_cnt == \
|
||||
susp->sound->current - susp->sample_cnt) { \
|
||||
*/ \
|
||||
susp_get_block_samples(sound, sample_block_ptr, \
|
||||
sample_ptr, sample_cnt); \
|
||||
if (susp->sound->logical_stop_cnt != UNKNOWN && \
|
||||
!(susp->logical_stop_bits & bit)) { \
|
||||
susp->logical_stop_bits |= bit; \
|
||||
/*OLD \
|
||||
if (susp->logical_stop_bits == all) { \
|
||||
susp->susp.log_stop_cnt = (long) \
|
||||
((((susp->sound->current - susp->sample_cnt) / \
|
||||
susp->sound->sr + susp->sound->t0) - \
|
||||
susp->susp.t0) * susp->susp.sr + 0.5); \
|
||||
assert(susp->susp.log_stop_cnt >= 0); } } \
|
||||
*/ \
|
||||
susp->susp.log_stop_cnt = max(susp->susp.log_stop_cnt, \
|
||||
susp->susp.log_stop_cnt = (int64_t) max(susp->susp.log_stop_cnt, \
|
||||
(((susp->sound->logical_stop_cnt / \
|
||||
susp->sound->sr + susp->sound->t0) - \
|
||||
susp->susp.t0) * susp->susp.sr + 0.5)); } \
|
||||
if (susp->sample_ptr == zero_block->samples) { \
|
||||
susp->terminate_bits |= bit; \
|
||||
if (susp->terminate_bits == all) { \
|
||||
susp->terminate_cnt = (long) \
|
||||
((((susp->sound->current - susp->sample_cnt) / \
|
||||
susp->sound->sr + susp->sound->t0) - \
|
||||
susp->susp.t0) * susp->susp.sr + 0.5); \
|
||||
susp->terminate_cnt = ROUNDBIG( \
|
||||
(((susp->sound->current - susp->sample_cnt) / \
|
||||
susp->sound->sr + susp->sound->t0) - \
|
||||
susp->susp.t0) * susp->susp.sr); \
|
||||
} } }
|
||||
|
||||
|
||||
@@ -584,7 +569,7 @@ double step_to_hz(double);
|
||||
*/
|
||||
#define logical_stop_cnt_cvt(sound) \
|
||||
(sound->logical_stop_cnt == UNKNOWN ? UNKNOWN : \
|
||||
ROUND32((sound->logical_stop_cnt / sound->sr) * susp->susp.sr))
|
||||
ROUNDBIG((sound->logical_stop_cnt / sound->sr) * susp->susp.sr))
|
||||
|
||||
|
||||
/* logical_stop_test tests to see if sound has logically stopped; if so,
|
||||
|
||||
Reference in New Issue
Block a user