Removed effect_freeverb_simd. Removed teensy_board_detection.h and exchanged checing for macros from TeensyDuino.dev
parent
ad88b684c1
commit
8f4b1f65ce
@ -1,848 +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 (c)2021 H. Wirtz <wirtz@parasitstudio.de>, M. Koslowski <positionhigh@gmx.de> |
|
||||||
, 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. |
|
||||||
*/ |
|
||||||
|
|
||||||
#ifdef USE_FREEVERB_SIMD |
|
||||||
// A fixed 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 <Arduino.h> |
|
||||||
#include "effect_freeverb_simd.h" |
|
||||||
#include "utility/dspinst.h" |
|
||||||
|
|
||||||
AudioEffectFreeverbSIMD::AudioEffectFreeverbSIMD() : AudioStream(1, inputQueueArray) |
|
||||||
{ |
|
||||||
memset(comb1buf, 0, sizeof(comb1buf)); |
|
||||||
memset(comb2buf, 0, sizeof(comb2buf)); |
|
||||||
memset(comb3buf, 0, sizeof(comb3buf)); |
|
||||||
memset(comb4buf, 0, sizeof(comb4buf)); |
|
||||||
memset(comb5buf, 0, sizeof(comb5buf)); |
|
||||||
memset(comb6buf, 0, sizeof(comb6buf)); |
|
||||||
memset(comb7buf, 0, sizeof(comb7buf)); |
|
||||||
memset(comb8buf, 0, sizeof(comb8buf)); |
|
||||||
comb1index = 0; |
|
||||||
comb2index = 0; |
|
||||||
comb3index = 0; |
|
||||||
comb4index = 0; |
|
||||||
comb5index = 0; |
|
||||||
comb6index = 0; |
|
||||||
comb7index = 0; |
|
||||||
comb8index = 0; |
|
||||||
comb1filter = 0; |
|
||||||
comb2filter = 0; |
|
||||||
comb3filter = 0; |
|
||||||
comb4filter = 0; |
|
||||||
comb5filter = 0; |
|
||||||
comb6filter = 0; |
|
||||||
comb7filter = 0; |
|
||||||
comb8filter = 0; |
|
||||||
combdamp1 = 6553; |
|
||||||
combdamp2 = 26215; |
|
||||||
combfeeback = 27524; |
|
||||||
memset(allpass1buf, 0, sizeof(allpass1buf)); |
|
||||||
memset(allpass2buf, 0, sizeof(allpass2buf)); |
|
||||||
memset(allpass3buf, 0, sizeof(allpass3buf)); |
|
||||||
memset(allpass4buf, 0, sizeof(allpass4buf)); |
|
||||||
allpass1index = 0; |
|
||||||
allpass2index = 0; |
|
||||||
allpass3index = 0; |
|
||||||
allpass4index = 0; |
|
||||||
} |
|
||||||
|
|
||||||
|
|
||||||
// cleaner sat16 by http://www.moseleyinstruments.com/
|
|
||||||
__attribute__((unused)) |
|
||||||
static int16_t sat16(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; |
|
||||||
} |
|
||||||
|
|
||||||
// TODO: move this to one of the data files, use in output_adat.cpp, output_tdm.cpp, etc
|
|
||||||
static const audio_block_t zeroblock = { |
|
||||||
0, 0, 0, { |
|
||||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, |
|
||||||
#if AUDIO_BLOCK_SAMPLES > 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 AudioEffectFreeverbSIMD::update() |
|
||||||
{ |
|
||||||
#if defined(__ARM_ARCH_7EM__) |
|
||||||
const audio_block_t *block; |
|
||||||
audio_block_t *outblock; |
|
||||||
int i; |
|
||||||
int16_t input, bufout, output; |
|
||||||
int32_t sum; |
|
||||||
|
|
||||||
uint32_t PackA, PackB; |
|
||||||
|
|
||||||
|
|
||||||
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
|
|
||||||
|
|
||||||
asm volatile( |
|
||||||
"MUL %[RESULT], %[BLOCK], %[CONST]\n" |
|
||||||
"CMN %[RESULT], #0\n" |
|
||||||
"IT MI\n" |
|
||||||
"ADDMI %[RESULT], %[RESULT], %[R_RND]\n" |
|
||||||
"SSAT %[RESULT], #16, %[RESULT], ASR %[I_SHIFT]\n" |
|
||||||
:[RESULT]"=&r"(input) |
|
||||||
:[BLOCK]"r"((int32_t)block->data[i]), [CONST]"r"(8738), [R_RND]"r"(0x1FFFF), [I_SHIFT]"i"(17) |
|
||||||
: |
|
||||||
); |
|
||||||
|
|
||||||
sum = 0; |
|
||||||
|
|
||||||
/*
|
|
||||||
asm volatile ( |
|
||||||
"QADD %[SUM], %[C1], %[C2]\n" |
|
||||||
"QADD %[SUM], %[C3], %[C4]\n" |
|
||||||
"QADD %[SUM], %[C5], %[C6]\n" |
|
||||||
"QADD %[SUM], %[C7], %[C8]\n" |
|
||||||
:[SUM]"=r"(sum) |
|
||||||
:[C1]"r"((int32_t)comb1buf[comb1index]),[C2]"r"((int32_t)comb2buf[comb2index]),[C3]"r"((int32_t)comb3buf[comb3index]),[C4]"r"((int32_t)comb4buf[comb4index]),[C5]"r"((int32_t)comb5buf[comb5index]),[C6]"r"((int32_t)comb6buf[comb6index]),[C7]"r"((int32_t)comb7buf[comb7index]),[C8]"r"((int32_t)comb8buf[comb8index]) |
|
||||||
: |
|
||||||
); |
|
||||||
*/ |
|
||||||
asm volatile ( |
|
||||||
"QADD %[SUM], %[C1], %[C2]\n" |
|
||||||
"QADD %[SUM], %[C3], %[SUM]\n" |
|
||||||
"QADD %[SUM], %[C4], %[SUM]\n" |
|
||||||
"QADD %[SUM], %[C5], %[SUM]\n" |
|
||||||
"QADD %[SUM], %[C6], %[SUM]\n" |
|
||||||
"QADD %[SUM], %[C7], %[SUM]\n" |
|
||||||
"QADD %[SUM], %[C8], %[SUM]\n" |
|
||||||
:[SUM]"=r"(sum) |
|
||||||
:[C1]"r"((int32_t)comb1buf[comb1index]), [C2]"r"((int32_t)comb2buf[comb2index]), [C3]"r"((int32_t)comb3buf[comb3index]), [C4]"r"((int32_t)comb4buf[comb4index]), [C5]"r"((int32_t)comb5buf[comb5index]), [C6]"r"((int32_t)comb6buf[comb6index]), [C7]"r"((int32_t)comb7buf[comb7index]), [C8]"r"((int32_t)comb8buf[comb8index]) |
|
||||||
: |
|
||||||
); |
|
||||||
|
|
||||||
//output = asm_sat16((sum * 31457), 0x1FFFF, 17);
|
|
||||||
|
|
||||||
asm volatile ( |
|
||||||
"MUL %[RESULT], %[SUM], %[CONST]\n" |
|
||||||
"CMN %[RESULT], #0\n" |
|
||||||
"IT MI\n" |
|
||||||
"ADDMI %[RESULT], %[RESULT], %[R_RND]\n" |
|
||||||
"SSAT %[RESULT], #16, %[RESULT], ASR %[I_SHIFT]\n" |
|
||||||
:[RESULT]"=&r"(output) |
|
||||||
:[SUM]"r"((int32_t)sum), [CONST]"r"(31457), [R_RND]"r"(0x1FFFF), [I_SHIFT]"i"(17) |
|
||||||
: |
|
||||||
); |
|
||||||
|
|
||||||
// Comb1
|
|
||||||
asm volatile ( |
|
||||||
"PKHBT %[PACKA], %[INBOT], %[INTOP], LSL #16\n" |
|
||||||
:[PACKA]"=&r"(PackA) |
|
||||||
:[INTOP]"r"(comb1buf[comb1index]), [INBOT]"r"(comb1filter) |
|
||||||
: |
|
||||||
); |
|
||||||
asm volatile ( |
|
||||||
"PKHBT %[PACKB], %[INBOT], %[INTOP], LSL #16\n" |
|
||||||
:[PACKB]"=&r"(PackB) |
|
||||||
:[INTOP]"r"(combdamp2), [INBOT]"r"(combdamp1) |
|
||||||
: |
|
||||||
); |
|
||||||
asm volatile( |
|
||||||
"BIC %[RESULT], %[RESULT], #0\n" |
|
||||||
"SMLAD %[RESULT], %[PACKA], %[PACKB], %[RESULT]\n" |
|
||||||
"CMN %[RESULT], #0\n" |
|
||||||
"IT MI\n" |
|
||||||
"ADDMI %[RESULT], %[RESULT], %[R_RND]\n" |
|
||||||
"SSAT %[RESULT], #16, %[RESULT], ASR %[I_SHIFT]\n" |
|
||||||
:[RESULT]"=&r"(comb1filter) |
|
||||||
:[PACKA]"r"(PackA), [PACKB]"r"(PackB), [R_RND]"r"(0x7FFF), [I_SHIFT]"i"(15) |
|
||||||
:"memory" |
|
||||||
); |
|
||||||
asm volatile ( |
|
||||||
"MUL %[RESULT], %[FIL], %[FB]\n" |
|
||||||
"CMN %[RESULT], #0\n" |
|
||||||
"IT MI\n" |
|
||||||
"ADDMI %[RESULT], %[RESULT], %[R_RND]\n" |
|
||||||
"SSAT %[RESULT], #16, %[RESULT], ASR %[I_SHIFT]\n" |
|
||||||
"ADD %[RESULT], %[RESULT], %[IN]\n" |
|
||||||
"SSAT %[RESULT], #16, %[RESULT]\n" |
|
||||||
:[RESULT]"=&r"(comb1buf[comb1index]) |
|
||||||
:[FIL]"r"(comb1filter), [IN]"r"((int32_t)input), [FB]"r"((int32_t)combfeeback), [R_RND]"r"(0x7FFF), [I_SHIFT]"i"(15) |
|
||||||
: |
|
||||||
); |
|
||||||
|
|
||||||
// Comb2
|
|
||||||
asm volatile ( |
|
||||||
"PKHBT %[PACKA], %[INBOT], %[INTOP], LSL #16\n" |
|
||||||
:[PACKA]"=&r"(PackA) |
|
||||||
:[INTOP]"r"(comb2buf[comb2index]), [INBOT]"r"(comb2filter) |
|
||||||
: |
|
||||||
); |
|
||||||
asm volatile ( |
|
||||||
"PKHBT %[PACKB], %[INBOT], %[INTOP], LSL #16\n" |
|
||||||
:[PACKB]"=&r"(PackB) |
|
||||||
:[INTOP]"r"(combdamp2), [INBOT]"r"(combdamp1) |
|
||||||
: |
|
||||||
); |
|
||||||
asm volatile( |
|
||||||
"BIC %[RESULT], %[RESULT], #0\n" |
|
||||||
"SMLAD %[RESULT], %[PACKA], %[PACKB], %[RESULT]\n" |
|
||||||
"CMN %[RESULT], #0\n" |
|
||||||
"IT MI\n" |
|
||||||
"ADDMI %[RESULT], %[RESULT], %[R_RND]\n" |
|
||||||
"SSAT %[RESULT], #16, %[RESULT], ASR %[I_SHIFT]\n" |
|
||||||
:[RESULT]"=&r"(comb2filter) |
|
||||||
:[PACKA]"r"(PackA), [PACKB]"r"(PackB), [R_RND]"r"(0x7FFF), [I_SHIFT]"i"(15) |
|
||||||
:"memory" |
|
||||||
); |
|
||||||
asm volatile ( |
|
||||||
"MUL %[RESULT], %[FIL], %[FB]\n" |
|
||||||
"CMN %[RESULT], #0\n" |
|
||||||
"IT MI\n" |
|
||||||
"ADDMI %[RESULT], %[RESULT], %[R_RND]\n" |
|
||||||
"SSAT %[RESULT], #16, %[RESULT], ASR %[I_SHIFT]\n" |
|
||||||
"ADD %[RESULT], %[RESULT], %[IN]\n" |
|
||||||
"SSAT %[RESULT], #16, %[RESULT]\n" |
|
||||||
:[RESULT]"=&r"(comb2buf[comb2index]) |
|
||||||
:[FIL]"r"(comb2filter), [IN]"r"((int32_t)input), [FB]"r"((int32_t)combfeeback), [R_RND]"r"(0x7FFF), [I_SHIFT]"i"(15) |
|
||||||
: |
|
||||||
); |
|
||||||
|
|
||||||
|
|
||||||
// Comb3
|
|
||||||
|
|
||||||
asm volatile ( |
|
||||||
"PKHBT %[PACKA], %[INBOT], %[INTOP], LSL #16\n" |
|
||||||
:[PACKA]"=&r"(PackA) |
|
||||||
:[INTOP]"r"(comb3buf[comb3index]), [INBOT]"r"(comb3filter) |
|
||||||
: |
|
||||||
); |
|
||||||
asm volatile ( |
|
||||||
"PKHBT %[PACKB], %[INBOT], %[INTOP], LSL #16\n" |
|
||||||
:[PACKB]"=&r"(PackB) |
|
||||||
:[INTOP]"r"(combdamp2), [INBOT]"r"(combdamp1) |
|
||||||
: |
|
||||||
); |
|
||||||
asm volatile( |
|
||||||
"BIC %[RESULT], %[RESULT], #0\n" |
|
||||||
"SMLAD %[RESULT], %[PACKA], %[PACKB], %[RESULT]\n" |
|
||||||
"CMN %[RESULT], #0\n" |
|
||||||
"IT MI\n" |
|
||||||
"ADDMI %[RESULT], %[RESULT], %[R_RND]\n" |
|
||||||
"SSAT %[RESULT], #16, %[RESULT], ASR %[I_SHIFT]\n" |
|
||||||
:[RESULT]"=&r"(comb3filter) |
|
||||||
:[PACKA]"r"(PackA), [PACKB]"r"(PackB), [R_RND]"r"(0x7FFF), [I_SHIFT]"i"(15) |
|
||||||
:"memory" |
|
||||||
); |
|
||||||
asm volatile ( |
|
||||||
"MUL %[RESULT], %[FIL], %[FB]\n" |
|
||||||
"CMN %[RESULT], #0\n" |
|
||||||
"IT MI\n" |
|
||||||
"ADDMI %[RESULT], %[RESULT], %[R_RND]\n" |
|
||||||
"SSAT %[RESULT], #16, %[RESULT], ASR %[I_SHIFT]\n" |
|
||||||
"ADD %[RESULT], %[RESULT], %[IN]\n" |
|
||||||
"SSAT %[RESULT], #16, %[RESULT]\n" |
|
||||||
:[RESULT]"=&r"(comb3buf[comb3index]) |
|
||||||
:[FIL]"r"(comb3filter), [IN]"r"((int32_t)input), [FB]"r"((int32_t)combfeeback), [R_RND]"r"(0x7FFF), [I_SHIFT]"i"(15) |
|
||||||
: |
|
||||||
); |
|
||||||
|
|
||||||
// Comb4
|
|
||||||
asm volatile ( |
|
||||||
"PKHBT %[PACKA], %[INBOT], %[INTOP], LSL #16\n" |
|
||||||
:[PACKA]"=&r"(PackA) |
|
||||||
:[INTOP]"r"(comb4buf[comb4index]), [INBOT]"r"(comb4filter) |
|
||||||
: |
|
||||||
); |
|
||||||
asm volatile ( |
|
||||||
"PKHBT %[PACKB], %[INBOT], %[INTOP], LSL #16\n" |
|
||||||
:[PACKB]"=&r"(PackB) |
|
||||||
:[INTOP]"r"(combdamp2), [INBOT]"r"(combdamp1) |
|
||||||
: |
|
||||||
); |
|
||||||
asm volatile( |
|
||||||
"BIC %[RESULT], %[RESULT], #0\n" |
|
||||||
"SMLAD %[RESULT], %[PACKA], %[PACKB], %[RESULT]\n" |
|
||||||
"CMN %[RESULT], #0\n" |
|
||||||
"IT MI\n" |
|
||||||
"ADDMI %[RESULT], %[RESULT], %[R_RND]\n" |
|
||||||
"SSAT %[RESULT], #16, %[RESULT], ASR %[I_SHIFT]\n" |
|
||||||
:[RESULT]"=&r"(comb4filter) |
|
||||||
:[PACKA]"r"(PackA), [PACKB]"r"(PackB), [R_RND]"r"(0x7FFF), [I_SHIFT]"i"(15) |
|
||||||
:"memory" |
|
||||||
); |
|
||||||
asm volatile ( |
|
||||||
"MUL %[RESULT], %[FIL], %[FB]\n" |
|
||||||
"CMN %[RESULT], #0\n" |
|
||||||
"IT MI\n" |
|
||||||
"ADDMI %[RESULT], %[RESULT], %[R_RND]\n" |
|
||||||
"SSAT %[RESULT], #16, %[RESULT], ASR %[I_SHIFT]\n" |
|
||||||
"ADD %[RESULT], %[RESULT], %[IN]\n" |
|
||||||
"SSAT %[RESULT], #16, %[RESULT]\n" |
|
||||||
:[RESULT]"=&r"(comb4buf[comb4index]) |
|
||||||
:[FIL]"r"(comb4filter), [IN]"r"((int32_t)input), [FB]"r"((int32_t)combfeeback), [R_RND]"r"(0x7FFF), [I_SHIFT]"i"(15) |
|
||||||
: |
|
||||||
); |
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// Comb5
|
|
||||||
asm volatile ( |
|
||||||
"PKHBT %[PACKA], %[INBOT], %[INTOP], LSL #16\n" |
|
||||||
:[PACKA]"=&r"(PackA) |
|
||||||
:[INTOP]"r"(comb5buf[comb5index]), [INBOT]"r"(comb5filter) |
|
||||||
: |
|
||||||
); |
|
||||||
asm volatile ( |
|
||||||
"PKHBT %[PACKB], %[INBOT], %[INTOP], LSL #16\n" |
|
||||||
:[PACKB]"=&r"(PackB) |
|
||||||
:[INTOP]"r"(combdamp2), [INBOT]"r"(combdamp1) |
|
||||||
: |
|
||||||
); |
|
||||||
asm volatile( |
|
||||||
"BIC %[RESULT], %[RESULT], #0\n" |
|
||||||
"SMLAD %[RESULT], %[PACKA], %[PACKB], %[RESULT]\n" |
|
||||||
"CMN %[RESULT], #0\n" |
|
||||||
"IT MI\n" |
|
||||||
"ADDMI %[RESULT], %[RESULT], %[R_RND]\n" |
|
||||||
"SSAT %[RESULT], #16, %[RESULT], ASR %[I_SHIFT]\n" |
|
||||||
:[RESULT]"=&r"(comb5filter) |
|
||||||
:[PACKA]"r"(PackA), [PACKB]"r"(PackB), [R_RND]"r"(0x7FFF), [I_SHIFT]"i"(15) |
|
||||||
:"memory" |
|
||||||
); |
|
||||||
asm volatile ( |
|
||||||
"MUL %[RESULT], %[FIL], %[FB]\n" |
|
||||||
"CMN %[RESULT], #0\n" |
|
||||||
"IT MI\n" |
|
||||||
"ADDMI %[RESULT], %[RESULT], %[R_RND]\n" |
|
||||||
"SSAT %[RESULT], #16, %[RESULT], ASR %[I_SHIFT]\n" |
|
||||||
"ADD %[RESULT], %[RESULT], %[IN]\n" |
|
||||||
"SSAT %[RESULT], #16, %[RESULT]\n" |
|
||||||
:[RESULT]"=&r"(comb5buf[comb5index]) |
|
||||||
:[FIL]"r"(comb5filter), [IN]"r"((int32_t)input), [FB]"r"((int32_t)combfeeback), [R_RND]"r"(0x7FFF), [I_SHIFT]"i"(15) |
|
||||||
: |
|
||||||
); |
|
||||||
|
|
||||||
|
|
||||||
// Comb6
|
|
||||||
asm volatile ( |
|
||||||
"PKHBT %[PACKA], %[INBOT], %[INTOP], LSL #16\n" |
|
||||||
:[PACKA]"=&r"(PackA) |
|
||||||
:[INTOP]"r"(comb6buf[comb6index]), [INBOT]"r"(comb6filter) |
|
||||||
: |
|
||||||
); |
|
||||||
asm volatile ( |
|
||||||
"PKHBT %[PACKB], %[INBOT], %[INTOP], LSL #16\n" |
|
||||||
:[PACKB]"=&r"(PackB) |
|
||||||
:[INTOP]"r"(combdamp2), [INBOT]"r"(combdamp1) |
|
||||||
: |
|
||||||
); |
|
||||||
asm volatile( |
|
||||||
"BIC %[RESULT], %[RESULT], #0\n" |
|
||||||
"SMLAD %[RESULT], %[PACKA], %[PACKB], %[RESULT]\n" |
|
||||||
"CMN %[RESULT], #0\n" |
|
||||||
"IT MI\n" |
|
||||||
"ADDMI %[RESULT], %[RESULT], %[R_RND]\n" |
|
||||||
"SSAT %[RESULT], #16, %[RESULT], ASR %[I_SHIFT]\n" |
|
||||||
:[RESULT]"=&r"(comb6filter) |
|
||||||
:[PACKA]"r"(PackA), [PACKB]"r"(PackB), [R_RND]"r"(0x7FFF), [I_SHIFT]"i"(15) |
|
||||||
:"memory" |
|
||||||
); |
|
||||||
asm volatile ( |
|
||||||
"MUL %[RESULT], %[FIL], %[FB]\n" |
|
||||||
"CMN %[RESULT], #0\n" |
|
||||||
"IT MI\n" |
|
||||||
"ADDMI %[RESULT], %[RESULT], %[R_RND]\n" |
|
||||||
"SSAT %[RESULT], #16, %[RESULT], ASR %[I_SHIFT]\n" |
|
||||||
"ADD %[RESULT], %[RESULT], %[IN]\n" |
|
||||||
"SSAT %[RESULT], #16, %[RESULT]\n" |
|
||||||
:[RESULT]"=&r"(comb6buf[comb6index]) |
|
||||||
:[FIL]"r"(comb6filter), [IN]"r"((int32_t)input), [FB]"r"((int32_t)combfeeback), [R_RND]"r"(0x7FFF), [I_SHIFT]"i"(15) |
|
||||||
: |
|
||||||
); |
|
||||||
|
|
||||||
// Comb7
|
|
||||||
asm volatile ( |
|
||||||
"PKHBT %[PACKA], %[INBOT], %[INTOP], LSL #16\n" |
|
||||||
:[PACKA]"=&r"(PackA) |
|
||||||
:[INTOP]"r"(comb7buf[comb7index]), [INBOT]"r"(comb7filter) |
|
||||||
: |
|
||||||
); |
|
||||||
asm volatile ( |
|
||||||
"PKHBT %[PACKB], %[INBOT], %[INTOP], LSL #16\n" |
|
||||||
:[PACKB]"=&r"(PackB) |
|
||||||
:[INTOP]"r"(combdamp2), [INBOT]"r"(combdamp1) |
|
||||||
: |
|
||||||
); |
|
||||||
asm volatile( |
|
||||||
"BIC %[RESULT], %[RESULT], #0\n" |
|
||||||
"SMLAD %[RESULT], %[PACKA], %[PACKB], %[RESULT]\n" |
|
||||||
"CMN %[RESULT], #0\n" |
|
||||||
"IT MI\n" |
|
||||||
"ADDMI %[RESULT], %[RESULT], %[R_RND]\n" |
|
||||||
"SSAT %[RESULT], #16, %[RESULT], ASR %[I_SHIFT]\n" |
|
||||||
:[RESULT]"=&r"(comb7filter) |
|
||||||
:[PACKA]"r"(PackA), [PACKB]"r"(PackB), [R_RND]"r"(0x7FFF), [I_SHIFT]"i"(15) |
|
||||||
:"memory" |
|
||||||
); |
|
||||||
asm volatile ( |
|
||||||
"MUL %[RESULT], %[FIL], %[FB]\n" |
|
||||||
"CMN %[RESULT], #0\n" |
|
||||||
"IT MI\n" |
|
||||||
"ADDMI %[RESULT], %[RESULT], %[R_RND]\n" |
|
||||||
"SSAT %[RESULT], #16, %[RESULT], ASR %[I_SHIFT]\n" |
|
||||||
"ADD %[RESULT], %[RESULT], %[IN]\n" |
|
||||||
"SSAT %[RESULT], #16, %[RESULT]\n" |
|
||||||
:[RESULT]"=&r"(comb7buf[comb7index]) |
|
||||||
:[FIL]"r"(comb7filter), [IN]"r"((int32_t)input), [FB]"r"((int32_t)combfeeback), [R_RND]"r"(0x7FFF), [I_SHIFT]"i"(15) |
|
||||||
: |
|
||||||
); |
|
||||||
|
|
||||||
|
|
||||||
// Comb8
|
|
||||||
asm volatile ( |
|
||||||
"PKHBT %[PACKA], %[INBOT], %[INTOP], LSL #16\n" |
|
||||||
:[PACKA]"=&r"(PackA) |
|
||||||
:[INTOP]"r"(comb8buf[comb8index]), [INBOT]"r"(comb8filter) |
|
||||||
: |
|
||||||
); |
|
||||||
asm volatile ( |
|
||||||
"PKHBT %[PACKB], %[INBOT], %[INTOP], LSL #16\n" |
|
||||||
:[PACKB]"=&r"(PackB) |
|
||||||
:[INTOP]"r"(combdamp2), [INBOT]"r"(combdamp1) |
|
||||||
: |
|
||||||
); |
|
||||||
asm volatile( |
|
||||||
"BIC %[RESULT], %[RESULT], #0\n" |
|
||||||
"SMLAD %[RESULT], %[PACKA], %[PACKB], %[RESULT]\n" |
|
||||||
"CMN %[RESULT], #0\n" |
|
||||||
"IT MI\n" |
|
||||||
"ADDMI %[RESULT], %[RESULT], %[R_RND]\n" |
|
||||||
"SSAT %[RESULT], #16, %[RESULT], ASR %[I_SHIFT]\n" |
|
||||||
:[RESULT]"=&r"(comb8filter) |
|
||||||
:[PACKA]"r"(PackA), [PACKB]"r"(PackB), [R_RND]"r"(0x7FFF), [I_SHIFT]"i"(15) |
|
||||||
:"memory" |
|
||||||
); |
|
||||||
|
|
||||||
|
|
||||||
asm volatile( |
|
||||||
"MUL %[RESULT], %[FIL], %[FB]\n" |
|
||||||
"CMN %[RESULT], #0\n" |
|
||||||
"IT MI\n" |
|
||||||
"ADDMI %[RESULT], %[RESULT], %[R_RND]\n" |
|
||||||
"SSAT %[RESULT], #16, %[RESULT], ASR %[I_SHIFT]\n" |
|
||||||
"ADD %[RESULT], %[RESULT], %[IN]\n" |
|
||||||
"SSAT %[RESULT], #16, %[RESULT]\n" |
|
||||||
:[RESULT]"=&r"(comb8buf[comb8index]) |
|
||||||
:[FIL]"r"(comb8filter), [IN]"r"((int32_t)input), [FB]"r"((int32_t)combfeeback), [R_RND]"r"(0x7FFF), [I_SHIFT]"i"(15) |
|
||||||
: |
|
||||||
); |
|
||||||
|
|
||||||
|
|
||||||
bufout = allpass1buf[allpass1index]; |
|
||||||
allpass1buf[allpass1index] = output + (bufout >> 1); |
|
||||||
asm volatile( |
|
||||||
"SUBS %[RESULT], %[BUF], %[OUT]\n" |
|
||||||
"IT MI\n" |
|
||||||
"ADDMI %[RESULT], %[RESULT], %[R_RND]\n" |
|
||||||
"SSAT %[RESULT], #16, %[RESULT], ASR %[I_SHIFT]\n" |
|
||||||
:[RESULT]"=&r"(output) |
|
||||||
:[BUF]"r"((int32_t)bufout), [OUT]"r"((int32_t)output), [R_RND]"r"(0x1), [I_SHIFT]"i"(1) |
|
||||||
: |
|
||||||
); |
|
||||||
|
|
||||||
|
|
||||||
bufout = allpass2buf[allpass2index]; |
|
||||||
allpass2buf[allpass2index] = output + (bufout >> 1); |
|
||||||
asm volatile( |
|
||||||
"SUBS %[RESULT], %[BUF], %[OUT]\n" |
|
||||||
"IT MI\n" |
|
||||||
"ADDMI %[RESULT], %[RESULT], %[R_RND]\n" |
|
||||||
"SSAT %[RESULT], #16, %[RESULT], ASR %[I_SHIFT]\n" |
|
||||||
:[RESULT]"=&r"(output) |
|
||||||
:[BUF]"r"((int32_t)bufout), [OUT]"r"((int32_t)output), [R_RND]"r"(0x1), [I_SHIFT]"i"(1) |
|
||||||
: |
|
||||||
); |
|
||||||
|
|
||||||
|
|
||||||
bufout = allpass3buf[allpass3index]; |
|
||||||
allpass3buf[allpass3index] = output + (bufout >> 1); |
|
||||||
asm volatile( |
|
||||||
"SUBS %[RESULT], %[BUF], %[OUT]\n" |
|
||||||
"IT MI\n" |
|
||||||
"ADDMI %[RESULT], %[RESULT], %[R_RND]\n" |
|
||||||
"SSAT %[RESULT], #16, %[RESULT], ASR %[I_SHIFT]\n" |
|
||||||
:[RESULT]"=&r"(output) |
|
||||||
:[BUF]"r"((int32_t)bufout), [OUT]"r"((int32_t)output), [R_RND]"r"(0x1), [I_SHIFT]"i"(1) |
|
||||||
: |
|
||||||
); |
|
||||||
|
|
||||||
|
|
||||||
bufout = allpass4buf[allpass4index]; |
|
||||||
allpass4buf[allpass4index] = output + (bufout >> 1); |
|
||||||
asm volatile( |
|
||||||
"SUBS %[RESULT], %[BUF], %[OUT]\n" |
|
||||||
"IT MI\n" |
|
||||||
"ADDMI %[RESULT], %[RESULT], %[R_RND]\n" |
|
||||||
"SSAT %[RESULT], #16, %[RESULT], ASR %[I_SHIFT]\n" |
|
||||||
:[RESULT]"=&r"(output) |
|
||||||
:[BUF]"r"((int32_t)bufout), [OUT]"r"((int32_t)output), [R_RND]"r"(0x1), [I_SHIFT]"i"(1) |
|
||||||
: |
|
||||||
); |
|
||||||
|
|
||||||
|
|
||||||
asm volatile( |
|
||||||
"MUL %[RESULT], %[OUT], %[CONST]\n" |
|
||||||
"SSAT %[RESULT], #16, %[RESULT]\n" |
|
||||||
:[RESULT]"=&r"(outblock->data[i]) |
|
||||||
:[OUT]"r"((int32_t)output), [CONST]"r"(30) |
|
||||||
: |
|
||||||
); |
|
||||||
|
|
||||||
|
|
||||||
if (++allpass1index >= sizeof(allpass1buf) / sizeof(int16_t)) allpass1index = 0; |
|
||||||
if (++allpass2index >= sizeof(allpass2buf) / sizeof(int16_t)) allpass2index = 0; |
|
||||||
if (++allpass3index >= sizeof(allpass3buf) / sizeof(int16_t)) allpass3index = 0; |
|
||||||
if (++allpass4index >= sizeof(allpass4buf) / sizeof(int16_t)) allpass4index = 0; |
|
||||||
|
|
||||||
if (++comb1index >= sizeof(comb1buf) / sizeof(int16_t)) comb1index = 0; |
|
||||||
if (++comb2index >= sizeof(comb2buf) / sizeof(int16_t)) comb2index = 0; |
|
||||||
if (++comb3index >= sizeof(comb3buf) / sizeof(int16_t)) comb3index = 0; |
|
||||||
if (++comb4index >= sizeof(comb4buf) / sizeof(int16_t)) comb4index = 0; |
|
||||||
if (++comb5index >= sizeof(comb5buf) / sizeof(int16_t)) comb5index = 0; |
|
||||||
if (++comb6index >= sizeof(comb6buf) / sizeof(int16_t)) comb6index = 0; |
|
||||||
if (++comb7index >= sizeof(comb7buf) / sizeof(int16_t)) comb7index = 0; |
|
||||||
if (++comb8index >= sizeof(comb8buf) / sizeof(int16_t)) comb8index = 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 |
|
||||||
} |
|
||||||
|
|
||||||
AudioEffectFreeverbSIMDStereo::AudioEffectFreeverbSIMDStereo() : AudioStream(1, inputQueueArray) |
|
||||||
{ |
|
||||||
memset(comb1bufL, 0, sizeof(comb1bufL)); |
|
||||||
memset(comb2bufL, 0, sizeof(comb2bufL)); |
|
||||||
memset(comb3bufL, 0, sizeof(comb3bufL)); |
|
||||||
memset(comb4bufL, 0, sizeof(comb4bufL)); |
|
||||||
memset(comb5bufL, 0, sizeof(comb5bufL)); |
|
||||||
memset(comb6bufL, 0, sizeof(comb6bufL)); |
|
||||||
memset(comb7bufL, 0, sizeof(comb7bufL)); |
|
||||||
memset(comb8bufL, 0, sizeof(comb8bufL)); |
|
||||||
comb1indexL = 0; |
|
||||||
comb2indexL = 0; |
|
||||||
comb3indexL = 0; |
|
||||||
comb4indexL = 0; |
|
||||||
comb5indexL = 0; |
|
||||||
comb6indexL = 0; |
|
||||||
comb7indexL = 0; |
|
||||||
comb8indexL = 0; |
|
||||||
comb1filterL = 0; |
|
||||||
comb2filterL = 0; |
|
||||||
comb3filterL = 0; |
|
||||||
comb4filterL = 0; |
|
||||||
comb5filterL = 0; |
|
||||||
comb6filterL = 0; |
|
||||||
comb7filterL = 0; |
|
||||||
comb8filterL = 0; |
|
||||||
memset(comb1bufR, 0, sizeof(comb1bufR)); |
|
||||||
memset(comb2bufR, 0, sizeof(comb2bufR)); |
|
||||||
memset(comb3bufR, 0, sizeof(comb3bufR)); |
|
||||||
memset(comb4bufR, 0, sizeof(comb4bufR)); |
|
||||||
memset(comb5bufR, 0, sizeof(comb5bufR)); |
|
||||||
memset(comb6bufR, 0, sizeof(comb6bufR)); |
|
||||||
memset(comb7bufR, 0, sizeof(comb7bufR)); |
|
||||||
memset(comb8bufR, 0, sizeof(comb8bufR)); |
|
||||||
comb1indexR = 0; |
|
||||||
comb2indexR = 0; |
|
||||||
comb3indexR = 0; |
|
||||||
comb4indexR = 0; |
|
||||||
comb5indexR = 0; |
|
||||||
comb6indexR = 0; |
|
||||||
comb7indexR = 0; |
|
||||||
comb8indexR = 0; |
|
||||||
comb1filterR = 0; |
|
||||||
comb2filterR = 0; |
|
||||||
comb3filterR = 0; |
|
||||||
comb4filterR = 0; |
|
||||||
comb5filterR = 0; |
|
||||||
comb6filterR = 0; |
|
||||||
comb7filterR = 0; |
|
||||||
comb8filterR = 0; |
|
||||||
combdamp1 = 6553; |
|
||||||
combdamp2 = 26215; |
|
||||||
combfeeback = 27524; |
|
||||||
memset(allpass1bufL, 0, sizeof(allpass1bufL)); |
|
||||||
memset(allpass2bufL, 0, sizeof(allpass2bufL)); |
|
||||||
memset(allpass3bufL, 0, sizeof(allpass3bufL)); |
|
||||||
memset(allpass4bufL, 0, sizeof(allpass4bufL)); |
|
||||||
allpass1indexL = 0; |
|
||||||
allpass2indexL = 0; |
|
||||||
allpass3indexL = 0; |
|
||||||
allpass4indexL = 0; |
|
||||||
memset(allpass1bufR, 0, sizeof(allpass1bufR)); |
|
||||||
memset(allpass2bufR, 0, sizeof(allpass2bufR)); |
|
||||||
memset(allpass3bufR, 0, sizeof(allpass3bufR)); |
|
||||||
memset(allpass4bufR, 0, sizeof(allpass4bufR)); |
|
||||||
allpass1indexR = 0; |
|
||||||
allpass2indexR = 0; |
|
||||||
allpass3indexR = 0; |
|
||||||
allpass4indexR = 0; |
|
||||||
} |
|
||||||
|
|
||||||
void AudioEffectFreeverbSIMDStereo::update() |
|
||||||
{ |
|
||||||
#if defined(__ARM_ARCH_7EM__) |
|
||||||
const audio_block_t *block; |
|
||||||
audio_block_t *outblockL; |
|
||||||
audio_block_t *outblockR; |
|
||||||
int i; |
|
||||||
int16_t input, bufout, outputL, outputR; |
|
||||||
int32_t sum; |
|
||||||
|
|
||||||
block = receiveReadOnly(0); |
|
||||||
outblockL = allocate(); |
|
||||||
outblockR = allocate(); |
|
||||||
if (!outblockL || !outblockR) { |
|
||||||
if (outblockL) release(outblockL); |
|
||||||
if (outblockR) release(outblockR); |
|
||||||
if (block) release((audio_block_t *)block); |
|
||||||
return; |
|
||||||
} |
|
||||||
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
|
|
||||||
sum = 0; |
|
||||||
|
|
||||||
bufout = comb1bufL[comb1indexL]; |
|
||||||
sum += bufout; |
|
||||||
comb1filterL = sat16(bufout * combdamp2 + comb1filterL * combdamp1, 15); |
|
||||||
comb1bufL[comb1indexL] = sat16(input + sat16(comb1filterL * combfeeback, 15), 0); |
|
||||||
if (++comb1indexL >= sizeof(comb1bufL) / sizeof(int16_t)) comb1indexL = 0; |
|
||||||
|
|
||||||
bufout = comb2bufL[comb2indexL]; |
|
||||||
sum += bufout; |
|
||||||
comb2filterL = sat16(bufout * combdamp2 + comb2filterL * combdamp1, 15); |
|
||||||
comb2bufL[comb2indexL] = sat16(input + sat16(comb2filterL * combfeeback, 15), 0); |
|
||||||
if (++comb2indexL >= sizeof(comb2bufL) / sizeof(int16_t)) comb2indexL = 0; |
|
||||||
|
|
||||||
bufout = comb3bufL[comb3indexL]; |
|
||||||
sum += bufout; |
|
||||||
comb3filterL = sat16(bufout * combdamp2 + comb3filterL * combdamp1, 15); |
|
||||||
comb3bufL[comb3indexL] = sat16(input + sat16(comb3filterL * combfeeback, 15), 0); |
|
||||||
if (++comb3indexL >= sizeof(comb3bufL) / sizeof(int16_t)) comb3indexL = 0; |
|
||||||
|
|
||||||
bufout = comb4bufL[comb4indexL]; |
|
||||||
sum += bufout; |
|
||||||
comb4filterL = sat16(bufout * combdamp2 + comb4filterL * combdamp1, 15); |
|
||||||
comb4bufL[comb4indexL] = sat16(input + sat16(comb4filterL * combfeeback, 15), 0); |
|
||||||
if (++comb4indexL >= sizeof(comb4bufL) / sizeof(int16_t)) comb4indexL = 0; |
|
||||||
|
|
||||||
bufout = comb5bufL[comb5indexL]; |
|
||||||
sum += bufout; |
|
||||||
comb5filterL = sat16(bufout * combdamp2 + comb5filterL * combdamp1, 15); |
|
||||||
comb5bufL[comb5indexL] = sat16(input + sat16(comb5filterL * combfeeback, 15), 0); |
|
||||||
if (++comb5indexL >= sizeof(comb5bufL) / sizeof(int16_t)) comb5indexL = 0; |
|
||||||
|
|
||||||
bufout = comb6bufL[comb6indexL]; |
|
||||||
sum += bufout; |
|
||||||
comb6filterL = sat16(bufout * combdamp2 + comb6filterL * combdamp1, 15); |
|
||||||
comb6bufL[comb6indexL] = sat16(input + sat16(comb6filterL * combfeeback, 15), 0); |
|
||||||
if (++comb6indexL >= sizeof(comb6bufL) / sizeof(int16_t)) comb6indexL = 0; |
|
||||||
|
|
||||||
bufout = comb7bufL[comb7indexL]; |
|
||||||
sum += bufout; |
|
||||||
comb7filterL = sat16(bufout * combdamp2 + comb7filterL * combdamp1, 15); |
|
||||||
comb7bufL[comb7indexL] = sat16(input + sat16(comb7filterL * combfeeback, 15), 0); |
|
||||||
if (++comb7indexL >= sizeof(comb7bufL) / sizeof(int16_t)) comb7indexL = 0; |
|
||||||
|
|
||||||
bufout = comb8bufL[comb8indexL]; |
|
||||||
sum += bufout; |
|
||||||
comb8filterL = sat16(bufout * combdamp2 + comb8filterL * combdamp1, 15); |
|
||||||
comb8bufL[comb8indexL] = sat16(input + sat16(comb8filterL * combfeeback, 15), 0); |
|
||||||
if (++comb8indexL >= sizeof(comb8bufL) / sizeof(int16_t)) comb8indexL = 0; |
|
||||||
|
|
||||||
outputL = sat16(sum * 31457, 17); |
|
||||||
sum = 0; |
|
||||||
|
|
||||||
bufout = comb1bufR[comb1indexR]; |
|
||||||
sum += bufout; |
|
||||||
comb1filterR = sat16(bufout * combdamp2 + comb1filterR * combdamp1, 15); |
|
||||||
comb1bufR[comb1indexR] = sat16(input + sat16(comb1filterR * combfeeback, 15), 0); |
|
||||||
if (++comb1indexR >= sizeof(comb1bufR) / sizeof(int16_t)) comb1indexR = 0; |
|
||||||
|
|
||||||
bufout = comb2bufR[comb2indexR]; |
|
||||||
sum += bufout; |
|
||||||
comb2filterR = sat16(bufout * combdamp2 + comb2filterR * combdamp1, 15); |
|
||||||
comb2bufR[comb2indexR] = sat16(input + sat16(comb2filterR * combfeeback, 15), 0); |
|
||||||
if (++comb2indexR >= sizeof(comb2bufR) / sizeof(int16_t)) comb2indexR = 0; |
|
||||||
|
|
||||||
bufout = comb3bufR[comb3indexR]; |
|
||||||
sum += bufout; |
|
||||||
comb3filterR = sat16(bufout * combdamp2 + comb3filterR * combdamp1, 15); |
|
||||||
comb3bufR[comb3indexR] = sat16(input + sat16(comb3filterR * combfeeback, 15), 0); |
|
||||||
if (++comb3indexR >= sizeof(comb3bufR) / sizeof(int16_t)) comb3indexR = 0; |
|
||||||
|
|
||||||
bufout = comb4bufR[comb4indexR]; |
|
||||||
sum += bufout; |
|
||||||
comb4filterR = sat16(bufout * combdamp2 + comb4filterR * combdamp1, 15); |
|
||||||
comb4bufR[comb4indexR] = sat16(input + sat16(comb4filterR * combfeeback, 15), 0); |
|
||||||
if (++comb4indexR >= sizeof(comb4bufR) / sizeof(int16_t)) comb4indexR = 0; |
|
||||||
|
|
||||||
bufout = comb5bufR[comb5indexR]; |
|
||||||
sum += bufout; |
|
||||||
comb5filterR = sat16(bufout * combdamp2 + comb5filterR * combdamp1, 15); |
|
||||||
comb5bufR[comb5indexR] = sat16(input + sat16(comb5filterR * combfeeback, 15), 0); |
|
||||||
if (++comb5indexR >= sizeof(comb5bufR) / sizeof(int16_t)) comb5indexR = 0; |
|
||||||
|
|
||||||
bufout = comb6bufR[comb6indexR]; |
|
||||||
sum += bufout; |
|
||||||
comb6filterR = sat16(bufout * combdamp2 + comb6filterR * combdamp1, 15); |
|
||||||
comb6bufR[comb6indexR] = sat16(input + sat16(comb6filterR * combfeeback, 15), 0); |
|
||||||
if (++comb6indexR >= sizeof(comb6bufR) / sizeof(int16_t)) comb6indexR = 0; |
|
||||||
|
|
||||||
bufout = comb7bufR[comb7indexR]; |
|
||||||
sum += bufout; |
|
||||||
comb7filterR = sat16(bufout * combdamp2 + comb7filterR * combdamp1, 15); |
|
||||||
comb7bufR[comb7indexR] = sat16(input + sat16(comb7filterR * combfeeback, 15), 0); |
|
||||||
if (++comb7indexR >= sizeof(comb7bufR) / sizeof(int16_t)) comb7indexR = 0; |
|
||||||
|
|
||||||
bufout = comb8bufR[comb8indexR]; |
|
||||||
sum += bufout; |
|
||||||
comb8filterR = sat16(bufout * combdamp2 + comb8filterR * combdamp1, 15); |
|
||||||
comb8bufR[comb8indexR] = sat16(input + sat16(comb8filterR * combfeeback, 15), 0); |
|
||||||
if (++comb8indexR >= sizeof(comb8bufR) / sizeof(int16_t)) comb8indexR = 0; |
|
||||||
|
|
||||||
outputR = sat16(sum * 31457, 17); |
|
||||||
|
|
||||||
bufout = allpass1bufL[allpass1indexL]; |
|
||||||
allpass1bufL[allpass1indexL] = outputL + (bufout >> 1); |
|
||||||
outputL = sat16(bufout - outputL, 1); |
|
||||||
if (++allpass1indexL >= sizeof(allpass1bufL) / sizeof(int16_t)) allpass1indexL = 0; |
|
||||||
|
|
||||||
bufout = allpass2bufL[allpass2indexL]; |
|
||||||
allpass2bufL[allpass2indexL] = outputL + (bufout >> 1); |
|
||||||
outputL = sat16(bufout - outputL, 1); |
|
||||||
if (++allpass2indexL >= sizeof(allpass2bufL) / sizeof(int16_t)) allpass2indexL = 0; |
|
||||||
|
|
||||||
bufout = allpass3bufL[allpass3indexL]; |
|
||||||
allpass3bufL[allpass3indexL] = outputL + (bufout >> 1); |
|
||||||
outputL = sat16(bufout - outputL, 1); |
|
||||||
if (++allpass3indexL >= sizeof(allpass3bufL) / sizeof(int16_t)) allpass3indexL = 0; |
|
||||||
|
|
||||||
bufout = allpass4bufL[allpass4indexL]; |
|
||||||
allpass4bufL[allpass4indexL] = outputL + (bufout >> 1); |
|
||||||
outputL = sat16(bufout - outputL, 1); |
|
||||||
if (++allpass4indexL >= sizeof(allpass4bufL) / sizeof(int16_t)) allpass4indexL = 0; |
|
||||||
|
|
||||||
outblockL->data[i] = sat16(outputL * 30, 0); |
|
||||||
|
|
||||||
bufout = allpass1bufR[allpass1indexR]; |
|
||||||
allpass1bufR[allpass1indexR] = outputR + (bufout >> 1); |
|
||||||
outputR = sat16(bufout - outputR, 1); |
|
||||||
if (++allpass1indexR >= sizeof(allpass1bufR) / sizeof(int16_t)) allpass1indexR = 0; |
|
||||||
|
|
||||||
bufout = allpass2bufR[allpass2indexR]; |
|
||||||
allpass2bufR[allpass2indexR] = outputR + (bufout >> 1); |
|
||||||
outputR = sat16(bufout - outputR, 1); |
|
||||||
if (++allpass2indexR >= sizeof(allpass2bufR) / sizeof(int16_t)) allpass2indexR = 0; |
|
||||||
|
|
||||||
bufout = allpass3bufR[allpass3indexR]; |
|
||||||
allpass3bufR[allpass3indexR] = outputR + (bufout >> 1); |
|
||||||
outputR = sat16(bufout - outputR, 1); |
|
||||||
if (++allpass3indexR >= sizeof(allpass3bufR) / sizeof(int16_t)) allpass3indexR = 0; |
|
||||||
|
|
||||||
bufout = allpass4bufR[allpass4indexR]; |
|
||||||
allpass4bufR[allpass4indexR] = outputR + (bufout >> 1); |
|
||||||
outputR = sat16(bufout - outputR, 1); |
|
||||||
if (++allpass4indexR >= sizeof(allpass4bufR) / sizeof(int16_t)) allpass4indexR = 0; |
|
||||||
|
|
||||||
outblockR->data[i] = sat16(outputL * 30, 0); |
|
||||||
} |
|
||||||
transmit(outblockL, 0); |
|
||||||
transmit(outblockR, 1); |
|
||||||
release(outblockL); |
|
||||||
release(outblockR); |
|
||||||
if (block != &zeroblock) release((audio_block_t *)block); |
|
||||||
|
|
||||||
#elif defined(KINETISL) |
|
||||||
audio_block_t *block; |
|
||||||
block = receiveReadOnly(0); |
|
||||||
if (block) release(block); |
|
||||||
#endif |
|
||||||
} |
|
||||||
#endif |
|
||||||
@ -1,185 +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. |
|
||||||
*/ |
|
||||||
|
|
||||||
#ifdef USE_FREEVERB_SIMD |
|
||||||
#ifndef effect_freeverb_simd_h_ |
|
||||||
#define effect_freeverb_simd_h_ |
|
||||||
#include <Arduino.h> |
|
||||||
#include "AudioStream.h" |
|
||||||
|
|
||||||
class AudioEffectFreeverbSIMD : public AudioStream |
|
||||||
{ |
|
||||||
public: |
|
||||||
AudioEffectFreeverbSIMD(); |
|
||||||
virtual void update(); |
|
||||||
void roomsize(float n) { |
|
||||||
if (n > 1.0f) n = 1.0f; |
|
||||||
else if (n < 0.0f) n = 0.0f; |
|
||||||
combfeeback = (int)(n * 9175.04f) + 22937; |
|
||||||
} |
|
||||||
void damping(float n) { |
|
||||||
if (n > 1.0f) n = 1.0f; |
|
||||||
else if (n < 0.0f) n = 0.0f; |
|
||||||
int x1 = (int)(n * 13107.2f); |
|
||||||
int x2 = 32768 - x1; |
|
||||||
__disable_irq(); |
|
||||||
combdamp1 = x1; |
|
||||||
combdamp2 = x2; |
|
||||||
__enable_irq(); |
|
||||||
} |
|
||||||
private: |
|
||||||
audio_block_t *inputQueueArray[1]; |
|
||||||
int16_t comb1buf[1116]; |
|
||||||
int16_t comb2buf[1188]; |
|
||||||
int16_t comb3buf[1277]; |
|
||||||
int16_t comb4buf[1356]; |
|
||||||
int16_t comb5buf[1422]; |
|
||||||
int16_t comb6buf[1491]; |
|
||||||
int16_t comb7buf[1557]; |
|
||||||
int16_t 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; |
|
||||||
int16_t comb1filter; |
|
||||||
int16_t comb2filter; |
|
||||||
int16_t comb3filter; |
|
||||||
int16_t comb4filter; |
|
||||||
int16_t comb5filter; |
|
||||||
int16_t comb6filter; |
|
||||||
int16_t comb7filter; |
|
||||||
int16_t comb8filter; |
|
||||||
int16_t combdamp1; |
|
||||||
int16_t combdamp2; |
|
||||||
int16_t combfeeback; |
|
||||||
int16_t allpass1buf[556]; |
|
||||||
int16_t allpass2buf[441]; |
|
||||||
int16_t allpass3buf[341]; |
|
||||||
int16_t allpass4buf[225]; |
|
||||||
uint16_t allpass1index; |
|
||||||
uint16_t allpass2index; |
|
||||||
uint16_t allpass3index; |
|
||||||
uint16_t allpass4index; |
|
||||||
}; |
|
||||||
|
|
||||||
|
|
||||||
class AudioEffectFreeverbSIMDStereo : public AudioStream |
|
||||||
{ |
|
||||||
public: |
|
||||||
AudioEffectFreeverbSIMDStereo(); |
|
||||||
virtual void update(); |
|
||||||
void roomsize(float n) { |
|
||||||
if (n > 1.0f) n = 1.0f; |
|
||||||
else if (n < 0.0f) n = 0.0f; |
|
||||||
combfeeback = (int)(n * 9175.04f) + 22937; |
|
||||||
} |
|
||||||
void damping(float n) { |
|
||||||
if (n > 1.0f) n = 1.0f; |
|
||||||
else if (n < 0.0f) n = 0.0f; |
|
||||||
int x1 = (int)(n * 13107.2f); |
|
||||||
int x2 = 32768 - x1; |
|
||||||
__disable_irq(); |
|
||||||
combdamp1 = x1; |
|
||||||
combdamp2 = x2; |
|
||||||
__enable_irq(); |
|
||||||
} |
|
||||||
private: |
|
||||||
audio_block_t *inputQueueArray[1]; |
|
||||||
int16_t comb1bufL[1116]; |
|
||||||
int16_t comb2bufL[1188]; |
|
||||||
int16_t comb3bufL[1277]; |
|
||||||
int16_t comb4bufL[1356]; |
|
||||||
int16_t comb5bufL[1422]; |
|
||||||
int16_t comb6bufL[1491]; |
|
||||||
int16_t comb7bufL[1557]; |
|
||||||
int16_t 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; |
|
||||||
int16_t comb1filterL; |
|
||||||
int16_t comb2filterL; |
|
||||||
int16_t comb3filterL; |
|
||||||
int16_t comb4filterL; |
|
||||||
int16_t comb5filterL; |
|
||||||
int16_t comb6filterL; |
|
||||||
int16_t comb7filterL; |
|
||||||
int16_t comb8filterL; |
|
||||||
int16_t comb1bufR[1139]; |
|
||||||
int16_t comb2bufR[1211]; |
|
||||||
int16_t comb3bufR[1300]; |
|
||||||
int16_t comb4bufR[1379]; |
|
||||||
int16_t comb5bufR[1445]; |
|
||||||
int16_t comb6bufR[1514]; |
|
||||||
int16_t comb7bufR[1580]; |
|
||||||
int16_t 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; |
|
||||||
int16_t comb1filterR; |
|
||||||
int16_t comb2filterR; |
|
||||||
int16_t comb3filterR; |
|
||||||
int16_t comb4filterR; |
|
||||||
int16_t comb5filterR; |
|
||||||
int16_t comb6filterR; |
|
||||||
int16_t comb7filterR; |
|
||||||
int16_t comb8filterR; |
|
||||||
int16_t combdamp1; |
|
||||||
int16_t combdamp2; |
|
||||||
int16_t combfeeback; |
|
||||||
int16_t allpass1bufL[556]; |
|
||||||
int16_t allpass2bufL[441]; |
|
||||||
int16_t allpass3bufL[341]; |
|
||||||
int16_t allpass4bufL[225]; |
|
||||||
uint16_t allpass1indexL; |
|
||||||
uint16_t allpass2indexL; |
|
||||||
uint16_t allpass3indexL; |
|
||||||
uint16_t allpass4indexL; |
|
||||||
int16_t allpass1bufR[579]; |
|
||||||
int16_t allpass2bufR[464]; |
|
||||||
int16_t allpass3bufR[364]; |
|
||||||
int16_t allpass4bufR[248]; |
|
||||||
uint16_t allpass1indexR; |
|
||||||
uint16_t allpass2indexR; |
|
||||||
uint16_t allpass3indexR; |
|
||||||
uint16_t allpass4indexR; |
|
||||||
}; |
|
||||||
|
|
||||||
#endif |
|
||||||
#endif |
|
||||||
@ -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-2022 H. Wirtz <wirtz@parasitstudio.de> |
|
||||||
|
|
||||||
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 |
|
||||||
@ -1,5 +1,5 @@ |
|||||||
// ArduinoJson - https://arduinojson.org
|
// ArduinoJson - https://arduinojson.org
|
||||||
// Copyright Benoit Blanchon 2014-2021
|
// Copyright © 2014-2022, Benoit BLANCHON
|
||||||
// MIT License
|
// MIT License
|
||||||
|
|
||||||
#include "src/ArduinoJson.h" |
#include "src/ArduinoJson.h" |
||||||
|
|||||||
@ -1,22 +1,37 @@ |
|||||||
version: 6.18.5.{build} |
version: 6.19.2.{build} |
||||||
environment: |
environment: |
||||||
matrix: |
matrix: |
||||||
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 |
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 |
||||||
CMAKE_GENERATOR: Visual Studio 16 2019 |
CMAKE_GENERATOR: Visual Studio 17 2022 |
||||||
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 |
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 |
||||||
CMAKE_GENERATOR: Visual Studio 15 2017 |
CMAKE_GENERATOR: Visual Studio 16 2019 |
||||||
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 |
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 |
||||||
CMAKE_GENERATOR: Visual Studio 14 2015 |
CMAKE_GENERATOR: Visual Studio 15 2017 |
||||||
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 |
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 |
||||||
CMAKE_GENERATOR: Visual Studio 12 2013 |
CMAKE_GENERATOR: Visual Studio 14 2015 |
||||||
- CMAKE_GENERATOR: Visual Studio 11 2012 |
- CMAKE_GENERATOR: Visual Studio 12 2013 |
||||||
- CMAKE_GENERATOR: Visual Studio 10 2010 |
- CMAKE_GENERATOR: Visual Studio 11 2012 |
||||||
- CMAKE_GENERATOR: MinGW Makefiles |
- CMAKE_GENERATOR: Visual Studio 10 2010 |
||||||
|
- CMAKE_GENERATOR: Ninja |
||||||
|
MINGW: MinGW # MinGW 32-bit 5.3.0 |
||||||
|
- CMAKE_GENERATOR: Ninja |
||||||
|
MINGW32: i686-5.3.0-posix-dwarf-rt_v4-rev0 # MinGW-w64 5.3.0 |
||||||
|
- CMAKE_GENERATOR: Ninja |
||||||
|
MINGW32: i686-6.3.0-posix-dwarf-rt_v5-rev1 # MinGW-w64 6.3.0 i686 |
||||||
|
- CMAKE_GENERATOR: Ninja |
||||||
|
MINGW64: x86_64-6.3.0-posix-seh-rt_v5-rev1 # MinGW-w64 6.3.0 x86_64 |
||||||
|
- CMAKE_GENERATOR: Ninja |
||||||
|
MINGW64: x86_64-7.3.0-posix-seh-rt_v5-rev0 # MinGW-w64 7.3.0 x86_64 |
||||||
|
- CMAKE_GENERATOR: Ninja |
||||||
|
MINGW64: x86_64-8.1.0-posix-seh-rt_v6-rev0 # MinGW-w64 8.1.0 x86_64 |
||||||
configuration: Debug |
configuration: Debug |
||||||
before_build: |
before_build: |
||||||
- set PATH=C:\MinGW\bin;%PATH:C:\Program Files\Git\usr\bin;=% # Workaround for CMake not wanting sh.exe on PATH for MinGW |
- set PATH=%PATH:C:\Program Files\Git\usr\bin;=% # Workaround for CMake not wanting sh.exe on PATH for MinGW |
||||||
- cmake -DCMAKE_BUILD_TYPE=%CONFIGURATION% -G "%CMAKE_GENERATOR%" . |
- if defined MINGW set PATH=C:\%MINGW%\bin;%PATH% |
||||||
|
- if defined MINGW32 set PATH=C:\mingw-w64\%MINGW32%\mingw32\bin;%PATH% |
||||||
|
- if defined MINGW64 set PATH=C:\mingw-w64\%MINGW64%\mingw64\bin;%PATH% |
||||||
|
- cmake -DCMAKE_BUILD_TYPE=%CONFIGURATION% -G "%CMAKE_GENERATOR%" . |
||||||
build_script: |
build_script: |
||||||
- cmake --build . --config %CONFIGURATION% |
- cmake --build . --config %CONFIGURATION% |
||||||
test_script: |
test_script: |
||||||
- ctest -C %CONFIGURATION% --output-on-failure . |
- ctest -C %CONFIGURATION% --output-on-failure . |
||||||
|
|||||||
@ -0,0 +1,16 @@ |
|||||||
|
#include <ArduinoJson.h> |
||||||
|
|
||||||
|
static_assert(ARDUINOJSON_USE_LONG_LONG == 0, "ARDUINOJSON_USE_LONG_LONG"); |
||||||
|
|
||||||
|
static_assert(ARDUINOJSON_SLOT_OFFSET_SIZE == 1, |
||||||
|
"ARDUINOJSON_SLOT_OFFSET_SIZE"); |
||||||
|
|
||||||
|
static_assert(ARDUINOJSON_LITTLE_ENDIAN == 1, "ARDUINOJSON_LITTLE_ENDIAN"); |
||||||
|
|
||||||
|
static_assert(ARDUINOJSON_USE_DOUBLE == 1, "ARDUINOJSON_USE_DOUBLE"); |
||||||
|
|
||||||
|
static_assert(sizeof(ARDUINOJSON_NAMESPACE::VariantSlot) == 8, |
||||||
|
"sizeof(VariantSlot)"); |
||||||
|
|
||||||
|
void setup() {} |
||||||
|
void loop() {} |
||||||
@ -0,0 +1,16 @@ |
|||||||
|
#include <ArduinoJson.h> |
||||||
|
|
||||||
|
static_assert(ARDUINOJSON_USE_LONG_LONG == 1, "ARDUINOJSON_USE_LONG_LONG"); |
||||||
|
|
||||||
|
static_assert(ARDUINOJSON_SLOT_OFFSET_SIZE == 2, |
||||||
|
"ARDUINOJSON_SLOT_OFFSET_SIZE"); |
||||||
|
|
||||||
|
static_assert(ARDUINOJSON_LITTLE_ENDIAN == 1, "ARDUINOJSON_LITTLE_ENDIAN"); |
||||||
|
|
||||||
|
static_assert(ARDUINOJSON_USE_DOUBLE == 1, "ARDUINOJSON_USE_DOUBLE"); |
||||||
|
|
||||||
|
static_assert(sizeof(ARDUINOJSON_NAMESPACE::VariantSlot) == 16, |
||||||
|
"sizeof(VariantSlot)"); |
||||||
|
|
||||||
|
void setup() {} |
||||||
|
void loop() {} |
||||||
@ -0,0 +1,15 @@ |
|||||||
|
#include <ArduinoJson.h> |
||||||
|
|
||||||
|
static_assert(ARDUINOJSON_USE_LONG_LONG == 1, "ARDUINOJSON_USE_LONG_LONG"); |
||||||
|
|
||||||
|
static_assert(ARDUINOJSON_SLOT_OFFSET_SIZE == 4, |
||||||
|
"ARDUINOJSON_SLOT_OFFSET_SIZE"); |
||||||
|
|
||||||
|
static_assert(ARDUINOJSON_LITTLE_ENDIAN == 1, "ARDUINOJSON_LITTLE_ENDIAN"); |
||||||
|
|
||||||
|
static_assert(ARDUINOJSON_USE_DOUBLE == 1, "ARDUINOJSON_USE_DOUBLE"); |
||||||
|
|
||||||
|
static_assert(sizeof(ARDUINOJSON_NAMESPACE::VariantSlot) == 32, |
||||||
|
"sizeof(VariantSlot)"); |
||||||
|
|
||||||
|
int main() {} |
||||||
@ -0,0 +1,15 @@ |
|||||||
|
#include <ArduinoJson.h> |
||||||
|
|
||||||
|
static_assert(ARDUINOJSON_USE_LONG_LONG == 1, "ARDUINOJSON_USE_LONG_LONG"); |
||||||
|
|
||||||
|
static_assert(ARDUINOJSON_SLOT_OFFSET_SIZE == 2, |
||||||
|
"ARDUINOJSON_SLOT_OFFSET_SIZE"); |
||||||
|
|
||||||
|
static_assert(ARDUINOJSON_LITTLE_ENDIAN == 1, "ARDUINOJSON_LITTLE_ENDIAN"); |
||||||
|
|
||||||
|
static_assert(ARDUINOJSON_USE_DOUBLE == 1, "ARDUINOJSON_USE_DOUBLE"); |
||||||
|
|
||||||
|
static_assert(sizeof(ARDUINOJSON_NAMESPACE::VariantSlot) == 16, |
||||||
|
"sizeof(VariantSlot)"); |
||||||
|
|
||||||
|
int main() {} |
||||||
@ -0,0 +1,35 @@ |
|||||||
|
// ArduinoJson - https://arduinojson.org
|
||||||
|
// Copyright © 2014-2022, Benoit BLANCHON
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#include <ArduinoJson.h> |
||||||
|
#include <catch.hpp> |
||||||
|
|
||||||
|
using namespace Catch::Matchers; |
||||||
|
|
||||||
|
TEST_CASE("Unbound JsonArray") { |
||||||
|
JsonArray array; |
||||||
|
|
||||||
|
SECTION("SubscriptFails") { |
||||||
|
REQUIRE(array[0].isNull()); |
||||||
|
} |
||||||
|
|
||||||
|
SECTION("AddFails") { |
||||||
|
array.add(1); |
||||||
|
REQUIRE(0 == array.size()); |
||||||
|
} |
||||||
|
|
||||||
|
SECTION("CreateNestedArrayFails") { |
||||||
|
REQUIRE(array.createNestedArray().isNull()); |
||||||
|
} |
||||||
|
|
||||||
|
SECTION("CreateNestedObjectFails") { |
||||||
|
REQUIRE(array.createNestedObject().isNull()); |
||||||
|
} |
||||||
|
|
||||||
|
SECTION("PrintToWritesBrackets") { |
||||||
|
char buffer[32]; |
||||||
|
serializeJson(array, buffer, sizeof(buffer)); |
||||||
|
REQUIRE_THAT(buffer, Equals("null")); |
||||||
|
} |
||||||
|
} |
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue