diff --git a/MicroDexed.ino b/MicroDexed.ino index 033d258..8e19574 100644 --- a/MicroDexed.ino +++ b/MicroDexed.ino @@ -458,7 +458,6 @@ void setup() { Serial.println(instance_id, DEC); #endif create_audio_dexed_chain(instance_id); - MicroDexed[instance_id]->setCompressor(true); } #ifdef DEBUG for (uint8_t instance_id = 0; instance_id < NUM_DEXED; instance_id++) { diff --git a/third-party/Synth_Dexed/examples/synth_dexed.ino b/third-party/Synth_Dexed/examples/synth_dexed.ino deleted file mode 100755 index e3132af..0000000 --- a/third-party/Synth_Dexed/examples/synth_dexed.ino +++ /dev/null @@ -1,69 +0,0 @@ -#include -#include "synth_dexed.h" - -uint8_t fmpiano_sysex[156] = { - 95, 29, 20, 50, 99, 95, 00, 00, 41, 00, 19, 00, 00, 03, 00, 06, 79, 00, 01, 00, 14, // OP6 eg_rate_1-4, level_1-4, kbd_lev_scl_brk_pt, kbd_lev_scl_lft_depth, kbd_lev_scl_rht_depth, kbd_lev_scl_lft_curve, kbd_lev_scl_rht_curve, kbd_rate_scaling, amp_mod_sensitivity, key_vel_sensitivity, operator_output_level, osc_mode, osc_freq_coarse, osc_freq_fine, osc_detune - 95, 20, 20, 50, 99, 95, 00, 00, 00, 00, 00, 00, 00, 03, 00, 00, 99, 00, 01, 00, 00, // OP5 - 95, 29, 20, 50, 99, 95, 00, 00, 00, 00, 00, 00, 00, 03, 00, 06, 89, 00, 01, 00, 07, // OP4 - 95, 20, 20, 50, 99, 95, 00, 00, 00, 00, 00, 00, 00, 03, 00, 02, 99, 00, 01, 00, 07, // OP3 - 95, 50, 35, 78, 99, 75, 00, 00, 00, 00, 00, 00, 00, 03, 00, 07, 58, 00, 14, 00, 07, // OP2 - 96, 25, 25, 67, 99, 75, 00, 00, 00, 00, 00, 00, 00, 03, 00, 02, 99, 00, 01, 00, 10, // OP1 - 94, 67, 95, 60, 50, 50, 50, 50, // 4 * pitch EG rates, 4 * pitch EG level - 04, 06, 00, // algorithm, feedback, osc sync - 34, 33, 00, 00, 00, 04, // lfo speed, lfo delay, lfo pitch_mod_depth, lfo_amp_mod_depth, lfo_sync, lfo_waveform - 03, 24, // pitch_mod_sensitivity, transpose - 70, 77, 45, 80, 73, 65, 78, 79, 00, 00 // 10 * char for name ("DEFAULT ") -}; // FM-Piano - -AudioSynthDexed dexed(4,SAMPLE_RATE); // 4 voices max -AudioOutputI2S i2s1; -AudioControlSGTL5000 sgtl5000_1; -AudioConnection patchCord1(dexed, 0, i2s1, 0); -AudioConnection patchCord2(dexed, 0, i2s1, 1); - -void setup() -{ - AudioMemory(32); - - sgtl5000_1.enable(); - sgtl5000_1.lineOutLevel(29); - sgtl5000_1.dacVolumeRamp(); - sgtl5000_1.dacVolume(1.0); - sgtl5000_1.unmuteHeadphone(); - sgtl5000_1.unmuteLineout(); - sgtl5000_1.volume(0.8, 0.8); // Headphone volume -} - -void loop() -{ - static uint8_t count; - - if (count % 2 == 0) - { - dexed.loadInitVoice(); - } - else - { - dexed.loadVoiceParameters(fmpiano_sysex); - dexed.setTranspose(36); - } - - Serial.println("Key-Down"); - dexed.keydown(48, 100); - delay(100); - dexed.keydown(52, 100); - delay(100); - dexed.keydown(55, 100); - delay(100); - dexed.keydown(60, 100); - delay(2000); - - Serial.println("Key-Up"); - dexed.keyup(48); - dexed.keyup(52); - dexed.keyup(55); - dexed.keyup(60); - delay(2000); - - count++; -} diff --git a/third-party/Synth_Dexed/src/compressor.h b/third-party/Synth_Dexed/src/compressor.h index 22331eb..808cd30 100644 --- a/third-party/Synth_Dexed/src/compressor.h +++ b/third-party/Synth_Dexed/src/compressor.h @@ -15,7 +15,7 @@ #ifndef _COMPRESSOR_H #define _COMPRESSOR_H -#ifdef USE_DEXED_COMPRESSOR +#ifndef TEENSYDUINO #include //ARM DSP extensions. https://www.keil.com/pack/doc/CMSIS/DSP/html/index.html #include "synth.h" @@ -423,5 +423,7 @@ class Compressor }; -#endif +#else +#warning USING TEENSYDUINO SO INTERNAL COMPRESSOR IS DISABLED! +#endif // TEENSYDUINO #endif diff --git a/third-party/Synth_Dexed/src/dexed.cpp b/third-party/Synth_Dexed/src/dexed.cpp index 7494622..81dfdda 100644 --- a/third-party/Synth_Dexed/src/dexed.cpp +++ b/third-party/Synth_Dexed/src/dexed.cpp @@ -74,7 +74,9 @@ Dexed::Dexed(uint8_t maxnotes, int rate) xrun = 0; render_time_max = 0; +#ifndef TEENSYDUINO compressor = new Compressor(samplerate); +#endif use_compressor = false; } @@ -188,8 +190,10 @@ void Dexed::getSamples(float32_t* buffer, uint16_t n_samples) fx.process(buffer, n_samples); // Needed for fx.Gain()!!! +#ifndef TEENSYDUINO if (use_compressor == true) compressor->doCompression(buffer, n_samples); +#endif } void Dexed::getSamples(int16_t* buffer, uint16_t n_samples) @@ -1661,6 +1665,7 @@ void Dexed::getName(char* buffer) buffer[10] = '\0'; } +#ifndef TEENSYDUINO void Dexed::setCompressor(bool enable_compressor) { use_compressor = enable_compressor; @@ -1720,3 +1725,4 @@ float32_t Dexed::getCompressionRatio(void) { return (compressor->getCompressionRatio()); } +#endif diff --git a/third-party/Synth_Dexed/src/dexed.h b/third-party/Synth_Dexed/src/dexed.h index b86468d..2b7afca 100644 --- a/third-party/Synth_Dexed/src/dexed.h +++ b/third-party/Synth_Dexed/src/dexed.h @@ -23,7 +23,7 @@ */ -#define USE_DEXED_COMPRESSOR 1 +//#define DISABLE_DEXED_COMPRESSOR 1 #ifndef DEXED_H_INCLUDED #define DEXED_H_INCLUDED @@ -175,6 +175,7 @@ class Dexed uint16_t getRenderTimeMax(void); void resetRenderTimeMax(void); void ControllersRefresh(void); +#ifndef TEENSYDUINO void setCompressor(bool comp); bool getCompressor(void); void setCompressorPreGain_dB(float32_t pre_gain); @@ -187,6 +188,7 @@ class Dexed float32_t getCompressorRelease_sec(void); float32_t getCompressorThresh_dBFS(void); float32_t getCompressionRatio(void); +#endif int16_t checkSystemExclusive(const uint8_t* sysex, const uint16_t len); // Sound methods @@ -352,7 +354,9 @@ class Dexed void getSamples(int16_t* buffer, uint16_t n_samples); void compress(float32_t* wav_in, float32_t* wav_out, uint16_t n, float32_t threshold, float32_t slope, uint16_t sr, float32_t tla, float32_t twnd, float32_t tatt, float32_t trel); bool use_compressor; +#ifndef TEENSYDUINO Compressor* compressor; +#endif }; #endif diff --git a/third-party/Synth_Dexed/src/teensy_board_detection.h b/third-party/Synth_Dexed/src/teensy_board_detection.h deleted file mode 100755 index 83d55ef..0000000 --- a/third-party/Synth_Dexed/src/teensy_board_detection.h +++ /dev/null @@ -1,50 +0,0 @@ -/* - MicroDexed - - MicroDexed is a port of the Dexed sound engine - (https://github.com/asb2m10/dexed) for the Teensy-3.5/3.6/4.x with audio shield. - Dexed ist heavily based on https://github.com/google/music-synthesizer-for-android - - (c)2018-2021 H. Wirtz - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -*/ - -#ifndef TEENSY_BOARD_DETECTION_H_INCLUDED -#define TEENSY_BOARD_DETECTION_H_INCLUDED - - -// Teensy-4.x -#if defined(__IMXRT1062__) || defined (ARDUINO_TEENSY40) || defined (ARDUINO_TEENSY41) -#define TEENSY4 -#if defined (ARDUINO_TEENSY40) -#define TEENSY4_0 -#elif defined (ARDUINO_TEENSY41) -#define TEENSY4_1 -#endif -#endif - -// Teensy-3.6 -#if defined(__MK66FX1M0__) -# define TEENSY3_6 -#endif - -// Teensy-3.5 -#if defined (__MK64FX512__) -#define TEENSY3_5 -#endif - -#endif diff --git a/third-party/effect_delay_ext.tar.gz b/third-party/effect_delay_ext.tar.gz deleted file mode 100644 index 952b670..0000000 Binary files a/third-party/effect_delay_ext.tar.gz and /dev/null differ diff --git a/third-party/effect_freeverbf/library.properties b/third-party/effect_freeverbf/library.properties deleted file mode 100644 index fd52404..0000000 --- a/third-party/effect_freeverbf/library.properties +++ /dev/null @@ -1,10 +0,0 @@ -name=effect_freeverbf -version=1.0 -author= -maintainer= -sentence= -paragraph= -category=Audio -url= -architectures=teensy,avr -license= diff --git a/third-party/effect_freeverbf/src/effect_freeverbf.cpp b/third-party/effect_freeverbf/src/effect_freeverbf.cpp deleted file mode 100644 index 6c8e3ce..0000000 --- a/third-party/effect_freeverbf/src/effect_freeverbf.cpp +++ /dev/null @@ -1,517 +0,0 @@ -/* Audio Library for Teensy 3.X - Copyright (c) 2018, Paul Stoffregen, paul@pjrc.com - - Development of this audio library was funded by PJRC.COM, LLC by sales of - Teensy and Audio Adaptor boards. Please support PJRC's efforts to develop - open source software by purchasing Teensy or other PJRC products. - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice, development funding notice, and this permission - notice shall be included in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. -*/ - -// A Floating point implementation of Freeverb by Jezar at Dreampoint -// http://blog.bjornroche.com/2012/06/freeverb-original-public-domain-code-by.html -// https://music.columbia.edu/pipermail/music-dsp/2001-October/045433.html - -#include -#include "effect_freeverbf.h" -#include "utility/dspinst.h" - -AudioEffectFreeverbFloat::AudioEffectFreeverbFloat() : AudioStream(1, inputQueueArray) -{ - for (unsigned int i = 0; i < sizeof(comb1buf) / sizeof(float); i++) comb1buf[i] = 0.0; - for (unsigned int i = 0; i < sizeof(comb2buf) / sizeof(float); i++) comb2buf[i] = 0.0; - for (unsigned int i = 0; i < sizeof(comb3buf) / sizeof(float); i++) comb3buf[i] = 0.0; - for (unsigned int i = 0; i < sizeof(comb4buf) / sizeof(float); i++) comb4buf[i] = 0.0; - for (unsigned int i = 0; i < sizeof(comb5buf) / sizeof(float); i++) comb5buf[i] = 0.0; - for (unsigned int i = 0; i < sizeof(comb6buf) / sizeof(float); i++) comb6buf[i] = 0.0; - for (unsigned int i = 0; i < sizeof(comb7buf) / sizeof(float); i++) comb7buf[i] = 0.0; - for (unsigned int i = 0; i < sizeof(comb8buf) / sizeof(float); i++) comb8buf[i] = 0.0; - comb1index = 0; - comb2index = 0; - comb3index = 0; - comb4index = 0; - comb5index = 0; - comb6index = 0; - comb7index = 0; - comb8index = 0; - comb1filter = 0.0; - comb2filter = 0.0; - comb3filter = 0.0; - comb4filter = 0.0; - comb5filter = 0.0; - comb6filter = 0.0; - comb7filter = 0.0; - comb8filter = 0.0; - combdamp1 = 6553.0; - combdamp2 = 26215.0; - combfeeback = 27524.0; - for (unsigned int i = 0; i < sizeof(allpass1buf) / sizeof(float); i++) allpass1buf[i] = 0.0; - for (unsigned int i = 0; i < sizeof(allpass2buf) / sizeof(float); i++) allpass2buf[i] = 0.0; - for (unsigned int i = 0; i < sizeof(allpass3buf) / sizeof(float); i++) allpass3buf[i] = 0.0; - for (unsigned int i = 0; i < sizeof(allpass4buf) / sizeof(float); i++) allpass4buf[i] = 0.0; - allpass1index = 0; - allpass2index = 0; - allpass3index = 0; - allpass4index = 0; -} - -#if 0 -#define sat16i(n, rshift) signed_saturate_rshift((n), 16, (rshift)) -#else -// cleaner sat16 by http://www.moseleyinstruments.com/ -static int16_t sat16i(int32_t n, int rshift) { - // we should always round towards 0 - // to avoid recirculating round-off noise - // - // a 2s complement positive number is always - // rounded down, so we only need to take - // care of negative numbers - if (n < 0) { - n = n + (~(0xFFFFFFFFUL << rshift)); - } - n = n >> rshift; - if (n > 32767) { - return 32767; - } - if (n < -32768) { - return -32768; - } - return n; -} -#endif - -/* static float sat16(float n, int rshift) { - // we should always round towards 0 - // to avoid recirculating round-off noise - // - // a 2s complement positive number is always - // rounded down, so we only need to take - // care of negative numbers - n = n / (float) (1< 16 - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -#endif -#if AUDIO_BLOCK_SAMPLES > 32 - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -#endif -#if AUDIO_BLOCK_SAMPLES > 48 - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -#endif -#if AUDIO_BLOCK_SAMPLES > 64 - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -#endif -#if AUDIO_BLOCK_SAMPLES > 80 - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -#endif -#if AUDIO_BLOCK_SAMPLES > 96 - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -#endif -#if AUDIO_BLOCK_SAMPLES > 112 - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -#endif - } -}; - -void AudioEffectFreeverbFloat::update() -{ -#if defined(__ARM_ARCH_7EM__) - const audio_block_t *block; - audio_block_t *outblock; - int i; - float input, bufout, output; - float sum; - - outblock = allocate(); - if (!outblock) { - audio_block_t *tmp = receiveReadOnly(0); - if (tmp) release(tmp); - return; - } - block = receiveReadOnly(0); - if (!block) block = &zeroblock; - - for (i = 0; i < AUDIO_BLOCK_SAMPLES; i++) { - // TODO: scale numerical range depending on roomsize & damping - //input = sat16(block->data[i] * 8738, 17); // for numerical headroom - input = (float)block->data[i] / 32768.0f; - sum = 0; - - bufout = comb1buf[comb1index]; - sum += bufout; - comb1filter = bufout * combdamp2 + comb1filter * combdamp1; - comb1buf[comb1index] = input + comb1filter * combfeeback; - if (++comb1index >= sizeof(comb1buf) / sizeof(float)) comb1index = 0; - - bufout = comb2buf[comb2index]; - sum += bufout; - comb2filter = bufout * combdamp2 + comb2filter * combdamp1; - comb2buf[comb2index] = input + comb2filter * combfeeback; - if (++comb2index >= sizeof(comb2buf) / sizeof(float)) comb2index = 0; - - bufout = comb3buf[comb3index]; - sum += bufout; - comb3filter = bufout * combdamp2 + comb3filter * combdamp1; - comb3buf[comb3index] = input + comb3filter * combfeeback; - if (++comb3index >= sizeof(comb3buf) / sizeof(float)) comb3index = 0; - - bufout = comb4buf[comb4index]; - sum += bufout; - comb4filter = bufout * combdamp2 + comb4filter * combdamp1; - comb4buf[comb4index] = input + comb4filter * combfeeback; - if (++comb4index >= sizeof(comb4buf) / sizeof(float)) comb4index = 0; - - bufout = comb5buf[comb5index]; - sum += bufout; - comb5filter = bufout * combdamp2 + comb5filter * combdamp1; - comb5buf[comb5index] = input + comb5filter * combfeeback; - if (++comb5index >= sizeof(comb5buf) / sizeof(float)) comb5index = 0; - - bufout = comb6buf[comb6index]; - sum += bufout; - comb6filter = bufout * combdamp2 + comb6filter * combdamp1; - comb6buf[comb6index] = input + comb6filter * combfeeback; - if (++comb6index >= sizeof(comb6buf) / sizeof(float)) comb6index = 0; - - bufout = comb7buf[comb7index]; - sum += bufout; - comb7filter = bufout * combdamp2 + comb7filter * combdamp1; - comb7buf[comb7index] = input + comb7filter * combfeeback; - if (++comb7index >= sizeof(comb7buf) / sizeof(float)) comb7index = 0; - - bufout = comb8buf[comb8index]; - sum += bufout; - comb8filter = bufout * combdamp2 + comb8filter * combdamp1; - comb8buf[comb8index] = input + comb8filter * combfeeback; - if (++comb8index >= sizeof(comb8buf) / sizeof(float)) comb8index = 0; - - //output = sat16(sum * 31457.0, 17); - //output = sum * 31457.0/131072.0f; - output = sum; - - bufout = allpass1buf[allpass1index]; - allpass1buf[allpass1index] = output + (bufout / 2.0); - output = (bufout - output) / 2.0; - if (++allpass1index >= sizeof(allpass1buf) / sizeof(float)) allpass1index = 0; - - bufout = allpass2buf[allpass2index]; - allpass2buf[allpass2index] = output + (bufout / 2.0); - output = (bufout - output) / 2.0; - if (++allpass2index >= sizeof(allpass2buf) / sizeof(float)) allpass2index = 0; - - bufout = allpass3buf[allpass3index]; - allpass3buf[allpass3index] = output + (bufout / 2.0); - output = (bufout - output) / 2.0; - if (++allpass3index >= sizeof(allpass3buf) / sizeof(float)) allpass3index = 0; - - bufout = allpass4buf[allpass4index]; - allpass4buf[allpass4index] = output + (bufout / 2.0); - output = (bufout - output) / 2.0; - if (++allpass4index >= sizeof(allpass4buf) / sizeof(float)) allpass4index = 0; - - //outblock->data[i] = sat16i(output * 30.0, 0); - outblock->data[i] = sat16i(output * 32768.0, 0); - } - transmit(outblock); - release(outblock); - if (block != &zeroblock) release((audio_block_t *)block); - -#elif defined(KINETISL) - audio_block_t *block; - block = receiveReadOnly(0); - if (block) release(block); -#endif -} - - -AudioEffectFreeverbStereoFloat::AudioEffectFreeverbStereoFloat() : AudioStream(2, inputQueueArray) -{ - for (unsigned int i = 0; i < sizeof(comb1bufL) / sizeof(float); i++) comb1bufL[i] = 0.0; - for (unsigned int i = 0; i < sizeof(comb2bufL) / sizeof(float); i++) comb2bufL[i] = 0.0; - for (unsigned int i = 0; i < sizeof(comb3bufL) / sizeof(float); i++) comb3bufL[i] = 0.0; - for (unsigned int i = 0; i < sizeof(comb4bufL) / sizeof(float); i++) comb4bufL[i] = 0.0; - for (unsigned int i = 0; i < sizeof(comb5bufL) / sizeof(float); i++) comb5bufL[i] = 0.0; - for (unsigned int i = 0; i < sizeof(comb6bufL) / sizeof(float); i++) comb6bufL[i] = 0.0; - for (unsigned int i = 0; i < sizeof(comb7bufL) / sizeof(float); i++) comb7bufL[i] = 0.0; - for (unsigned int i = 0; i < sizeof(comb8bufL) / sizeof(float); i++) comb8bufL[i] = 0.0; - comb1indexL = 0; - comb2indexL = 0; - comb3indexL = 0; - comb4indexL = 0; - comb5indexL = 0; - comb6indexL = 0; - comb7indexL = 0; - comb8indexL = 0; - comb1filterL = 0.0; - comb2filterL = 0.0; - comb3filterL = 0.0; - comb4filterL = 0.0; - comb5filterL = 0.0; - comb6filterL = 0.0; - comb7filterL = 0.0; - comb8filterL = 0.0; - for (unsigned int i = 0; i < sizeof(comb1bufR) / sizeof(float); i++) comb1bufR[i] = 0.0; - for (unsigned int i = 0; i < sizeof(comb2bufR) / sizeof(float); i++) comb2bufR[i] = 0.0; - for (unsigned int i = 0; i < sizeof(comb3bufR) / sizeof(float); i++) comb3bufR[i] = 0.0; - for (unsigned int i = 0; i < sizeof(comb4bufR) / sizeof(float); i++) comb4bufR[i] = 0.0; - for (unsigned int i = 0; i < sizeof(comb5bufR) / sizeof(float); i++) comb5bufR[i] = 0.0; - for (unsigned int i = 0; i < sizeof(comb6bufR) / sizeof(float); i++) comb6bufR[i] = 0.0; - for (unsigned int i = 0; i < sizeof(comb7bufR) / sizeof(float); i++) comb7bufR[i] = 0.0; - for (unsigned int i = 0; i < sizeof(comb8bufR) / sizeof(float); i++) comb8bufR[i] = 0.0; - comb1indexR = 0; - comb2indexR = 0; - comb3indexR = 0; - comb4indexR = 0; - comb5indexR = 0; - comb6indexR = 0; - comb7indexR = 0; - comb8indexR = 0; - comb1filterR = 0.0; - comb2filterR = 0.0; - comb3filterR = 0.0; - comb4filterR = 0.0; - comb5filterR = 0.0; - comb6filterR = 0.0; - comb7filterR = 0.0; - comb8filterR = 0.0; - combdamp1 = 6553.0; - combdamp2 = 26215.0; - combfeeback = 27524.0; - for (unsigned int i = 0; i < sizeof(allpass1bufL) / sizeof(float); i++) allpass1bufL[i] = 0.0; - for (unsigned int i = 0; i < sizeof(allpass2bufL) / sizeof(float); i++) allpass2bufL[i] = 0.0; - for (unsigned int i = 0; i < sizeof(allpass3bufL) / sizeof(float); i++) allpass3bufL[i] = 0.0; - for (unsigned int i = 0; i < sizeof(allpass4bufL) / sizeof(float); i++) allpass4bufL[i] = 0.0; - allpass1indexL = 0; - allpass2indexL = 0; - allpass3indexL = 0; - allpass4indexL = 0; - for (unsigned int i = 0; i < sizeof(allpass1bufR) / sizeof(float); i++) allpass1bufR[i] = 0.0; - for (unsigned int i = 0; i < sizeof(allpass2bufR) / sizeof(float); i++) allpass2bufR[i] = 0.0; - for (unsigned int i = 0; i < sizeof(allpass3bufR) / sizeof(float); i++) allpass3bufR[i] = 0.0; - for (unsigned int i = 0; i < sizeof(allpass4bufR) / sizeof(float); i++) allpass4bufR[i] = 0.0; - allpass1indexR = 0; - allpass2indexR = 0; - allpass3indexR = 0; - allpass4indexR = 0; -} - -void AudioEffectFreeverbStereoFloat::update() -{ -#if defined(__ARM_ARCH_7EM__) - const audio_block_t *blockL; - const audio_block_t *blockR; - audio_block_t *outblockL; - audio_block_t *outblockR; - int i; - float inputL, inputR, bufout, outputL, outputR; - float sum; - - blockL = receiveReadOnly(0); - blockR = receiveReadOnly(1); - - outblockL = allocate(); - outblockR = allocate(); - if (!outblockL || !outblockR) { - if (outblockL) release(outblockL); - if (outblockR) release(outblockR); - if (blockL) release((audio_block_t *)blockL); - if (blockR) release((audio_block_t *)blockR); - return; - } - if (!blockL) blockL = &zeroblock; - if (!blockR) blockR = &zeroblock; - - for (i = 0; i < AUDIO_BLOCK_SAMPLES; i++) { - // TODO: scale numerical range depending on roomsize & damping - //input = sat16(block->data[i] * 8738.0, 17); // for numerical headroom - inputL = blockL->data[i] / 32768.0; - inputR = blockR->data[i] / 32768.0; - sum = 0; - - bufout = comb1bufL[comb1indexL]; - sum += bufout; - comb1filterL = bufout * combdamp2 + comb1filterL * combdamp1; - comb1bufL[comb1indexL] = inputL + comb1filterL * combfeeback; - if (++comb1indexL >= sizeof(comb1bufL) / sizeof(float)) comb1indexL = 0; - - bufout = comb2bufL[comb2indexL]; - sum += bufout; - comb2filterL = bufout * combdamp2 + comb2filterL * combdamp1; - comb2bufL[comb2indexL] = inputL + comb2filterL * combfeeback; - if (++comb2indexL >= sizeof(comb2bufL) / sizeof(float)) comb2indexL = 0; - - bufout = comb3bufL[comb3indexL]; - sum += bufout; - comb3filterL = bufout * combdamp2 + comb3filterL * combdamp1; - comb3bufL[comb3indexL] = inputL + comb3filterL * combfeeback; - if (++comb3indexL >= sizeof(comb3bufL) / sizeof(float)) comb3indexL = 0; - - bufout = comb4bufL[comb4indexL]; - sum += bufout; - comb4filterL = bufout * combdamp2 + comb4filterL * combdamp1; - comb4bufL[comb4indexL] = inputL + comb4filterL * combfeeback; - if (++comb4indexL >= sizeof(comb4bufL) / sizeof(float)) comb4indexL = 0; - - bufout = comb5bufL[comb5indexL]; - sum += bufout; - comb5filterL = bufout * combdamp2 + comb5filterL * combdamp1; - comb5bufL[comb5indexL] = inputL + comb5filterL * combfeeback; - if (++comb5indexL >= sizeof(comb5bufL) / sizeof(float)) comb5indexL = 0; - - bufout = comb6bufL[comb6indexL]; - sum += bufout; - comb6filterL = bufout * combdamp2 + comb6filterL * combdamp1; - comb6bufL[comb6indexL] = inputL + comb6filterL * combfeeback; - if (++comb6indexL >= sizeof(comb6bufL) / sizeof(float)) comb6indexL = 0; - - bufout = comb7bufL[comb7indexL]; - sum += bufout; - comb7filterL = bufout * combdamp2 + comb7filterL * combdamp1; - comb7bufL[comb7indexL] = inputL + comb7filterL * combfeeback; - if (++comb7indexL >= sizeof(comb7bufL) / sizeof(float)) comb7indexL = 0; - - bufout = comb8bufL[comb8indexL]; - sum += bufout; - comb8filterL = bufout * combdamp2 + comb8filterL * combdamp1; - comb8bufL[comb8indexL] = inputL + comb8filterL * combfeeback; - if (++comb8indexL >= sizeof(comb8bufL) / sizeof(float)) comb8indexL = 0; - - //outputL = sat16(sum * 31457, 17); - //outputL = sum * 31457.0/131072.0f; - outputL = sum; - sum = 0.0; - - bufout = comb1bufR[comb1indexR]; - sum += bufout; - comb1filterR = bufout * combdamp2 + comb1filterR * combdamp1; - comb1bufR[comb1indexR] = inputR + comb1filterR * combfeeback; - if (++comb1indexR >= sizeof(comb1bufR) / sizeof(float)) comb1indexR = 0; - - bufout = comb2bufR[comb2indexR]; - sum += bufout; - comb2filterR = bufout * combdamp2 + comb2filterR * combdamp1; - comb2bufR[comb2indexR] = inputR + comb2filterR * combfeeback; - if (++comb2indexR >= sizeof(comb2bufR) / sizeof(float)) comb2indexR = 0; - - bufout = comb3bufR[comb3indexR]; - sum += bufout; - comb3filterR = bufout * combdamp2 + comb3filterR * combdamp1; - comb3bufR[comb3indexR] = inputR + comb3filterR * combfeeback; - if (++comb3indexR >= sizeof(comb3bufR) / sizeof(float)) comb3indexR = 0; - - bufout = comb4bufR[comb4indexR]; - sum += bufout; - comb4filterR = bufout * combdamp2 + comb4filterR * combdamp1; - comb4bufR[comb4indexR] = inputR + comb4filterR * combfeeback; - if (++comb4indexR >= sizeof(comb4bufR) / sizeof(float)) comb4indexR = 0; - - bufout = comb5bufR[comb5indexR]; - sum += bufout; - comb5filterR = bufout * combdamp2 + comb5filterR * combdamp1; - comb5bufR[comb5indexR] = inputR + comb5filterR * combfeeback; - if (++comb5indexR >= sizeof(comb5bufR) / sizeof(float)) comb5indexR = 0; - - bufout = comb6bufR[comb6indexR]; - sum += bufout; - comb6filterR = bufout * combdamp2 + comb6filterR * combdamp1; - comb6bufR[comb6indexR] = inputR + comb6filterR * combfeeback; - if (++comb6indexR >= sizeof(comb6bufR) / sizeof(float)) comb6indexR = 0; - - bufout = comb7bufR[comb7indexR]; - sum += bufout; - comb7filterR = bufout * combdamp2 + comb7filterR * combdamp1; - comb7bufR[comb7indexR] = inputR + comb7filterR * combfeeback; - if (++comb7indexR >= sizeof(comb7bufR) / sizeof(float)) comb7indexR = 0; - - bufout = comb8bufR[comb8indexR]; - sum += bufout; - comb8filterR = bufout * combdamp2 + comb8filterR * combdamp1; - comb8bufR[comb8indexR] = inputR + comb8filterR * combfeeback; - if (++comb8indexR >= sizeof(comb8bufR) / sizeof(float)) comb8indexR = 0; - - //outputR = sat16(sum * 31457, 17); - //outputR = sum * 31457.0/131072.0f; - outputR = sum; - - bufout = allpass1bufL[allpass1indexL]; - allpass1bufL[allpass1indexL] = outputL + (bufout / 2.0); - outputL = (bufout - outputL) / 2.0; - if (++allpass1indexL >= sizeof(allpass1bufL) / sizeof(float)) allpass1indexL = 0; - - bufout = allpass2bufL[allpass2indexL]; - allpass2bufL[allpass2indexL] = outputL + (bufout / 2.0); - outputL = (bufout - outputL) / 2.0; - if (++allpass2indexL >= sizeof(allpass2bufL) / sizeof(float)) allpass2indexL = 0; - - bufout = allpass3bufL[allpass3indexL]; - allpass3bufL[allpass3indexL] = outputL + (bufout / 2.0); - outputL = (bufout - outputL) / 2.0; - if (++allpass3indexL >= sizeof(allpass3bufL) / sizeof(float)) allpass3indexL = 0; - - bufout = allpass4bufL[allpass4indexL]; - allpass4bufL[allpass4indexL] = outputL + (bufout / 2.0); - outputL = (bufout - outputL) / 2.0; - if (++allpass4indexL >= sizeof(allpass4bufL) / sizeof(float)) allpass4indexL = 0; - - //outblockL->data[i] = sat16i(outputL * 30.0, 0); - outblockL->data[i] = sat16i(outputL * 32768.0, 0); - - bufout = allpass1bufR[allpass1indexR]; - allpass1bufR[allpass1indexR] = outputR + (bufout / 2.0); - //outputR = sat16(bufout - outputR, 1); - outputR = (bufout - outputR) / 2.0; - if (++allpass1indexR >= sizeof(allpass1bufR) / sizeof(float)) allpass1indexR = 0; - - bufout = allpass2bufR[allpass2indexR]; - allpass2bufR[allpass2indexR] = outputR + (bufout / 2.0); - outputR = (bufout - outputR) / 2.0; - if (++allpass2indexR >= sizeof(allpass2bufR) / sizeof(float)) allpass2indexR = 0; - - bufout = allpass3bufR[allpass3indexR]; - allpass3bufR[allpass3indexR] = outputR + (bufout / 2.0); - outputR = (bufout - outputR) / 2.0; - if (++allpass3indexR >= sizeof(allpass3bufR) / sizeof(float)) allpass3indexR = 0; - - bufout = allpass4bufR[allpass4indexR]; - allpass4bufR[allpass4indexR] = outputR + (bufout / 2.0); - outputR = (bufout - outputR) / 2.0; - if (++allpass4indexR >= sizeof(allpass4bufR) / sizeof(float)) allpass4indexR = 0; - - //outblockR->data[i] = sat16i(outputR * 30.0, 0); - outblockR->data[i] = sat16i(outputR * 32768.0, 0); - } - transmit(outblockL, 0); - transmit(outblockR, 1); - release(outblockL); - release(outblockR); - if (blockL != &zeroblock) release((audio_block_t *)blockL); - if (blockR != &zeroblock) release((audio_block_t *)blockR); - -#elif defined(KINETISL) - audio_block_t *block; - block = receiveReadOnly(0); - if (block) release(block); -#endif -} diff --git a/third-party/effect_freeverbf/src/effect_freeverbf.h b/third-party/effect_freeverbf/src/effect_freeverbf.h deleted file mode 100644 index 1f3c7bb..0000000 --- a/third-party/effect_freeverbf/src/effect_freeverbf.h +++ /dev/null @@ -1,190 +0,0 @@ -/* Audio Library for Teensy 3.X - Copyright (c) 2018, Paul Stoffregen, paul@pjrc.com - - Development of this audio library was funded by PJRC.COM, LLC by sales of - Teensy and Audio Adaptor boards. Please support PJRC's efforts to develop - open source software by purchasing Teensy or other PJRC products. - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice, development funding notice, and this permission - notice shall be included in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. -*/ - -#ifndef effect_freeverb_f_h_ -#define effect_freeverb_f_h_ -#include -#include "AudioStream.h" - -class AudioEffectFreeverbFloat : public AudioStream -{ - public: - AudioEffectFreeverbFloat(); - virtual void update(); - void roomsize(float n) { - if (n > 1.0f) n = 1.0f; - else if (n < 0.0) n = 0.0f; - //combfeeback = (n * 9175.04f) + 22937.0; - combfeeback = (n * 9175.04f / 32768.0f) + 22937.0 / 32768.0f; - } - void damping(float n) { - if (n > 1.0f) n = 1.0f; - else if (n < 0.0) n = 0.0f; - //float x1 = (n * 13107.2f); - //float x2 = 32768.0 - x1; - float x1 = (n * 13107.2f / 32768.0f); - float x2 = 1.0 - x1; - __disable_irq(); - combdamp1 = x1; - combdamp2 = x2; - __enable_irq(); - } - private: - audio_block_t *inputQueueArray[1]; - float comb1buf[1116]; - float comb2buf[1188]; - float comb3buf[1277]; - float comb4buf[1356]; - float comb5buf[1422]; - float comb6buf[1491]; - float comb7buf[1557]; - float comb8buf[1617]; - uint16_t comb1index; - uint16_t comb2index; - uint16_t comb3index; - uint16_t comb4index; - uint16_t comb5index; - uint16_t comb6index; - uint16_t comb7index; - uint16_t comb8index; - float comb1filter; - float comb2filter; - float comb3filter; - float comb4filter; - float comb5filter; - float comb6filter; - float comb7filter; - float comb8filter; - float combdamp1; - float combdamp2; - float combfeeback; - float allpass1buf[556]; - float allpass2buf[441]; - float allpass3buf[341]; - float allpass4buf[225]; - uint16_t allpass1index; - uint16_t allpass2index; - uint16_t allpass3index; - uint16_t allpass4index; -}; - - -class AudioEffectFreeverbStereoFloat : public AudioStream -{ - public: - AudioEffectFreeverbStereoFloat(); - virtual void update(); - void roomsize(float n) { - if (n > 1.0f) n = 1.0f; - else if (n < 0.0) n = 0.0f; - //combfeeback = (n * 9175.04f) + 22937.0; - combfeeback = (n * 9175.04f / 32768.0f) + 22937.0 / 32768.0f; - } - void damping(float n) { - if (n > 1.0f) n = 1.0f; - else if (n < 0.0) n = 0.0f; - //float x1 = (n * 13107.2f); - //float x2 = 32768.0 - x1; - float x1 = (n * 13107.2f / 32768.0f); - float x2 = 1.0 - x1; - __disable_irq(); - combdamp1 = x1; - combdamp2 = x2; - __enable_irq(); - } - private: - audio_block_t *inputQueueArray[2]; - float comb1bufL[1116]; - float comb2bufL[1188]; - float comb3bufL[1277]; - float comb4bufL[1356]; - float comb5bufL[1422]; - float comb6bufL[1491]; - float comb7bufL[1557]; - float comb8bufL[1617]; - uint16_t comb1indexL; - uint16_t comb2indexL; - uint16_t comb3indexL; - uint16_t comb4indexL; - uint16_t comb5indexL; - uint16_t comb6indexL; - uint16_t comb7indexL; - uint16_t comb8indexL; - float comb1filterL; - float comb2filterL; - float comb3filterL; - float comb4filterL; - float comb5filterL; - float comb6filterL; - float comb7filterL; - float comb8filterL; - float comb1bufR[1139]; - float comb2bufR[1211]; - float comb3bufR[1300]; - float comb4bufR[1379]; - float comb5bufR[1445]; - float comb6bufR[1514]; - float comb7bufR[1580]; - float comb8bufR[1640]; - uint16_t comb1indexR; - uint16_t comb2indexR; - uint16_t comb3indexR; - uint16_t comb4indexR; - uint16_t comb5indexR; - uint16_t comb6indexR; - uint16_t comb7indexR; - uint16_t comb8indexR; - float comb1filterR; - float comb2filterR; - float comb3filterR; - float comb4filterR; - float comb5filterR; - float comb6filterR; - float comb7filterR; - float comb8filterR; - float combdamp1; - float combdamp2; - float combfeeback; - float allpass1bufL[556]; - float allpass2bufL[441]; - float allpass3bufL[341]; - float allpass4bufL[225]; - uint16_t allpass1indexL; - uint16_t allpass2indexL; - uint16_t allpass3indexL; - uint16_t allpass4indexL; - float allpass1bufR[579]; - float allpass2bufR[464]; - float allpass3bufR[364]; - float allpass4bufR[248]; - uint16_t allpass1indexR; - uint16_t allpass2indexR; - uint16_t allpass3indexR; - uint16_t allpass4indexR; -}; - - -#endif