mirror of
https://github.com/cookiengineer/audacity
synced 2025-10-25 15:53:52 +02:00
Update nyquist to SVN r288 (r3.15+)
------------------------------------------------------------------------
r288 | rbd | 2018-09-25 13:47:35 -0500 (Tue, 25 Sep 2018) | 2 lines
removed some redundant files that moved to nyquist extensions
------------------------------------------------------------------------
r287 | rbd | 2018-09-25 13:02:34 -0500 (Tue, 25 Sep 2018) | 2 lines
Cleaning up: many things in demos have moved to Nyquist extensions
------------------------------------------------------------------------
r286 | rbd | 2018-09-11 08:21:16 -0500 (Tue, 11 Sep 2018) | 2 lines
Releasing 3.15 on Mac, finished extension manager update to allow a custom extension list file set in Preferences. Allow text copy of checksum when checksums do not match (so IDE can calculate the checksum for new extensions), describe this in manual.
------------------------------------------------------------------------
r285 | rbd | 2018-09-05 08:00:03 -0500 (Wed, 05 Sep 2018) | 2 lines
Changes for 3.15 on Mac and hopefully good for Windows too.
------------------------------------------------------------------------
r284 | rbd | 2018-09-01 21:21:47 -0500 (Sat, 01 Sep 2018) | 2 lines
Final change? for v3.14 on Mac
------------------------------------------------------------------------
r283 | rbd | 2018-09-01 21:14:11 -0500 (Sat, 01 Sep 2018) | 2 lines
Took out unicode char from fm-voices-chowning, added README to extensions directory
------------------------------------------------------------------------
r282 | rbd | 2018-09-01 21:12:47 -0500 (Sat, 01 Sep 2018) | 1 line
fixed some instrument defns for sound browser
------------------------------------------------------------------------
r281 | rbd | 2018-09-01 19:56:55 -0500 (Sat, 01 Sep 2018) | 1 line
Small changes for release on Windows: v3.14
------------------------------------------------------------------------
r280 | rbd | 2018-09-01 19:56:07 -0500 (Sat, 01 Sep 2018) | 2 lines
path problems in some extensions and minor changes for mac release
------------------------------------------------------------------------
r279 | rbd | 2018-09-01 15:03:26 -0500 (Sat, 01 Sep 2018) | 2 lines
change doc/README.txt to doc/readme-mac.txt in install dmg
------------------------------------------------------------------------
r278 | rbd | 2018-09-01 14:58:10 -0500 (Sat, 01 Sep 2018) | 2 lines
minor fix for mac release
------------------------------------------------------------------------
r277 | rbd | 2018-09-01 14:40:10 -0500 (Sat, 01 Sep 2018) | 2 lines
Retry release on Mac, minor changes.
------------------------------------------------------------------------
r276 | rbd | 2018-08-31 23:44:45 -0500 (Fri, 31 Aug 2018) | 3 lines
Updated documentation; building 3.14 for mac release
------------------------------------------------------------------------
r275 | rbd | 2018-08-31 21:20:41 -0500 (Fri, 31 Aug 2018) | 1 line
Fixed extension manager to update installed flags correctly (in Swing thread). Tested browser on Windows.
------------------------------------------------------------------------
r274 | rbd | 2018-08-31 14:35:22 -0500 (Fri, 31 Aug 2018) | 1 line
Forgot to add new file.
------------------------------------------------------------------------
r273 | rbd | 2018-08-31 14:33:02 -0500 (Fri, 31 Aug 2018) | 1 line
Changes for Windows including making paths look prettier using backslash or slash more consistently, adding some tests for empty lists, setting up nyquist directory using Registry's XLISPPATH.
------------------------------------------------------------------------
r272 | rbd | 2018-08-31 14:12:12 -0500 (Fri, 31 Aug 2018) | 2 lines
Everything seems to be working on OS X. Latest fix was to Sound Browser.
------------------------------------------------------------------------
r271 | rbd | 2018-08-31 13:00:54 -0500 (Fri, 31 Aug 2018) | 2 lines
Adapting to Java 10, fixing sound browser in the face of unloaded extensions.
------------------------------------------------------------------------
r270 | rbd | 2018-08-30 13:18:11 -0500 (Thu, 30 Aug 2018) | 2 lines
Installer code sets registry to user-selected nyquist directory.
------------------------------------------------------------------------
r269 | rbd | 2018-08-30 12:53:21 -0500 (Thu, 30 Aug 2018) | 1 line
Getting ready to releasea 3.14. These changes are from Windows.
------------------------------------------------------------------------
r268 | rbd | 2018-08-29 20:06:41 -0500 (Wed, 29 Aug 2018) | 2 lines
Changes for simpler installation with nyquist (lib, doc, runtime, demos) in user read/write file space.
------------------------------------------------------------------------
r267 | rbd | 2018-08-26 20:45:14 -0500 (Sun, 26 Aug 2018) | 2 lines
Added some documentation, worked on browser #anchor urls.
------------------------------------------------------------------------
r266 | rbd | 2018-08-22 18:27:01 -0500 (Wed, 22 Aug 2018) | 2 lines
Fixed some extensions to deal with piano, which now autoloads.
------------------------------------------------------------------------
r265 | rbd | 2018-08-22 12:18:40 -0500 (Wed, 22 Aug 2018) | 2 lines
added one more missing file for v3.13
------------------------------------------------------------------------
r264 | rbd | 2018-08-22 10:54:15 -0500 (Wed, 22 Aug 2018) | 2 lines
left out piano/autoload.lsp, needed for v3.13
------------------------------------------------------------------------
r263 | rbd | 2018-08-22 10:09:16 -0500 (Wed, 22 Aug 2018) | 2 lines
More cleanup for 3.13 release
------------------------------------------------------------------------
r262 | rbd | 2018-08-22 09:54:45 -0500 (Wed, 22 Aug 2018) | 2 lines
More changes for 3.13 including status dialog while downloading extensions.
------------------------------------------------------------------------
r261 | rbd | 2018-08-19 21:34:23 -0500 (Sun, 19 Aug 2018) | 2 lines
Updated documentation for v3.13
------------------------------------------------------------------------
r260 | rbd | 2018-08-19 11:14:07 -0500 (Sun, 19 Aug 2018) | 2 lines
Converted to using Extension Manager
------------------------------------------------------------------------
r259 | rbd | 2018-05-20 19:08:34 -0500 (Sun, 20 May 2018) | 2 lines
Forgot to commit this new file
------------------------------------------------------------------------
r258 | rbd | 2018-03-10 12:11:22 -0600 (Sat, 10 Mar 2018) | 2 lines
Substantial changes to pattern classes in xm.lsp to fix bug. The problems were obscure and unnoticed for a long time, but this new implementation is a major rewrite. I still need to test online course examples to make sure nothing is broken there. Otherwise, my assumption is there are few users and incompatibilities will not matter, so this is regarded as a minor bug fix. Also in this commit is some work on turning libraries and demos into Nyquist extensions supported by an extension manager within NyquistIDE.
------------------------------------------------------------------------
r257 | rbd | 2018-01-21 14:40:58 -0600 (Sun, 21 Jan 2018) | 2 lines
Built nyquist and NyquistIDE on Ubuntu 14.04 LTS and using Oracle Java 9. Minor changes (former build specified Java version 1.7).
------------------------------------------------------------------------
r256 | rbd | 2017-09-24 14:05:06 -0500 (Sun, 24 Sep 2017) | 2 lines
Fix type-checking bug in score-voice
------------------------------------------------------------------------
r255 | rbd | 2017-09-24 10:35:08 -0500 (Sun, 24 Sep 2017) | 2 lines
Updated nyqrelide.iss for Roger's newer windows laptop
------------------------------------------------------------------------
r254 | rbd | 2017-09-24 10:27:05 -0500 (Sun, 24 Sep 2017) | 2 lines
After testing on Windows 7, removed Test button from IDE, made fft_demo not depend so much on XLISPPATH to find pmorales/*.lsp
------------------------------------------------------------------------
r253 | rbd | 2017-09-23 18:44:41 -0500 (Sat, 23 Sep 2017) | 1 line
Changes to compile on MSVS Community 2015
------------------------------------------------------------------------
r252 | rbd | 2017-09-23 17:01:44 -0500 (Sat, 23 Sep 2017) | 2 lines
A few adjustments made to allow examples.sal to run even if "demos" is not on the XLISPPATH
------------------------------------------------------------------------
r251 | rbd | 2017-09-23 16:14:27 -0500 (Sat, 23 Sep 2017) | 2 lines
Minor changes to make this work on Ubuntu linux (or maybe any other linux)
------------------------------------------------------------------------
r250 | rbd | 2017-09-23 14:32:52 -0500 (Sat, 23 Sep 2017) | 2 lines
Fixed version number in IDE About box
------------------------------------------------------------------------
r249 | rbd | 2017-09-23 14:17:16 -0500 (Sat, 23 Sep 2017) | 2 lines
More fixes for 3.12. OS X version setting up symbolic links had bugs.
------------------------------------------------------------------------
r248 | rbd | 2017-09-23 00:31:29 -0500 (Sat, 23 Sep 2017) | 2 lines
Processed documentation for v3.12
------------------------------------------------------------------------
r247 | rbd | 2017-09-22 21:59:18 -0500 (Fri, 22 Sep 2017) | 2 lines
Preparing v3.12.
------------------------------------------------------------------------
r246 | rbd | 2017-09-05 09:27:29 -0500 (Tue, 05 Sep 2017) | 1 line
Fixes for Win10 and many changes to rounding throughout to avoid truncating to 32-bit ints when 64-bits might be available on some architectures. In particular, round() which returns double has been replaced by ROUND32, returning int, and ROUNDBIG returning intptr_t.
------------------------------------------------------------------------
r245 | rbd | 2017-08-24 11:15:22 -0500 (Thu, 24 Aug 2017) | 2 lines
Fixed bug affecting Linux: seq-write-smf was trying to close file twice causing nyquist crash. Fixed by adding intermediate helper function in seqinterf.c so SEQ-WRITE-SMF does not directly call seq_write_smf.
------------------------------------------------------------------------
r244 | rbd | 2016-11-02 13:33:49 -0500 (Wed, 02 Nov 2016) | 2 lines
Forgot to include this in the repo
------------------------------------------------------------------------
r243 | rbd | 2016-10-11 12:23:21 -0500 (Tue, 11 Oct 2016) | 1 line
Prepare for v3.11b
------------------------------------------------------------------------
r242 | rbd | 2016-10-11 12:19:31 -0500 (Tue, 11 Oct 2016) | 2 lines
Improved documentation and formatting. This is for version 3.11b (64-bit Windows only)
------------------------------------------------------------------------
r241 | rbd | 2016-10-11 10:59:51 -0500 (Tue, 11 Oct 2016) | 2 lines
Fixed bug in fftlib.c which took the negative of an unsigned long.
------------------------------------------------------------------------
r240 | rbd | 2016-10-06 15:49:51 -0500 (Thu, 06 Oct 2016) | 2 lines
Fixed spec-plot parameter checking, which was totally broken before.
------------------------------------------------------------------------
r239 | rbd | 2016-10-06 15:23:22 -0500 (Thu, 06 Oct 2016) | 2 lines
Better conversion into Latex and pdf manual. Other minor fixes.
------------------------------------------------------------------------
r238 | rbd | 2016-08-25 13:01:45 -0500 (Thu, 25 Aug 2016) | 1 line
Adding readme for top level download folder on SourceForge.
------------------------------------------------------------------------
r237 | rbd | 2016-08-25 09:07:08 -0500 (Thu, 25 Aug 2016) | 1 line
Install is now for x64 architecture. Fixed cell_aut demo to run in IDE sound browser. Modified NyquistThread to create default XLISPPATH from Nyquist dir instead of cwd.
------------------------------------------------------------------------
r236 | rbd | 2016-08-24 21:25:56 -0500 (Wed, 24 Aug 2016) | 2 lines
minor change during release from OS X
------------------------------------------------------------------------
r235 | rbd | 2016-08-24 21:16:55 -0500 (Wed, 24 Aug 2016) | 2 lines
Making new release
------------------------------------------------------------------------
r234 | rbd | 2016-08-24 21:05:22 -0500 (Wed, 24 Aug 2016) | 2 lines
Adding missing file to repo.
------------------------------------------------------------------------
r233 | rbd | 2016-08-24 09:23:39 -0500 (Wed, 24 Aug 2016) | 1 line
Fixed undefined freeimage problem by moving freeimage out of the conditional compilation. freeimage is defined so that when Nyquist shuts down it can free most of the memory it allocated, minimizing (false positive) reports of memory leaks, which are harmless (except that they obscure true positive messages and seem surprising to non-xlisp experts). Undefined SAVERESTORE flag the way it used to be because save and restore functions (other than freeimage) do not work with the Nyquist SOUND type extension to XLISP.
------------------------------------------------------------------------
r232 | rbd | 2016-07-19 09:39:45 -0500 (Tue, 19 Jul 2016) | 2 lines
I was going to keep "debug" versions separate because of the runtime overhead, but the code started to diverge and it's hard to maintain two versions, so we're going to make all the type checking standard. If you want an optimized version, you could strip out the calls to ny:typecheck using list processing and it would probably work. You could even write NY:OPTIMIZE that would poke into all the function definitions and destructively edit the code.
------------------------------------------------------------------------
r231 | rbd | 2016-07-19 09:34:16 -0500 (Tue, 19 Jul 2016) | 2 lines
moved to test/
------------------------------------------------------------------------
r230 | rbd | 2016-07-19 09:32:11 -0500 (Tue, 19 Jul 2016) | 2 lines
Added extensive type checking to nyquist built-in (but not primitive) functions, and added unit tests for type checking, and incorporated unit tests into regression-test.lsp, a new "grand" test sequence.
------------------------------------------------------------------------
r229 | rbd | 2016-06-23 14:28:03 -0500 (Thu, 23 Jun 2016) | 2 lines
New code to build NyquistIDE.app -- the old appbundler stuff is no longer needed
------------------------------------------------------------------------
r228 | rbd | 2016-06-23 06:44:49 -0500 (Thu, 23 Jun 2016) | 2 lines
Appbundler is Oracle software used to build NyquistIDE - originally from java.net, but it seems to be not an active project (maybe that is good) so let's keep a copy just in case.
------------------------------------------------------------------------
r227 | rbd | 2016-06-22 16:02:26 -0500 (Wed, 22 Jun 2016) | 2 lines
previous change to snd_list_unref was VERY wrong; here is the fix.
------------------------------------------------------------------------
r226 | rbd | 2016-06-22 13:46:44 -0500 (Wed, 22 Jun 2016) | 2 lines
inserted some memory-freeing code from upstream (Audacity); made snd_list_unref non-recursive; CMakeLists.txt was not working on Mac 10.11.5 -- still can't build NyquistIDE, so more changes are on the way
------------------------------------------------------------------------
r225 | rbd | 2016-05-11 10:54:16 -0500 (Wed, 11 May 2016) | 2 lines
Overhaul of new typechecking and parameter validation and error reporting code. Mostly untested, but tests to be done are in typechecks.sal
------------------------------------------------------------------------
r224 | rbd | 2016-05-06 07:56:11 -0500 (Fri, 06 May 2016) | 2 lines
Improved plot in nyqide, progress on validating parameters for SAL, spec-plot defined, autoload spec-plot and piano synthesis functions
------------------------------------------------------------------------
r223 | rbd | 2016-05-03 13:07:14 -0500 (Tue, 03 May 2016) | 2 lines
This contains work in progress on validating parameters in many nyquist functions, fixing liblo for win64, and some security (integer overflow) problems - probably does not compile
------------------------------------------------------------------------
r222 | rbd | 2016-03-16 10:34:15 -0500 (Wed, 16 Mar 2016) | 2 lines
Updated documentation with minor additions and corrections.
------------------------------------------------------------------------
r221 | rbd | 2016-01-15 18:59:45 -0600 (Fri, 15 Jan 2016) | 2 lines
Fixed file name for Browser
------------------------------------------------------------------------
r220 | rbd | 2016-01-15 18:49:15 -0600 (Fri, 15 Jan 2016) | 2 lines
Changes to fix compilation on OS X
------------------------------------------------------------------------
r219 | rbd | 2016-01-15 18:31:23 -0600 (Fri, 15 Jan 2016) | 2 lines
fixed build code for linux, made some c code more compatible
------------------------------------------------------------------------
r218 | rbd | 2016-01-14 17:08:39 -0600 (Thu, 14 Jan 2016) | 1 line
modifications from Windows 7 port (static libraries) and browser files pointed to demos/src new location.
------------------------------------------------------------------------
r217 | rbd | 2016-01-14 13:04:24 -0600 (Thu, 14 Jan 2016) | 2 lines
Now that cmake is in use, we do not need old Makefiles
------------------------------------------------------------------------
r216 | rbd | 2016-01-11 02:00:08 -0600 (Mon, 11 Jan 2016) | 1 line
fixed to compile on XCode
------------------------------------------------------------------------
r215 | rbd | 2016-01-11 01:32:58 -0600 (Mon, 11 Jan 2016) | 1 line
examples tried to play drums, but they may not be installed
------------------------------------------------------------------------
r214 | rbd | 2016-01-11 01:05:00 -0600 (Mon, 11 Jan 2016) | 1 line
more win7 fixes
------------------------------------------------------------------------
r213 | rbd | 2016-01-11 00:42:57 -0600 (Mon, 11 Jan 2016) | 2 lines
more file and path problems fixed
------------------------------------------------------------------------
r212 | rbd | 2016-01-11 00:19:55 -0600 (Mon, 11 Jan 2016) | 2 lines
fixed lpc demo
------------------------------------------------------------------------
r211 | rbd | 2016-01-10 23:45:50 -0600 (Sun, 10 Jan 2016) | 1 line
fix read-float, restore pianosyn.lsp
------------------------------------------------------------------------
r210 | rbd | 2016-01-10 23:36:35 -0600 (Sun, 10 Jan 2016) | 1 line
fix references to demo-snd.aiff which is in demos/audio now
------------------------------------------------------------------------
r209 | rbd | 2016-01-10 22:32:08 -0600 (Sun, 10 Jan 2016) | 1 line
getting 3.10 to run on windows, has temp debug info in pianosyn.lsp
------------------------------------------------------------------------
r208 | rbd | 2016-01-10 20:49:37 -0600 (Sun, 10 Jan 2016) | 2 lines
Forgot to add new demo files
------------------------------------------------------------------------
r207 | rbd | 2016-01-10 20:31:40 -0600 (Sun, 10 Jan 2016) | 2 lines
fixed downsample.c, other minor release problems
------------------------------------------------------------------------
r206 | rbd | 2016-01-10 14:01:58 -0600 (Sun, 10 Jan 2016) | 2 lines
missing files (maybe only cmupvdbg.h is really needed)
------------------------------------------------------------------------
r205 | rbd | 2016-01-10 12:10:01 -0600 (Sun, 10 Jan 2016) | 2 lines
No more scribe, so no more auto generation of text-only documentation. Hopefully HTML will suffice. PDF is now done by latex (but I forgot to move it into the doc directory before).
------------------------------------------------------------------------
r204 | rbd | 2016-01-10 12:01:55 -0600 (Sun, 10 Jan 2016) | 2 lines
Nearing release of 3.10 -- major changes are phasevocoder, convolution, demo documentation
------------------------------------------------------------------------
r203 | rbd | 2016-01-10 11:38:35 -0600 (Sun, 10 Jan 2016) | 2 lines
Made revisions for 3.10. Not quite done yet.
------------------------------------------------------------------------
r202 | rbd | 2015-12-28 22:33:51 -0600 (Mon, 28 Dec 2015) | 2 lines
Updating demos to SAL syntax and better "front page".
------------------------------------------------------------------------
r201 | rbd | 2015-05-20 19:46:16 -0500 (Wed, 20 May 2015) | 2 lines
Fixed more warnings about types. Still working on convolve though.
------------------------------------------------------------------------
r200 | rbd | 2015-05-20 06:16:32 -0500 (Wed, 20 May 2015) | 2 lines
Forgot to move the final pdf of the manual to doc.
------------------------------------------------------------------------
r199 | rbd | 2015-05-20 06:14:25 -0500 (Wed, 20 May 2015) | 2 lines
Fixed some documentation -- it might be complete now. Removed extra play command from organ.lsp.
------------------------------------------------------------------------
r198 | rbd | 2015-05-19 21:32:24 -0500 (Tue, 19 May 2015) | 2 lines
Fixed some problems and warnings when compiling on Ubuntu Linux
------------------------------------------------------------------------
r197 | rbd | 2015-05-19 20:55:04 -0500 (Tue, 19 May 2015) | 2 lines
Merged Win32 changes with OS X, removed some .sln and .vcproj files that are not needed now that we are using CMake
------------------------------------------------------------------------
r196 | rbd | 2015-05-19 20:27:30 -0500 (Tue, 19 May 2015) | 1 line
Got nyquist and jnyqide to build on Windows under Visual Studio Express 2013. Many changes to remove some compiler warnings.
------------------------------------------------------------------------
r195 | rbd | 2015-05-14 21:52:33 -0500 (Thu, 14 May 2015) | 2 lines
better device selection for ALSA and added cross-platform help to find and select devices; added icon to jny on Linux (should work on Windows)
------------------------------------------------------------------------
r194 | rbd | 2015-05-12 21:08:59 -0500 (Tue, 12 May 2015) | 2 lines
still more missing files
------------------------------------------------------------------------
r193 | rbd | 2015-05-12 21:07:41 -0500 (Tue, 12 May 2015) | 2 lines
more missing files
------------------------------------------------------------------------
r192 | rbd | 2015-05-12 21:04:50 -0500 (Tue, 12 May 2015) | 2 lines
another missing file
------------------------------------------------------------------------
r191 | rbd | 2015-05-12 20:56:39 -0500 (Tue, 12 May 2015) | 2 lines
repo missing a file
------------------------------------------------------------------------
r190 | rbd | 2015-05-12 20:28:25 -0500 (Tue, 12 May 2015) | 2 lines
repo is missing a file
------------------------------------------------------------------------
r189 | rbd | 2015-05-12 20:16:10 -0500 (Tue, 12 May 2015) | 2 lines
cleaned out files we don't use
------------------------------------------------------------------------
r188 | rbd | 2015-05-12 12:42:57 -0500 (Tue, 12 May 2015) | 2 lines
Updated liblo to v0.28 and tested that it compiles with nyquist on XCode
------------------------------------------------------------------------
r187 | rbd | 2015-05-12 07:00:06 -0500 (Tue, 12 May 2015) | 2 lines
FLAC changes were incomplete. This revision compiles.
------------------------------------------------------------------------
r186 | rbd | 2015-05-12 06:39:06 -0500 (Tue, 12 May 2015) | 2 lines
Updated FLAC to 1.3.1, removed unnecessary files from local copy of sources.
------------------------------------------------------------------------
r185 | rbd | 2015-05-11 22:51:11 -0500 (Mon, 11 May 2015) | 2 lines
I updated libvorbis from 1.3.5 and deleted unneeded files
------------------------------------------------------------------------
r184 | rbd | 2015-05-11 22:29:41 -0500 (Mon, 11 May 2015) | 2 lines
I decided to just keep sources in libraries that are needed to build Nyquist, so I'm removing lots of build and configuration files. So far, portaudio is updated to V19 and libogg is updated to 1.3.2
------------------------------------------------------------------------
r183 | rbd | 2015-05-11 15:00:14 -0500 (Mon, 11 May 2015) | 2 lines
macosxproject/CMakeLists.txt is now in place to generate nyquist.xcodeproj. Since it is generated by CMake, I removed it from the repo.
------------------------------------------------------------------------
r182 | rbd | 2015-05-11 14:03:53 -0500 (Mon, 11 May 2015) | 2 lines
Added sliders, documentation is now in latex, new Java build, CMake is used to create project in OS X, many other changes. This is NOT a release! Next step will be to get the CMake-built project into the right name and directory.
------------------------------------------------------------------------
r181 | rbd | 2015-03-19 19:40:00 -0500 (Thu, 19 Mar 2015) | 2 lines
This is a failed attempt to use PanDoc to make a Nyquist manual, now that Scribe seems to have died. This is the point where I am changing the code to write directly to Latex.
------------------------------------------------------------------------
r180 | rbd | 2015-03-18 10:17:44 -0500 (Wed, 18 Mar 2015) | 2 lines
Update version numbers to 3.10
------------------------------------------------------------------------
r179 | rbd | 2015-03-17 20:17:35 -0500 (Tue, 17 Mar 2015) | 2 lines
minor bug fixes
------------------------------------------------------------------------
r178 | rbd | 2015-03-17 20:05:13 -0500 (Tue, 17 Mar 2015) | 1 line
Various changes from Windows version.res
This commit is contained in:
Leland Lucius
@@ -6,15 +6,81 @@
|
||||
* of the first parameter.
|
||||
*/
|
||||
|
||||
/* Original convolve.c modified to do fast convolution. Here are some
|
||||
* notes:
|
||||
* The first arg is arbitrary length. The second arg is the impulse
|
||||
* response, which is converted into a table. The FFT size will be
|
||||
* limited to 64K, which allows convolution with up to 32K samples.
|
||||
* For longer impulse responses, we'll have to do convolutions one
|
||||
* 32K block at a time. I considered just limiting the convolution
|
||||
* size and handling longer impulse responses in Nyquist XLISP code,
|
||||
* but that would require taking FFT's of each input block multiple
|
||||
* times. Here, we save the FFT's and reuse them, which should gain
|
||||
* a factor of 2 in speed (we still have to inverse FFT each block
|
||||
* after multiplication, which should take 1/2 the time of doing
|
||||
* FFT/inverse-FFT on each block).
|
||||
*
|
||||
* The fast convolution works like this:
|
||||
* inputs are x_snd and h_snd.
|
||||
* Compute the length of h_snd in samples.
|
||||
* Set fft_size = MAX_FFT_SIZE
|
||||
* If length <= MAX_FFT_SIZE / 4 then
|
||||
* set fft_size = (round length to power of 2) * 2
|
||||
* set N = fft_size/2
|
||||
* Set h_len = (length rounded up to multiple of fft_size/2) * 2
|
||||
* Let L = h_len/ fft_size
|
||||
* Allocate H of h_len floats
|
||||
* Iterate over i from 0 to L-1:
|
||||
* Copy ht with zero fill into H[i] of size fft_size,
|
||||
* where each H[i] of size fft_size is filled with
|
||||
* fft_size/2 samples (except for the last H[i])
|
||||
* Compute FFT of H[i] in place (FFT size is fft_size)
|
||||
* Allocate X of h_len floats. This represents the history
|
||||
* of x_snd, which is initially all zero, so the FFT, X is all zero
|
||||
* Allocate output buffers Y and R, each of size fft_size
|
||||
* Iterate over j (i.e. run this to generate MAX_CONVOLVE_LEN
|
||||
* samples; then j = (j + 1) mod L.
|
||||
* Copy 2nd half of R to first half and zero the 2nd half.
|
||||
* Note: the first time does nothing because R is initially
|
||||
* filled with zeros
|
||||
* Copy fft_size/2 samples of x_snd into X[j],
|
||||
* where X[j] is of size fft_size and filled with
|
||||
* N samples (except when x_snd terminates)
|
||||
* Zero fill X[j]
|
||||
* Compute FFT of X[j] in place.
|
||||
* Iterate k = 0 to L-1
|
||||
* Multiply X[(j-k) mod L] by H[k] (result goes into Y).
|
||||
* Compute IFFT of Y in place. Y is now time domain convolution
|
||||
* of two blocks of samples.
|
||||
* Add Y to R.
|
||||
* Now N samples of R can be output.
|
||||
* For simplicity, we'll keep processing x_snd input even after x_snd
|
||||
* terminates. This will avoid special cases where we do not need all
|
||||
* of X[j] at the end of the convolution.
|
||||
*
|
||||
* Length of output is length of x input + length of h
|
||||
*/
|
||||
|
||||
// You can turn on debugging output with: #define D if (1)
|
||||
#define D if (0)
|
||||
|
||||
#define MAX_IR_LEN 4000000 /* maximum impulse response length */
|
||||
#define MAX_LOG_FFT_SIZE 16 /* maximum fft size for convolution */
|
||||
//#define MAX_LOG_FFT_SIZE 4 /* maximum fft size for convolution */
|
||||
#define _USE_MATH_DEFINES 1 /* for Visual C++ to get M_LN2 */
|
||||
#include <math.h>
|
||||
#include "stdio.h"
|
||||
#ifndef mips
|
||||
#include "stdlib.h"
|
||||
#endif
|
||||
#include "xlisp.h"
|
||||
#include "sound.h"
|
||||
#include "samples.h"
|
||||
|
||||
#include "falloc.h"
|
||||
#include "cext.h"
|
||||
#include "fftlib.h"
|
||||
#include "fftext.h"
|
||||
#include "convolve.h"
|
||||
|
||||
void convolve_free();
|
||||
@@ -23,21 +89,25 @@ void convolve_free();
|
||||
typedef struct convolve_susp_struct {
|
||||
snd_susp_node susp;
|
||||
long terminate_cnt;
|
||||
boolean know_end_of_x;
|
||||
boolean logically_stopped;
|
||||
sound_type x_snd;
|
||||
long x_snd_cnt;
|
||||
sample_block_values_type x_snd_ptr;
|
||||
|
||||
table_type table;
|
||||
sample_type *h_buf;
|
||||
double length_of_h;
|
||||
long h_len;
|
||||
long x_buf_len;
|
||||
sample_type *x_buffer_pointer;
|
||||
sample_type *x_buffer_current;
|
||||
sample_type *X; // the FFTs of x_snd
|
||||
int j; // which block are we processing? 0 <= j < L
|
||||
sample_type *H; // the FFTs of h_snd
|
||||
sample_type *Y; // product of X*H where we inverse FFT
|
||||
int h_snd_len; // true length of h_snd in samples
|
||||
int N; // length of convolution, FFTs are of size 2*N
|
||||
int M; // log2 of 2*N, the FFT size
|
||||
int L; // number of blocks: h_len / (2*N)
|
||||
sample_type *R; // result buffer where output is summed
|
||||
sample_type *R_current; // pointer to next sample to output
|
||||
} convolve_susp_node, *convolve_susp_type;
|
||||
|
||||
|
||||
/*
|
||||
void h_reverse(sample_type *h, long len)
|
||||
{
|
||||
sample_type temp;
|
||||
@@ -50,10 +120,11 @@ void h_reverse(sample_type *h, long len)
|
||||
len--;
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
|
||||
void convolve_s_fetch(register convolve_susp_type susp, snd_list_type snd_list)
|
||||
void convolve_s_fetch(snd_susp_type a_susp, snd_list_type snd_list)
|
||||
{
|
||||
convolve_susp_type susp = (convolve_susp_type) a_susp;
|
||||
int cnt = 0; /* how many samples computed */
|
||||
int togo;
|
||||
int n;
|
||||
@@ -62,191 +133,218 @@ void convolve_s_fetch(register convolve_susp_type susp, snd_list_type snd_list)
|
||||
|
||||
register sample_block_values_type out_ptr_reg;
|
||||
|
||||
register sample_type * h_buf_reg;
|
||||
register long h_len_reg;
|
||||
register long x_buf_len_reg;
|
||||
register sample_type * x_buffer_pointer_reg;
|
||||
register sample_type * x_buffer_current_reg;
|
||||
register sample_type x_snd_scale_reg = susp->x_snd->scale;
|
||||
register sample_block_values_type x_snd_ptr_reg;
|
||||
sample_type *R = susp->R;
|
||||
sample_type *R_current;
|
||||
int N = susp->N;
|
||||
falloc_sample_block(out, "convolve_s_fetch");
|
||||
out_ptr = out->samples;
|
||||
snd_list->block = out;
|
||||
|
||||
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 x_snd input sample block: */
|
||||
/* based on susp_check_term_log_samples, but offset by h_len */
|
||||
|
||||
/* THIS IS EXPANDED BELOW
|
||||
* susp_check_term_log_samples(x_snd, x_snd_ptr, x_snd_cnt);
|
||||
*/
|
||||
if (susp->x_snd_cnt == 0) {
|
||||
susp_get_samples(x_snd, x_snd_ptr, x_snd_cnt);
|
||||
|
||||
/* THIS IS EXPANDED BELOW
|
||||
*logical_stop_test(x_snd, susp->x_snd_cnt);
|
||||
*/
|
||||
if (susp->x_snd->logical_stop_cnt ==
|
||||
susp->x_snd->current - susp->x_snd_cnt) {
|
||||
min_cnt(&susp->susp.log_stop_cnt, susp->x_snd,
|
||||
(snd_susp_type) susp, susp->x_snd_cnt);
|
||||
}
|
||||
|
||||
/* THIS IS EXPANDED BELOW
|
||||
* terminate_test(x_snd_ptr, x_snd, susp->x_snd_cnt);
|
||||
*/
|
||||
if (susp->x_snd_ptr == zero_block->samples) {
|
||||
/* ### modify this to terminate at an offset of (susp->h_len) */
|
||||
/* Note: in the min_cnt function, susp->x_snd_cnt is *subtracted*
|
||||
* from susp->x_snd->current to form the terminate time, so to
|
||||
* increase the time, we need to *subtract* susp->h_len, which
|
||||
* due to the double negative, *adds* susp->h_len to the ultimate
|
||||
* terminate time calculation.
|
||||
/* first compute how many samples to generate in inner loop: */
|
||||
/* don't overflow the output sample block: */
|
||||
togo = max_sample_block_len - cnt;
|
||||
/* if we need output samples, generate them here */
|
||||
D printf("test R_current at offset %td\n", susp->R_current - R);
|
||||
if (susp->R_current >= R + N) { // true when we output half of R
|
||||
int i = 0;
|
||||
int k;
|
||||
sample_type *Xj = susp->X + susp->j * N * 2;
|
||||
sample_type *H = susp->H;
|
||||
sample_type *Y = susp->Y;
|
||||
int to_copy;
|
||||
/* Shift R, zero fill: */
|
||||
memcpy(R, R + N, N * sizeof(*R));
|
||||
memset(R + N, 0, N * sizeof(*R));
|
||||
/* Copy N samples of x_snd into Xj and zero fill to size 2N */
|
||||
D printf("Copying N samples of x_snd into Xj at offset %td\n", Xj - susp->X);
|
||||
while (i < N) {
|
||||
if (susp->x_snd_cnt == 0) {
|
||||
susp_get_samples(x_snd, x_snd_ptr, x_snd_cnt);
|
||||
if (susp->x_snd->logical_stop_cnt ==
|
||||
susp->x_snd->current - susp->x_snd_cnt) {
|
||||
min_cnt(&susp->susp.log_stop_cnt, susp->x_snd,
|
||||
(snd_susp_type) susp, susp->x_snd_cnt);
|
||||
}
|
||||
}
|
||||
/* This code is not standard. Since we extend the terminate
|
||||
* count by susp->h_snd_len, the "standard" call to min_cnt()
|
||||
* results in extending the terminate time forever. Instead,
|
||||
* we make this code run once only by setting know_end_of_x.
|
||||
*/
|
||||
if (!susp->know_end_of_x &&
|
||||
susp->x_snd_ptr == zero_block->samples) {
|
||||
susp->terminate_cnt = susp->x_snd->current - susp->x_snd_cnt;
|
||||
/* extend the output to include impulse response */
|
||||
susp->terminate_cnt += susp->h_snd_len;
|
||||
susp->know_end_of_x = TRUE;
|
||||
}
|
||||
/* copy no more than the remaining space and no more than
|
||||
* the amount remaining in the block
|
||||
*/
|
||||
min_cnt(&susp->terminate_cnt, susp->x_snd,
|
||||
(snd_susp_type) susp, susp->x_snd_cnt - susp->h_len);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
togo = min(togo, susp->x_snd_cnt);
|
||||
|
||||
/* don't run past terminate time */
|
||||
if (susp->terminate_cnt != UNKNOWN &&
|
||||
susp->terminate_cnt <= susp->susp.current + cnt + togo) {
|
||||
togo = susp->terminate_cnt - (susp->susp.current + cnt);
|
||||
if (togo == 0) break;
|
||||
}
|
||||
|
||||
|
||||
/* don't run past logical stop time */
|
||||
if (!susp->logically_stopped && susp->susp.log_stop_cnt != UNKNOWN) {
|
||||
int to_stop = susp->susp.log_stop_cnt - (susp->susp.current + cnt);
|
||||
/* break if to_stop == 0 (we're at the logical stop)
|
||||
* AND cnt > 0 (we're not at the beginning of the
|
||||
* output block).
|
||||
*/
|
||||
if (to_stop < togo) {
|
||||
if (to_stop == 0) {
|
||||
if (cnt) {
|
||||
togo = 0;
|
||||
break;
|
||||
} else /* keep togo as is: since cnt == 0, we
|
||||
* can set the logical stop flag on this
|
||||
* output block
|
||||
*/
|
||||
susp->logically_stopped = true;
|
||||
} else /* limit togo so we can start a new
|
||||
* block at the LST
|
||||
*/
|
||||
togo = to_stop;
|
||||
}
|
||||
}
|
||||
|
||||
n = togo;
|
||||
h_buf_reg = susp->h_buf;
|
||||
h_len_reg = susp->h_len;
|
||||
x_buf_len_reg = susp->x_buf_len;
|
||||
x_buffer_pointer_reg = susp->x_buffer_pointer;
|
||||
x_buffer_current_reg = susp->x_buffer_current;
|
||||
x_snd_ptr_reg = susp->x_snd_ptr;
|
||||
out_ptr_reg = out_ptr;
|
||||
if (n) do { /* the inner sample computation loop */
|
||||
long i; double sum;
|
||||
/* see if we've reached end of x_buffer */
|
||||
if ((x_buffer_pointer_reg + x_buf_len_reg) <= (x_buffer_current_reg + h_len_reg)) {
|
||||
/* shift x_buffer from current back to base */
|
||||
for (i = 1; i < h_len_reg; i++) {
|
||||
x_buffer_pointer_reg[i-1] = x_buffer_current_reg[i];
|
||||
}
|
||||
/* this will be incremented back to x_buffer_pointer_reg below */
|
||||
x_buffer_current_reg = x_buffer_pointer_reg - 1;
|
||||
to_copy = min(N - i, susp->x_snd_cnt);
|
||||
memcpy(Xj + i, susp->x_snd_ptr,
|
||||
to_copy * sizeof(*susp->x_snd_ptr));
|
||||
susp->x_snd_ptr += to_copy;
|
||||
susp->x_snd_cnt -= to_copy;
|
||||
i += to_copy;
|
||||
}
|
||||
|
||||
x_buffer_current_reg++;
|
||||
|
||||
x_buffer_current_reg[h_len_reg - 1] = (x_snd_scale_reg * *x_snd_ptr_reg++);
|
||||
|
||||
sum = 0.0;
|
||||
for (i = 0; i < h_len_reg; i++) {
|
||||
sum += x_buffer_current_reg[i] * h_buf_reg[i];
|
||||
/* zero fill to size 2N */
|
||||
memset(Xj + N, 0, N * sizeof(Xj[0]));
|
||||
D printf("Xj at offset %td: ", Xj - susp->X);
|
||||
D for (i = 0; i < susp->N * 2; i++) {
|
||||
printf("%g ", Xj[i]);
|
||||
}
|
||||
D printf("\n");
|
||||
/* Compute FFT of Xj in place */
|
||||
fftInit(susp->M);
|
||||
rffts(Xj, susp->M, 1);
|
||||
/* convolve pairs of blocks and sum into Y */
|
||||
memset(Y, 0, N * sizeof(*Y)); /* initialize sum to zero */
|
||||
for (k = 0; k < susp->L; k++) {
|
||||
/* Multiply Xj by H (result goes into X) */
|
||||
sample_type *X = susp->X + ((susp->L + susp->j - k) % susp->L) * N * 2;
|
||||
rspectprod(X, H + k * N * 2, Y, N * 2);
|
||||
/* Compute IFFT of Y in place */
|
||||
riffts(Y, susp->M, 1);
|
||||
/* R += Y */
|
||||
D printf("Output block %d, X offset %td: ", k, X - susp->X);
|
||||
for (i = 0; i < 2 * N; i++) {
|
||||
R[i] += Y[i];
|
||||
D printf("%g ", Y[i]);
|
||||
}
|
||||
D printf("\n");
|
||||
}
|
||||
/* now N samples of R can be output */
|
||||
susp->R_current = R;
|
||||
D printf("R: ");
|
||||
D for (i = 0; i < susp->N; i++) {
|
||||
printf("%g ", R[i]);
|
||||
}
|
||||
D printf("\n");
|
||||
susp->j = (susp->j + 1) % susp->L;
|
||||
}
|
||||
/* compute togo, the number of samples to "compute" */
|
||||
/* can't use more than what's left in R. R_current is
|
||||
the next sample of R, so what's left is N - (R - R_current) */
|
||||
R_current = susp->R_current;
|
||||
togo = min(togo, N - (R_current - R));
|
||||
|
||||
/* don't run past terminate time */
|
||||
if (susp->terminate_cnt != UNKNOWN &&
|
||||
susp->terminate_cnt <= susp->susp.current + cnt + togo) {
|
||||
togo = susp->terminate_cnt - (susp->susp.current + cnt);
|
||||
if (togo == 0) break;
|
||||
}
|
||||
|
||||
*out_ptr_reg++ = (sample_type) sum;
|
||||
} while (--n); /* inner loop */
|
||||
/* don't run past logical stop time */
|
||||
if (!susp->logically_stopped &&
|
||||
susp->susp.log_stop_cnt != UNKNOWN &&
|
||||
susp->susp.log_stop_cnt <= susp->susp.current + cnt + togo) {
|
||||
togo = susp->susp.log_stop_cnt - (susp->susp.current + cnt);
|
||||
D printf("susp->susp.log_stop_cnt is set to %ld\n",
|
||||
susp->susp.log_stop_cnt);
|
||||
if (togo == 0) break;
|
||||
}
|
||||
|
||||
susp->x_buffer_pointer = x_buffer_pointer_reg;
|
||||
susp->x_buffer_current = x_buffer_current_reg;
|
||||
/* using x_snd_ptr_reg is a bad idea on RS/6000: */
|
||||
susp->x_snd_ptr += togo;
|
||||
out_ptr += togo;
|
||||
susp_took(x_snd_cnt, togo);
|
||||
cnt += togo;
|
||||
n = togo;
|
||||
out_ptr_reg = out_ptr;
|
||||
if (n) do { /* the inner sample computation loop */
|
||||
*out_ptr_reg++ = (sample_type) *R_current++;
|
||||
} while (--n); /* inner loop */
|
||||
|
||||
/* using R_current is a bad idea on RS/6000: */
|
||||
susp->R_current += togo;
|
||||
out_ptr += togo;
|
||||
cnt += togo;
|
||||
} /* outer loop */
|
||||
|
||||
/* test for termination */
|
||||
if (togo == 0 && cnt == 0) {
|
||||
snd_list_terminate(snd_list);
|
||||
snd_list_terminate(snd_list);
|
||||
} else {
|
||||
snd_list->block_len = cnt;
|
||||
susp->susp.current += cnt;
|
||||
snd_list->block_len = cnt;
|
||||
susp->susp.current += cnt;
|
||||
}
|
||||
/* test for logical stop */
|
||||
if (susp->logically_stopped) {
|
||||
snd_list->logically_stopped = true;
|
||||
snd_list->logically_stopped = true;
|
||||
} else if (susp->susp.log_stop_cnt == susp->susp.current) {
|
||||
susp->logically_stopped = true;
|
||||
susp->logically_stopped = true;
|
||||
}
|
||||
} /* convolve_s_fetch */
|
||||
|
||||
|
||||
void convolve_toss_fetch(susp, snd_list)
|
||||
register convolve_susp_type susp;
|
||||
snd_list_type snd_list;
|
||||
void convolve_toss_fetch(snd_susp_type a_susp, snd_list_type snd_list)
|
||||
{
|
||||
convolve_susp_type susp = (convolve_susp_type) a_susp;
|
||||
time_type final_time = susp->susp.t0;
|
||||
long n;
|
||||
|
||||
/* fetch samples from x_snd up to final_time for this block of zeros */
|
||||
while ((round((final_time - susp->x_snd->t0) * susp->x_snd->sr)) >=
|
||||
while ((ROUNDBIG((final_time - susp->x_snd->t0) * susp->x_snd->sr)) >=
|
||||
susp->x_snd->current)
|
||||
susp_get_samples(x_snd, x_snd_ptr, x_snd_cnt);
|
||||
/* convert to normal processing when we hit final_count */
|
||||
/* we want each signal positioned at final_time */
|
||||
n = round((final_time - susp->x_snd->t0) * susp->x_snd->sr -
|
||||
(susp->x_snd->current - susp->x_snd_cnt));
|
||||
n = ROUNDBIG((final_time - susp->x_snd->t0) * susp->x_snd->sr -
|
||||
(susp->x_snd->current - susp->x_snd_cnt));
|
||||
susp->x_snd_ptr += n;
|
||||
susp_took(x_snd_cnt, n);
|
||||
susp->susp.fetch = susp->susp.keep_fetch;
|
||||
(*(susp->susp.fetch))((snd_susp_type)susp, snd_list);
|
||||
(*(susp->susp.fetch))(a_susp, snd_list);
|
||||
}
|
||||
|
||||
|
||||
void convolve_mark(convolve_susp_type susp)
|
||||
void convolve_mark(snd_susp_type a_susp)
|
||||
{
|
||||
convolve_susp_type susp = (convolve_susp_type) a_susp;
|
||||
sound_xlmark(susp->x_snd);
|
||||
}
|
||||
|
||||
|
||||
void convolve_free(convolve_susp_type susp)
|
||||
void convolve_free(snd_susp_type a_susp)
|
||||
{
|
||||
table_unref(susp->table);
|
||||
free(susp->x_buffer_pointer); sound_unref(susp->x_snd);
|
||||
convolve_susp_type susp = (convolve_susp_type) a_susp;
|
||||
free(susp->R);
|
||||
free(susp->X);
|
||||
free(susp->Y);
|
||||
free(susp->H);
|
||||
sound_unref(susp->x_snd);
|
||||
ffree_generic(susp, sizeof(convolve_susp_node), "convolve_free");
|
||||
}
|
||||
|
||||
|
||||
void convolve_print_tree(convolve_susp_type susp, int n)
|
||||
void convolve_print_tree(snd_susp_type a_susp, int n)
|
||||
{
|
||||
convolve_susp_type susp = (convolve_susp_type) a_susp;
|
||||
indent(n);
|
||||
stdputstr("x_snd:");
|
||||
sound_print_tree_1(susp->x_snd, n);
|
||||
}
|
||||
|
||||
void fill_with_samples(sample_type *x, sound_type s, long n)
|
||||
{
|
||||
/* this is based on snd_fetch in samples.c */
|
||||
#define CNT extra[1]
|
||||
#define INDEX extra[2]
|
||||
#define FIELDS 3
|
||||
#define SAMPLES list->block->samples
|
||||
int i;
|
||||
for (i = 0; i < n; i++) {
|
||||
if (!s->extra) { /* this is the first call, so fix up s */
|
||||
s->extra = (long *) malloc(sizeof(long) * FIELDS);
|
||||
s->extra[0] = sizeof(long) * FIELDS;
|
||||
s->CNT = s->INDEX = 0;
|
||||
}
|
||||
if (s->CNT == s->INDEX) {
|
||||
sound_get_next(s, &(s->CNT));
|
||||
s->INDEX = 0;
|
||||
}
|
||||
x[i] = s->SAMPLES[s->INDEX++] * s->scale;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
sound_type snd_make_convolve(sound_type x_snd, sound_type h_snd)
|
||||
{
|
||||
@@ -255,17 +353,80 @@ sound_type snd_make_convolve(sound_type x_snd, sound_type h_snd)
|
||||
time_type t0 = x_snd->t0;
|
||||
sample_type scale_factor = 1.0F;
|
||||
time_type t0_min = t0;
|
||||
long h_len;
|
||||
int i;
|
||||
// assume fft_size is maximal. We fix this later if it is wrong
|
||||
long fft_size = 1 << MAX_LOG_FFT_SIZE;
|
||||
if (sr != h_snd->sr) {
|
||||
xlfail("convolve requires both inputs to have the same sample rates");
|
||||
}
|
||||
falloc_generic(susp, convolve_susp_node, "snd_make_convolve");
|
||||
susp->table = sound_to_table(h_snd);
|
||||
susp->h_buf = susp->table->samples;
|
||||
susp->length_of_h = susp->table->length;
|
||||
susp->h_len = (long) susp->length_of_h;
|
||||
h_reverse(susp->h_buf, susp->h_len);
|
||||
susp->x_buf_len = 2 * susp->h_len;
|
||||
susp->x_buffer_pointer = calloc((2 * (susp->h_len)), sizeof(float));
|
||||
susp->x_buffer_current = susp->x_buffer_pointer;
|
||||
susp->susp.fetch = (snd_fetch_fn)convolve_s_fetch;
|
||||
/* compute the length of h_snd in samples */
|
||||
h_len = snd_length(h_snd, MAX_IR_LEN + 1);
|
||||
if (h_len > MAX_IR_LEN) {
|
||||
char emsg[100];
|
||||
sprintf(emsg, "convolve maximum impulse length is %d", MAX_IR_LEN);
|
||||
xlfail(emsg);
|
||||
}
|
||||
/* len is the impulse response length;
|
||||
* the FFT size is at least double that */
|
||||
if (h_len <= fft_size / 4) {
|
||||
/* compute log-base-2(h_len): */;
|
||||
double log_len = log(h_len) / M_LN2;
|
||||
int log_len_int = log_len;
|
||||
if (log_len_int != log_len) log_len_int++; /* round up to power of 2 */
|
||||
susp->M = log_len_int + 1;
|
||||
} else {
|
||||
susp->M = MAX_LOG_FFT_SIZE;
|
||||
}
|
||||
fft_size = (1 << susp->M);
|
||||
D printf("fft_size %ld\n", fft_size);
|
||||
susp->N = fft_size / 2;
|
||||
// round h_len up to multiple of susp->N and multiply by 2
|
||||
susp->h_snd_len = h_len;
|
||||
h_len = ((h_len + susp->N - 1) / susp->N) * susp->N * 2;
|
||||
susp->L = h_len / fft_size;
|
||||
// allocate memory
|
||||
susp->H = (sample_type *) calloc(h_len, sizeof(susp->H[0]));
|
||||
if (!susp->H) {
|
||||
xlfail("memory allocation failure in convolve");
|
||||
}
|
||||
for (i = 0; i < susp->L; i++) {
|
||||
/* copy fft_size/2 samples into each H[i] */
|
||||
fill_with_samples(susp->H + i * susp->N * 2, h_snd, susp->N);
|
||||
}
|
||||
for (i = 0; i < susp->L; i++) {
|
||||
int j;
|
||||
float *H = susp->H + i * susp->N * 2;
|
||||
D printf("H_%d at %td: ", i, H - susp->H);
|
||||
D for (j = 0; j < susp->N * 2; j++) printf("%g ", H[j]);
|
||||
D printf("\n");
|
||||
}
|
||||
sound_unref(h_snd);
|
||||
h_snd = NULL;
|
||||
/* remaining N samples are already zero-filled */
|
||||
if (fftInit(susp->M)) {
|
||||
free(susp->H);
|
||||
xlfail("fft initialization error in convolve");
|
||||
}
|
||||
/* take the FFT of each block of the impulse response */
|
||||
for (i = 0; i < susp->L; i++) {
|
||||
rffts(susp->H + i * susp->N * 2, susp->M, 1);
|
||||
}
|
||||
susp->X = (sample_type *) calloc(h_len, sizeof(susp->X[0]));
|
||||
susp->R = (sample_type *) calloc(fft_size, sizeof(susp->R[0]));
|
||||
susp->Y = (sample_type *) calloc(fft_size, sizeof(susp->Y[0]));
|
||||
if (!susp->X || !susp->R || !susp->Y) {
|
||||
free(susp->H);
|
||||
if (susp->X) free(susp->X);
|
||||
if (susp->R) free(susp->R);
|
||||
if (susp->Y) free(susp->Y);
|
||||
xlfail("memory allocation failed in convolve");
|
||||
}
|
||||
susp->R_current = susp->R + susp->N;
|
||||
susp->susp.fetch = &convolve_s_fetch;
|
||||
susp->terminate_cnt = UNKNOWN;
|
||||
susp->know_end_of_x = FALSE;
|
||||
/* handle unequal start times, if any */
|
||||
if (t0 < x_snd->t0) sound_prepend_zeros(x_snd, t0);
|
||||
/* minimum start time over all inputs: */
|
||||
@@ -273,22 +434,23 @@ sound_type snd_make_convolve(sound_type x_snd, sound_type h_snd)
|
||||
/* how many samples to toss before t0: */
|
||||
susp->susp.toss_cnt = (long) ((t0 - t0_min) * sr + 0.5);
|
||||
if (susp->susp.toss_cnt > 0) {
|
||||
susp->susp.keep_fetch = (snd_fetch_fn)susp->susp.fetch;
|
||||
susp->susp.keep_fetch = susp->susp.fetch;
|
||||
susp->susp.fetch = convolve_toss_fetch;
|
||||
}
|
||||
|
||||
/* initialize susp state */
|
||||
susp->susp.free = (snd_free_fn)convolve_free;
|
||||
susp->susp.free = convolve_free;
|
||||
susp->susp.sr = sr;
|
||||
susp->susp.t0 = t0;
|
||||
susp->susp.mark = (snd_mark_fn)convolve_mark;
|
||||
susp->susp.print_tree = (snd_print_tree_fn)convolve_print_tree;
|
||||
susp->susp.mark = convolve_mark;
|
||||
susp->susp.print_tree = convolve_print_tree;
|
||||
susp->susp.name = "convolve";
|
||||
susp->logically_stopped = false;
|
||||
susp->susp.log_stop_cnt = logical_stop_cnt_cvt(x_snd);
|
||||
susp->susp.current = 0;
|
||||
susp->x_snd = x_snd;
|
||||
susp->x_snd_cnt = 0;
|
||||
susp->j = 0;
|
||||
return sound_create((snd_susp_type)susp, t0, sr, scale_factor);
|
||||
}
|
||||
|
||||
@@ -296,5 +458,6 @@ sound_type snd_make_convolve(sound_type x_snd, sound_type h_snd)
|
||||
sound_type snd_convolve(sound_type x_snd, sound_type h_snd)
|
||||
{
|
||||
sound_type x_snd_copy = sound_copy(x_snd);
|
||||
return snd_make_convolve(x_snd_copy, h_snd);
|
||||
sound_type h_snd_copy = sound_copy(h_snd);
|
||||
return snd_make_convolve(x_snd_copy, h_snd_copy);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user