Jan/WLED_MM_Infinity
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Sound Pressure - some optimizations

Browse Source 
- slightly extend input range
- add correction factors for some sound sources
- gravimeter: tweaking
This commit is contained in:
Frank
2023-04-10 02:04:53 +02:00
parent 822fcf272b
commit 61949cfdc8
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
usermods/audioreactive/audio_reactive.h
View File

@@ -1260,14 +1260,17 @@ class AudioReactive : public Usermod {
// use with I2S digital microphones. Expect stupid values for analog in, and with Line-In !!
float estimatePressure() {
// some constants
constexpr float logMinSample = 1.2237754316221f; // ln(3.4)
constexpr float sampleMin = 3.4f;
constexpr float logMinSample = 0.8329091229351f; // ln(2.3)
constexpr float sampleMin = 2.3f;
constexpr float logMaxSample = 10.1895683436f; // ln(32767 - 6144)
constexpr float sampleMax = 32767.0f - 6144.0f;
// take the max sample from last I2S batch.
float micSampleMax = fabsf(sampleReal); // from getSample() - nice results, however distorted by MicLev processing
//float micSampleMax = fabsf(micDataReal); // from FFTCode() - better source, but I'll do more testing before activating this
float micSampleMax = fabsf(sampleReal); // from getSample() - nice results, however a bit distorted by MicLev processing
//float micSampleMax = fabsf(micDataReal); // from FFTCode() - better source, but more flickering
if (dmType == 0) micSampleMax *= 4.0f; // correction for ADC analog
if (dmType == 4) micSampleMax *= 16.0f; // correction for I2S Line-In
if (dmType == 5) micSampleMax *= 4.0f; // correction for PDM
// make sure we are in expected ranges
if(micSampleMax <= sampleMin) return 0.0f;
if(micSampleMax >= sampleMax) return 255.0f;

15
wled00/FX.cpp
View File

@@ -6162,7 +6162,7 @@ uint16_t mode_2DWaverly(void) {
float agcSensitivity= *(float*) um_data->u_data[10];
SEGMENT.fadeToBlackBy(SEGMENT.speed);
if (SEGENV.check3 && SEGENV.check2) SEGENV.check2 = false; // only one of the two at anyy time
if (SEGENV.check3 && SEGENV.check2) SEGENV.check2 = false; // only one of the two at any time
if ((SEGENV.check2) && (volumeSmth > 0.5f)) volumeSmth = soundPressure; // show sound pressure instead of volume
if (SEGENV.check3) volumeSmth = 255.0 - agcSensitivity; // show AGC level instead of volume
@@ -6324,14 +6324,16 @@ uint16_t mode_gravimeter(void) { // Gravmeter. By Andrew Tuline.
float realVolume = volumeSmth;
if (SEGENV.check3 && SEGENV.check2) SEGENV.check2 = false; // only one option
if ((SEGENV.check2) && (realVolume >= 0.5f)) volumeSmth = soundPressure;
if (SEGENV.check2) volumeSmth = soundPressure;
if (SEGENV.check3) volumeSmth = 255.0 - agcSensitivity;
SEGMENT.fade_out(253);
float sensGain = (float)(SEGMENT.intensity+2) / 257.0f; // min gain = 1/128
if (sensGain > 0.5f) sensGain = ((sensGain -0.5f) * 2.0f) +0.5f; // extend upper range to 3x
if (sensGain > 0.5f) sensGain = ((sensGain -0.5f) * 3.0f) +0.5f; // extend upper range to 3x
float sensOffset = (SEGMENT.check2 && SEGMENT.intensity > 128) ? (float(SEGMENT.intensity - 128)*0.42f) : 0.0f; // slightly raise lower limit, to show more details (sound pressure only)
float segmentSampleAvg = volumeSmth * sensGain;
float segmentSampleAvg = (volumeSmth * sensGain) - sensOffset;
if (segmentSampleAvg < 0) segmentSampleAvg = 0; // could be <0 due to sensOffset
segmentSampleAvg *= 0.25f; // divide by 4, to compensate for later "sensitivty" upscaling
float mySampleAvg = mapf(segmentSampleAvg*2.0f, 0, 64, 0, (SEGLEN-1)); // map to pixels availeable in current segment
int tempsamp = constrain(mySampleAvg,0,SEGLEN-1); // Keep the sample from overflowing.
@@ -6343,9 +6345,8 @@ uint16_t mode_gravimeter(void) { // Gravmeter. By Andrew Tuline.
//if ((realVolume > 1) && ((blendVal < 1) || (blendVal > 254))) blendVal = millis() % 192; // provides flickering when overtuned
//else
blendVal = constrain(blendVal, 0, 255); // and saturation for all
if (realVolume > 0.5) // hide main "bar" in silence
blendVal = constrain(blendVal, 32, 255); // and saturation for all
if (realVolume > 0.85) // hide main "bar" in silence
for (int i=0; i<tempsamp; i++) {
uint8_t index = inoise8(i*segmentSampleAvg+millis(), 5000+i*segmentSampleAvg);
SEGMENT.setPixelColor(i, color_blend(SEGCOLOR(1), SEGMENT.color_from_palette(index, false, PALETTE_SOLID_WRAP, 0), (uint8_t)blendVal));