mirror of
https://github.com/cookiengineer/audacity
synced 2025-04-30 15:49:41 +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.
681 lines
26 KiB
C
681 lines
26 KiB
C
/* multiseq.c -- return a multichannel signal until its logical stop, then
|
|
evaluate a closure to get another signal and convert to adds
|
|
of two multichannel signals */
|
|
|
|
/* CHANGE LOG
|
|
* --------------------------------------------------------------------
|
|
* 28Apr03 dm changes for portability and fix compiler warnings
|
|
*/
|
|
|
|
#include "stdio.h"
|
|
#ifndef mips
|
|
#include "stdlib.h"
|
|
#endif
|
|
#include "xlisp.h"
|
|
#include "sound.h"
|
|
#include "falloc.h"
|
|
#include "multiseq.h"
|
|
#include "add.h"
|
|
#include "scale.h"
|
|
#include "extern.h"
|
|
#include "cext.h"
|
|
#include "sndseq.h"
|
|
|
|
/* #define MULTISEQ_GC_DEBUG */
|
|
#ifdef MULTISEQ_GC_DEBUG
|
|
extern snd_list_type snd_list_to_watch;
|
|
#endif
|
|
|
|
/* #define GC_DEBUG */
|
|
#ifdef GC_DEBUG
|
|
extern sound_type sound_to_watch;
|
|
#endif
|
|
|
|
|
|
#define D if(0)
|
|
|
|
/* Design:
|
|
|
|
This operator implements sequences of multichannel signals.
|
|
A single data structure manages an array of susps that
|
|
initially are used to fetch blocks from the first multichannel
|
|
signal. When the LAST logical stop is reached, a closure
|
|
is evaluated to yield a new multichannel signal. The component
|
|
sounds of this are stored into the susps which are then
|
|
converted into add suspensions. The other managing structures
|
|
are then freed.
|
|
|
|
The main constraint here is that the conversion to add susps
|
|
must take place at the same time across all channels, so before
|
|
the conversion, a fetch from the susp can only be made if it is
|
|
known that the samples returned happen BEFORE the conversion will
|
|
take place. Since the conversion takes place at the maximum of
|
|
the logical stop times of all channels, we have to advance all
|
|
channels synchronously. We keep track of a greatest lower bound,
|
|
refered to as the horizon, on the maximum logical stop time. It
|
|
is safe to fetch blocks up to the horizon, but not beyond.
|
|
|
|
This synchronous fetching is done by a single routine and an
|
|
auxilliarly structure that manages the whole multichannel array
|
|
of susps. The basic idea is that a fetch from a
|
|
suspension gets forwarded to the managing structure, which
|
|
uses its array of susps to fetch from ALL suspensions up to
|
|
the requested time or until the logical stop, whichever comes
|
|
first. These "synchronous" fetches are not made by calling the
|
|
fetch routines on the suspensions to avoid infinite recursion.
|
|
|
|
At any time, there will be some set of channels whose logical
|
|
stop time is unknown. The "s1" fields (s1, s1_ptr, s1_bptr) of
|
|
these suspensions are used to look ahead by geting a block from
|
|
s1. If no logical stop is indicated, then we can append the block
|
|
to the snd_list and update the horizon, allowing fetches from other
|
|
susps. In other words, the s1_bptr of each susp provides a one
|
|
buffer lookahead by which we can obtain advance knowledge of the
|
|
maximum logical stop time.
|
|
|
|
The algorithm is as follows:
|
|
|
|
1. When fetch is called on a suspension, compute when any
|
|
prefetched samples will end (if there are none, then fetch
|
|
a block from s1 and compute the time at which the block ends).
|
|
This becomes the target time for other fetches.
|
|
|
|
2. Call multiseq_advance(), passing the target time and the
|
|
manager structure (which has pointers to all other channels).
|
|
(Note: every susp has a pointer to the manager).
|
|
The function of multiseq_advance() is to push the horizon for
|
|
the logical stop forward. This is done by
|
|
iterating over the array of susps until the target is reached.
|
|
Actually, the array contains pointers to the snd_list_node that
|
|
points to each susp and where the next block will be linked.
|
|
The goal of this loop is to satisfy the original fetch, which
|
|
means we have to push low_water to greater than or equal to the
|
|
target. (Low water is the minimum time of the next sample to
|
|
be returned by any multiseq susp.) This goal will be met unless
|
|
we reach the last logical stop time, in which case we evaluate
|
|
the closure for the next multichannel sound, convert
|
|
everything to add's and let the additions take care of returning
|
|
blocks.
|
|
|
|
3. The Iteration Loop:
|
|
low_water is the lowest sample count of the next sample
|
|
horizon is the greatest lower bound on the maximum logical stop time
|
|
Iterate over susps until low_water >= target
|
|
(Note: whenever data is fetched for a sound whose logical stop time
|
|
is unknown, update the horizon. If a logical stop time becomes known,
|
|
then test if the final maximum logical stop time is known (by keeping
|
|
a count of how many are still unknown), and if the count goes to zero,
|
|
evaluate the continuation and convert to multiple adds.)
|
|
(Another Note: we may reach the logical stop time and convert to
|
|
multiple adds before the loop terminates, in which case we return
|
|
without finishing the loop. Take care that the caller does the right
|
|
thing to produce a sample block in this case.)
|
|
|
|
3a. If a block hasn't been prefetched, do it.
|
|
|
|
3b. While the susp has prefetched a block that ends at or before horizon,
|
|
put the block on the snd_list and prefetch another block.
|
|
|
|
3c. If the susp hasn't a known logical stop time, set new_horizon to
|
|
the end time of the last sample prefetched in 3b.
|
|
|
|
3d. If new_horizon == horizon, signal an error, no progress was made.
|
|
|
|
3d. Set horizon to new_horizon and repeat the loop.
|
|
|
|
NOTE ON A BUG FIX (1 Jul 95): old code assumed that when a logical stop
|
|
was detected it was at the beginning of the next block, but if logical
|
|
stop is explicit, then it may be way in the future. We could convert
|
|
to adds at this point, but that would force early evaluation of the
|
|
closure, which we'd like to delay (be lazy when possible). Therefore,
|
|
we want to ignore knowledge of a logical stop time until the logical
|
|
stop time falls within the currently known block of samples. By "currently
|
|
known", I mean somewhere in the block referenced by ->s1_ptr and ->s1_cnt.
|
|
|
|
*/
|
|
|
|
/* extern LVAL s_stdout; */
|
|
|
|
void multiseq_convert(multiseq_type ms);
|
|
void multiseq_free(snd_susp_type a_susp);
|
|
sample_block_type multiseq_get_next(sound_type snd, long * cnt);
|
|
void multiseq_print_tree(snd_susp_type a_susp, int n);
|
|
|
|
|
|
#define susp_cnt_time(ssp, ms, cnt) (ssp->susp.t0 - ms->t0 + (cnt)/ssp->s1->sr)
|
|
#define susp_time(ssp, ms) susp_cnt_time(ssp, ms, \
|
|
(ssp->susp.current + ssp->s1_cnt))
|
|
#define susp_low_water(ssp, ms) susp_cnt_time(ssp, ms, ssp->susp.current)
|
|
#define susp_log_stop_time(ssp, ms) susp_cnt_time(ssp, ms, ssp->susp.log_stop_cnt)
|
|
|
|
|
|
/* multiseq_advance fetches from each channel to advance to target time */
|
|
/*
|
|
* If a channel terminates early, we must be careful: continuing to
|
|
* fetch will return pointers to the zero_block, but this will
|
|
* indicate termination to whoever is fetching from multiseq. We
|
|
* must check the pointers and substitute internal_zero_block to
|
|
* avoid premature termination.
|
|
*/
|
|
void multiseq_advance(multiseq_type ms, time_type target)
|
|
{
|
|
int i;
|
|
time_type new_horizon;
|
|
time_type new_low_water;
|
|
|
|
D nyquist_printf("multiseq_advance: %p->low_water %g, target %g\n",
|
|
ms, ms->low_water, target);
|
|
while (ms->low_water < target - 0.000001) {
|
|
new_horizon = 0.0;
|
|
D nyquist_printf("multiseq_advance loop: target %g low_water %g horizon %g\n",
|
|
target, ms->low_water, ms->horizon);
|
|
/* new_low_water will be a minimum over every
|
|
* channel, so start with a big number */
|
|
new_low_water = target;
|
|
for (i = 0; i < ms->nchans; i++) {
|
|
snd_list_type snd_list = ms->chans[i];
|
|
add_susp_type susp = (add_susp_type) snd_list->u.susp;
|
|
time_type my_hor;
|
|
time_type my_low_water;
|
|
D nyquist_printf("chans[%d]: ", i);
|
|
|
|
/* fetch up to horizon */
|
|
|
|
/* see if susp has an unprocessed block (test on susp->s1_ptr
|
|
* is probably not necessary, in fact, it isn't initialized
|
|
* until the first block is fetched, but s1_cnt is
|
|
*/
|
|
if (susp->s1_cnt && susp->s1_ptr &&
|
|
susp->s1_ptr == susp->s1_bptr->samples) {
|
|
/* do nothing, unprocessed block already there as a
|
|
* result of the initiating fetch
|
|
*/
|
|
} else if (susp->s1_cnt != 0) {
|
|
stdputstr("multiseq_advance: s1_cnt != 0\n");
|
|
EXIT(1); /* this should never happen */
|
|
} else { /* otherwise fetch it */
|
|
D stdputstr("prefetching samples ");
|
|
susp_get_block_samples(s1, s1_bptr, s1_ptr, s1_cnt);
|
|
if (susp->s1_ptr == zero_block->samples) {
|
|
susp->terminate_bits = 1;
|
|
susp->s1_bptr = internal_zero_block;
|
|
susp->s1_ptr = internal_zero_block->samples;
|
|
}
|
|
/* see if we've reached a logical stop
|
|
* (I can't believe this code block is in 3 places -
|
|
* there must be a better way... RBD)
|
|
*/
|
|
if (!susp->logical_stop_bits) {
|
|
if (susp->s1->logical_stop_cnt != UNKNOWN) {
|
|
if (susp->susp.current + susp->s1_cnt >=
|
|
susp->s1->logical_stop_cnt) {
|
|
susp->logical_stop_bits = 1;
|
|
susp->susp.log_stop_cnt =
|
|
susp->s1->logical_stop_cnt;
|
|
ms->not_logically_stopped_cnt--;
|
|
D nyquist_printf(
|
|
"snd_make_multiseq: Logical stop reached, not_logically_stopped_cnt %d\n",
|
|
ms->not_logically_stopped_cnt);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
D nyquist_printf(" current %d cnt %d ",
|
|
(int)susp->susp.current, (int)susp->s1_cnt);
|
|
|
|
/* while the susp has prefetched a block that ends at or
|
|
* before horizon, put the block on the snd_list and
|
|
* prefetch another block
|
|
*/
|
|
while (susp_time(susp, ms) < ms->horizon + 0.000001) {
|
|
snd_list->block = susp->s1_bptr;
|
|
snd_list->block_len = (short) susp->s1_cnt;
|
|
susp->susp.current += susp->s1_cnt;
|
|
(susp->s1_bptr->refcnt)++;
|
|
susp->s1_cnt = 0;
|
|
#ifdef MULTISEQ_GC_DEBUG
|
|
nyquist_printf(
|
|
"multiseq: output block %p%s on snd_list %p to chan %d\n",
|
|
susp->s1_bptr,
|
|
(susp->s1_bptr == internal_zero_block ?
|
|
" (INTERNAL ZERO BLOCK)" : ""),
|
|
snd_list, i);
|
|
#endif
|
|
snd_list->u.next = snd_list_create(&(susp->susp));
|
|
#ifdef MULTISEQ_GC_DEBUG
|
|
snd_list_debug(snd_list, "multiseq_advance");
|
|
#endif
|
|
ms->chans[i] = snd_list = snd_list->u.next;
|
|
susp_get_block_samples(s1, s1_bptr, s1_ptr, s1_cnt);
|
|
if (susp->s1_ptr == zero_block->samples) {
|
|
susp->terminate_bits = 1;
|
|
susp->s1_bptr = internal_zero_block;
|
|
susp->s1_ptr = internal_zero_block->samples;
|
|
}
|
|
if (susp->s1_ptr != susp->s1_bptr->samples) {
|
|
stdputstr("bug in multiseq_advance\n");
|
|
EXIT(1);
|
|
}
|
|
/* see if we've reached a logical stop
|
|
* (I can't believe this code block is in 3 places -
|
|
* there must be a better way... RBD)
|
|
*/
|
|
if (!susp->logical_stop_bits) {
|
|
if (susp->s1->logical_stop_cnt != UNKNOWN) {
|
|
if (susp->susp.current + susp->s1_cnt >=
|
|
susp->s1->logical_stop_cnt) {
|
|
susp->logical_stop_bits = 1;
|
|
susp->susp.log_stop_cnt =
|
|
susp->s1->logical_stop_cnt;
|
|
ms->not_logically_stopped_cnt--;
|
|
D nyquist_printf(
|
|
"snd_make_multiseq: Logical stop reached, not_logically_stopped_cnt %d\n",
|
|
ms->not_logically_stopped_cnt);
|
|
}
|
|
}
|
|
}
|
|
D nyquist_printf("\n\toutput block, current %d cnt %d ",
|
|
(int)susp->susp.current, (int)susp->s1_cnt);
|
|
}
|
|
if (!susp->logical_stop_bits)
|
|
my_hor = susp_time(susp, ms);
|
|
else my_hor = susp_log_stop_time(susp, ms);
|
|
if (new_horizon < my_hor) {
|
|
D nyquist_printf("new_horizon %g ", my_hor);
|
|
new_horizon = my_hor;
|
|
}
|
|
if (ms->not_logically_stopped_cnt == 0) {
|
|
ms->horizon = new_horizon; /* pass t0 to multiseq_convert */
|
|
D stdputstr("Calling multiseq_convert\n");
|
|
multiseq_convert(ms);
|
|
return;
|
|
}
|
|
my_low_water = susp_low_water(susp, ms);
|
|
if (my_low_water < new_low_water) {
|
|
new_low_water = my_low_water;
|
|
}
|
|
D stdputstr("\n");
|
|
}
|
|
ms->low_water = new_low_water;
|
|
if (new_horizon <= ms->horizon) {
|
|
stdputstr("no progress in multiseq_advance\n");
|
|
EXIT(1);
|
|
} else {
|
|
ms->horizon = new_horizon;
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
/* multiseq_convert -- eval closure and convert to adds */
|
|
/**/
|
|
void multiseq_convert(multiseq_type ms)
|
|
{
|
|
LVAL result, new;
|
|
sound_type snd;
|
|
time_type now = ms->t0 + ms->horizon;
|
|
int i;
|
|
long size;
|
|
|
|
xlsave1(result);
|
|
result = xleval(cons(ms->closure, consa(cvflonum(now))));
|
|
if (exttypep(result, a_sound)) {
|
|
snd = sound_copy(getsound(result));
|
|
result = newvector(ms->nchans);
|
|
setelement(result, 0, cvsound(snd));
|
|
for (i = 1; i < ms->nchans; i++) {
|
|
setelement(result, i, cvsound(sound_zero(now, ms->sr)));
|
|
}
|
|
} else if (vectorp(result)) {
|
|
if (getsize(result) > ms->nchans) {
|
|
xlerror("too few channels", result);
|
|
} else if (getsize(result) < ms->nchans) {
|
|
new = newvector(ms->nchans);
|
|
for (i = 1; i < getsize(result); i++) {
|
|
setelement(new, i, getelement(result, i));
|
|
}
|
|
for (i = getsize(result); i < ms->nchans; i++) {
|
|
setelement(new, i, cvsound(sound_zero(now, ms->sr)));
|
|
}
|
|
result = new;
|
|
}
|
|
} else xlerror("closure did not return a (multi-channel) sound", result);
|
|
|
|
/* now result holds a vector of nchans, insert them into add_susp's */
|
|
for (i = 0; i < ms->nchans; i++) {
|
|
snd_list_type snd_list = ms->chans[i];
|
|
add_susp_type susp = (add_susp_type) snd_list->u.susp;
|
|
int64_t sother_start;
|
|
|
|
/* remove backpointer to ms */
|
|
susp->multiseq = NULL;
|
|
susp->susp.print_tree = add_print_tree;
|
|
susp->susp.free = add_free;
|
|
susp->susp.mark = add_mark;
|
|
|
|
susp->s2 = sound_copy(getsound(getelement(result, i)));
|
|
if (susp->s1->sr != susp->s2->sr)
|
|
xlfail("multiseq: sample rates must match");
|
|
|
|
if (susp->s2->scale != 1.0) {
|
|
susp->s2 = snd_make_normalize(susp->s2);
|
|
}
|
|
|
|
sother_start = ROUNDBIG((susp->s2->t0 - susp->susp.t0) * susp->s2->sr);
|
|
D nyquist_printf("sother_start computed for %p: %" PRId64 "\n",
|
|
susp, sother_start);
|
|
if (sother_start > susp->susp.current) {
|
|
D nyquist_printf("susp %p using add_s1_nn_fetch\n", susp);
|
|
susp->susp.fetch = add_s1_nn_fetch;
|
|
susp->susp.name = "multiseq:add_s1_nn_fetch";
|
|
} else if (susp->terminate_bits) { /* s1 is done, just get s2 now */
|
|
sound_unref(susp->s1);
|
|
susp->s1 = NULL;
|
|
D nyquist_printf("susp %p using add_s2_nn_fetch\n", susp);
|
|
susp->susp.fetch = add_s2_nn_fetch;
|
|
susp->susp.name = "multiseq:add_s2_nn_fetch";
|
|
} else {
|
|
D nyquist_printf("susp %p using add_s1_s2_nn_fetch\n", susp);
|
|
susp->susp.fetch = add_s1_s2_nn_fetch;
|
|
susp->susp.name = "multiseq:add_s1_s2_nn_fetch";
|
|
}
|
|
|
|
/* fix up logical stop info */
|
|
/* BUG: what if s2 is already stopped? */
|
|
susp->susp.log_stop_cnt = UNKNOWN;
|
|
susp->logically_stopped = false;
|
|
|
|
/* we need to compute at least 1 sample
|
|
* (at this point we don't really know if we've
|
|
* computed anything or not, so to be safe, do it.
|
|
*/
|
|
snd_list->u.next = snd_list_create(&(susp->susp));
|
|
snd_list->block = internal_zero_block;
|
|
(*(susp->susp.fetch))((snd_susp_type) susp, snd_list);
|
|
}
|
|
|
|
/* now free the multiseq struct */
|
|
size = sizeof(snd_list_type) * ms->nchans;
|
|
ffree_generic(ms->chans, size, "multiseq_convert");
|
|
ffree_generic(ms, sizeof(multiseq_node), "multiseq_convert(2)");
|
|
|
|
ms->closure = NIL; /* allow garbage collection now */
|
|
xlpop();
|
|
}
|
|
|
|
|
|
/* multiseq_fetch returns blocks of s1 until the logical stop time of s1's */
|
|
/*
|
|
* Fetch routines (in particular, the add_*_fetch routines that will
|
|
* be installed on this susp at a later time) expect to be called with
|
|
* a new snd_list installed and ready for a new block. However, since
|
|
* we are going to call multiseq_advance to pull blocks out of susps
|
|
* that will not be set up with a fresh snd_list in this way, it is
|
|
* simpler to dispose of the preallocated snd_list so that all susps
|
|
* look alike to multiseq_advance. Of course, multiseq_advance will
|
|
* redo the work of allocating a snd_list.
|
|
*
|
|
* If a channel terminates early, we must be careful: continuing to
|
|
* fetch will return pointers to the zero_block, but this will
|
|
* indicate termination to whoever is fetching from multiseq. We
|
|
* must check the pointers and substitute internal_zero_block to
|
|
* avoid premature termination.
|
|
*/
|
|
void multiseq_fetch(snd_susp_type a_susp, snd_list_type snd_list)
|
|
{
|
|
add_susp_type susp = (add_susp_type) a_susp;
|
|
time_type block_end_time;
|
|
|
|
/* undo the preallocation of a snd_list_node */
|
|
/* we can bypass the reference counting code because we
|
|
* know that this snd_list was just allocated and has no
|
|
* other references
|
|
*/
|
|
#ifdef MULTISEQ_GC_DEBUG
|
|
if (snd_list_to_watch == snd_list->u.next) {
|
|
nyquist_printf("multiseq_fetch: backing out snd_list_to_watch from %p\n",
|
|
snd_list_to_watch);
|
|
watch_snd_list(snd_list);
|
|
}
|
|
#endif
|
|
ffree_snd_list(snd_list->u.next, "multiseq_fetch");
|
|
snd_list->u.susp = (snd_susp_type) susp;
|
|
snd_list->block = NULL;
|
|
|
|
D nyquist_printf("multiseq_fetch called: susp %p s1_cnt %d\n",
|
|
susp, (int)susp->s1_cnt);
|
|
|
|
/* first compute how many samples we can generate from s1: */
|
|
if (susp->s1_cnt == 0) {
|
|
susp_get_block_samples(s1, s1_bptr, s1_ptr, s1_cnt);
|
|
if (susp->s1_ptr == zero_block->samples) {
|
|
susp->terminate_bits = 1; /* mark s1 as terminated */
|
|
susp->s1_bptr = internal_zero_block;
|
|
susp->s1_ptr = internal_zero_block->samples;
|
|
}
|
|
/* see if we've reached a logical stop
|
|
* (I can't believe this code block is in 3 places -
|
|
* there must be a better way... RBD)
|
|
*/
|
|
if (!susp->logical_stop_bits) {
|
|
if (susp->s1->logical_stop_cnt != UNKNOWN) {
|
|
if (susp->susp.current + susp->s1_cnt >=
|
|
susp->s1->logical_stop_cnt) {
|
|
susp->logical_stop_bits = 1;
|
|
susp->susp.log_stop_cnt =
|
|
susp->s1->logical_stop_cnt;
|
|
susp->multiseq->not_logically_stopped_cnt--;
|
|
D nyquist_printf(
|
|
"snd_make_multiseq: Logical stop reached, not_logically_stopped_cnt %d\n",
|
|
susp->multiseq->not_logically_stopped_cnt);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
/* s1_cnt has the number of samples we can return */
|
|
|
|
/* now compute time of the last sample */
|
|
block_end_time = susp_time(susp, susp->multiseq);
|
|
D nyquist_printf("block_end_time of %p: %g\n", susp, block_end_time);
|
|
multiseq_advance(susp->multiseq, block_end_time);
|
|
}
|
|
|
|
|
|
/* multiseq_mark -- mark routine for multiseq susps */
|
|
/**/
|
|
void multiseq_mark(snd_susp_type a_susp)
|
|
{
|
|
add_susp_type susp = (add_susp_type) a_susp;
|
|
int i;
|
|
multiseq_type ms = susp->multiseq;
|
|
D nyquist_printf("multiseq_mark(%p)\n", susp);
|
|
/* nyquist_printf("marking s1@%p in add@%p\n", susp->s1, susp);*/
|
|
if (ms->closure) mark(ms->closure);
|
|
|
|
/* mark s1 of each susp in multiseq */
|
|
for (i = 0; i < ms->nchans; i++) {
|
|
snd_list_type snd_list = ms->chans[i];
|
|
if (snd_list) {
|
|
while (snd_list->block != NULL) {
|
|
if (snd_list == zero_snd_list) break;
|
|
snd_list = snd_list->u.next;
|
|
}
|
|
sound_xlmark(((add_susp_type) snd_list->u.susp)->s1);
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
/* snd_make_multiseq -- make a multiseq from an array and a closure */
|
|
/*
|
|
* NOTE: the resulting array of sounds will not use the normal
|
|
* SND_get_first and SND_get_next routines to fetch new blocks
|
|
* because these extend the snd_list of the sound immediately,
|
|
* and this would confuse multiseq_advance() which has to extend
|
|
* multiple snd_lists synchronously. So, we use multiseq_get_next()
|
|
* instead.
|
|
*/
|
|
LVAL snd_make_multiseq(LVAL s1, LVAL closure)
|
|
{
|
|
multiseq_type ms;
|
|
int i;
|
|
LVAL result;
|
|
|
|
xlsave1(result);
|
|
|
|
/* allocate multiseq */
|
|
falloc_generic(ms, multiseq_node, "snd_make_multiseq");
|
|
|
|
/* install its array of snd_list_type */
|
|
if (!vectorp(s1) || getsize(s1) == 0) {
|
|
ffree_generic(ms, sizeof(multiseq_node), "snd_make_multiseq");
|
|
xlerror("bad argument type", s1);
|
|
}
|
|
ms->nchans = getsize(s1);
|
|
ms->closure = closure;
|
|
ms->not_logically_stopped_cnt = 0;
|
|
ms->low_water = 0.0;
|
|
ms->horizon = 0.0;
|
|
falloc_generic_n(ms->chans, snd_list_type, ms->nchans,
|
|
"snd_make_multiseq");
|
|
|
|
/* allocate sounds to return */
|
|
result = newvector(ms->nchans);
|
|
|
|
/* ms->t0 will be the minimum of all t0's in array */
|
|
ms->t0 = (getsound(getelement(s1, 0)))->t0;
|
|
|
|
/* create sounds to return */
|
|
for (i = 0; i < ms->nchans; i++) {
|
|
add_susp_type susp;
|
|
sound_type snd;
|
|
falloc_generic(susp, add_susp_node, "snd_make_multiseq(add_susp)");
|
|
susp->s1 = sound_copy(getsound(getelement(s1, i)));
|
|
/* we used to only incr this if lsc was UNKNOWN, but
|
|
that's wrong. Should move this out of the loop now.
|
|
*/
|
|
if (susp->s1->scale != 1.0) {
|
|
/* stdputstr("normalizing first sound in a seq\n"); */
|
|
susp->s1 = snd_make_normalize(susp->s1);
|
|
}
|
|
|
|
ms->not_logically_stopped_cnt++;
|
|
D nyquist_printf("snd_make_multiseq: not_logically_stopped_cnt %d\n",
|
|
ms->not_logically_stopped_cnt);
|
|
susp->s1_cnt = 0;
|
|
susp->s2 = NULL;
|
|
susp->s2_cnt = 0;
|
|
susp->susp.fetch = multiseq_fetch;
|
|
susp->susp.free = multiseq_free;
|
|
susp->susp.sr = susp->s1->sr;
|
|
susp->susp.mark = multiseq_mark;
|
|
susp->susp.print_tree = multiseq_print_tree;
|
|
susp->susp.name = "multiseq";
|
|
susp->susp.t0 = susp->s1->t0;
|
|
susp->terminate_bits = 0; /* bits for s1 and s2 termination */
|
|
susp->terminate_cnt = UNKNOWN;
|
|
susp->logical_stop_bits = 0; /* bits for s1 and s2 log. stop */
|
|
susp->susp.log_stop_cnt = UNKNOWN;
|
|
susp->logically_stopped = false;
|
|
susp->started = false;
|
|
susp->susp.current = 0;
|
|
susp->multiseq = ms;
|
|
snd = sound_create((snd_susp_type) susp, susp->s1->t0, susp->susp.sr,
|
|
1.0);
|
|
#ifdef GC_DEBUG
|
|
if (snd == sound_to_watch) {
|
|
nyquist_printf("watched sound is channel %d\n", i);
|
|
}
|
|
#endif
|
|
setelement(result, i, cvsound(snd));
|
|
if (snd->list->block || !snd->list->u.susp) {
|
|
stdputstr("data inconsistency in snd_make_seq\n");
|
|
EXIT(1);
|
|
}
|
|
ms->chans[i] = snd->list;
|
|
D nyquist_printf("ms->chans[%d] = %p, %p->u.susp = %p\n",
|
|
i, snd->list, snd->list, snd->list->u.susp);
|
|
ms->t0 = MIN(ms->t0, susp->s1->t0);
|
|
ms->sr = susp->s1->sr; /* assume all samp rates are equal */
|
|
D nyquist_printf("Multiseq sound[%d]: \n", i);
|
|
D sound_print_tree(susp->s1);
|
|
}
|
|
D nyquist_printf("ms->t0 == %g\n", ms->t0);
|
|
xlpop();
|
|
return result;
|
|
}
|
|
|
|
|
|
LVAL snd_multiseq(LVAL snd, LVAL closure)
|
|
{
|
|
return snd_make_multiseq(sound_array_copy(snd), closure);
|
|
}
|
|
|
|
|
|
void multiseq_free(snd_susp_type a_susp)
|
|
{
|
|
add_susp_type susp = (add_susp_type) a_susp;
|
|
int i;
|
|
multiseq_type ms = susp->multiseq;
|
|
boolean dead = true;
|
|
sound_unref(susp->s1);
|
|
sound_unref(susp->s2); /* probably not necessary */
|
|
/* tricky part: remove pointer from ms->chans */
|
|
for (i = 0; i < ms->nchans; i++) {
|
|
if (ms->chans[i]) {
|
|
dead = false;
|
|
/*
|
|
* note that ms->chans is still a valid
|
|
* pointer (see snd_list_unref)
|
|
*/
|
|
if (ms->chans[i]->u.susp == (snd_susp_type) susp) {
|
|
ms->chans[i] = NULL;
|
|
D nyquist_printf("susp %p freed, ms@%p->chans[%d] = NULL\n",
|
|
susp, ms, i);
|
|
}
|
|
}
|
|
}
|
|
|
|
/* if last element is freed, free the multiseq struct too */
|
|
if (dead) {
|
|
i = sizeof(snd_list_type) * ms->nchans;
|
|
ffree_generic(ms->chans, i, "multiseq_free");
|
|
ffree_generic(ms, sizeof(multiseq_node), "multiseq_free(2)");
|
|
}
|
|
|
|
susp->multiseq = NULL; /* just to be safe */
|
|
ffree_generic(susp, sizeof(add_susp_node), "multiseq_free(3)");
|
|
}
|
|
|
|
|
|
void multiseq_print_tree(snd_susp_type a_susp, int n)
|
|
{
|
|
add_susp_type susp = (add_susp_type) a_susp;
|
|
int i;
|
|
|
|
indent(n);
|
|
if (!susp->multiseq) {
|
|
xlfail("internal error: missing multiseq structure");
|
|
}
|
|
nyquist_printf("multiseq@%p = [ ", susp->multiseq);
|
|
for (i = 0; i < susp->multiseq->nchans; i++) {
|
|
if (susp->multiseq->chans[i]) {
|
|
nyquist_printf("%p", susp->multiseq->chans[i]->u.susp);
|
|
} else {
|
|
stdputstr("NULL");
|
|
}
|
|
}
|
|
|
|
indent(n);
|
|
stdputstr("s1:");
|
|
sound_print_tree_1(susp->s1, n);
|
|
|
|
indent(n);
|
|
stdputstr("closure:");
|
|
stdprint(susp->multiseq->closure);
|
|
|
|
indent(n);
|
|
}
|
|
|
|
|