Interpolate between lut entries

This commit is contained in:
Jan-Henrik 2020-05-09 18:06:44 +02:00
parent 8557960572
commit 4f1b3ff867
2 changed files with 15 additions and 19 deletions

View file

@ -6,47 +6,43 @@
using namespace stereo_mix; using namespace stereo_mix;
using namespace stmlib; using namespace stmlib;
const int kVolumeFilterValue = 65535;
void Processor::Process(int16_t cvs[], uint16_t* outs) void Processor::Process(int16_t cvs[], uint16_t* outs)
{ {
uint32_t value_l; uint32_t value_l;
uint32_t value_r; uint32_t value_r;
uint16_t pan_pot = (pan_offset + 32767L) >> (16 - 12); // adc is only 12 bit anyways uint16_t pan_pot = (pan_offset + 32767L);
uint16_t vol_pot = (volume_offset) >> (16 - 12); uint16_t vol_pot = (volume_offset);
int16_t pan_cv = cvs[0] >> (16 - 12); int16_t pan_cv = cvs[0];
int16_t vol_cv = cvs[1] >> (16 - 12); int16_t vol_cv = cvs[1];
int32_t pan = pan_pot + pan_cv; int32_t pan = pan_pot + pan_cv;
// calculate value for ui // calculate value for ui
int32_t lin = volume_offset + (cvs[1] * 2); int32_t lin = volume_offset + (cvs[1] << 1);
CONSTRAIN(lin, 0, 65535); CONSTRAIN(lin, 0, 65535);
lin *= !mute; lin *= !mute;
linear_vol = lin; this->linear_vol = lin;
uint16_t vol_pot_exp = lut_linear_to_exp[vol_pot]; uint16_t vol_pot_exp = Interpolate124(lut_linear_to_exp, vol_pot);
uint16_t vol_pot_log = 65535 - lut_linear_to_exp[LUT_LINEAR_TO_EXP_SIZE - 1 - vol_pot]; uint16_t vol_pot_log = 65535 - InverseInterpolate124(lut_linear_to_exp, vol_pot);
vol_pot = Mix(vol_pot_exp, vol_pot_log, log_exp_mix_pot); vol_pot = Mix(vol_pot_exp, vol_pot_log, log_exp_mix_pot);
vol_pot = vol_pot_exp;
int32_t vol = vol_pot; int32_t vol = vol_pot;
uint16_t vol_cv_absu16 = abs(vol_cv); uint16_t vol_cv_absu16 = abs(vol_cv);
uint16_t vol_cv_exp = lut_linear_to_exp[vol_cv_absu16]; uint16_t vol_cv_exp = Interpolate124(lut_linear_to_exp, vol_cv_absu16);
uint16_t vol_cv_log = 65535 - lut_linear_to_exp[LUT_LINEAR_TO_EXP_SIZE - 1 - vol_cv_absu16]; uint16_t vol_cv_log = 65535 - InverseInterpolate124(lut_linear_to_exp, vol_cv_absu16);
uint16_t vol_cv_pre = Mix(vol_cv_exp, vol_cv_log, log_exp_mix_cv); uint16_t vol_cv_pre = Mix(vol_cv_exp, vol_cv_log, log_exp_mix_cv);
vol += vol_cv > 0 ? vol_cv_pre : -vol_cv_pre; vol += vol_cv > 0 ? vol_cv_pre : -vol_cv_pre;
vol *= !mute; vol *= !mute;
CONSTRAIN(pan, 0, 4095); CONSTRAIN(pan, 0, 65535);
CONSTRAIN(vol, 0, 65535); CONSTRAIN(vol, 0, 65535);
previous_vol = vol; this->previous_vol = vol;
// leds.set_intensity(i, vol >> 4); value_l = (Interpolate124(lut_left_sin_pan, pan) * vol) >> 16;
value_l = (lut_left_sin_pan[pan] * vol) >> 16; value_r = (Interpolate124(lut_right_cos_pan, pan) * vol) >> 16;
value_r = (lut_right_cos_pan[pan] * vol) >> 16;
outs[0] = value_r; outs[0] = value_r;
outs[1] = value_l; outs[1] = value_l;

2
stmlib

@ -1 +1 @@
Subproject commit 93e97d160dc0d3613bf39c3a7a908e719ed24797 Subproject commit bac07fcc33cbdf4f53528ba79f8b94ee8d0093bd