From f5a2da7c8a0091cf1e381fbf650185d4c050c465 Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Wed, 1 Mar 2023 22:50:47 -0800 Subject: [PATCH] Match and link hw_volconv Former-commit-id: b483ad89506da3a30676e59274324bc261b4e5b5 --- configure.py | 2 +- libc/math.h | 1 + src/musyx/runtime/hw_volconv.c | 84 +++++++++++++++++++++++++--------- 3 files changed, 64 insertions(+), 23 deletions(-) diff --git a/configure.py b/configure.py index 78026289..d9b9c12b 100755 --- a/configure.py +++ b/configure.py @@ -939,7 +939,7 @@ LIBS = [ ["musyx/runtime/synth_dbtab", True], ["musyx/runtime/s_data", True], ["musyx/runtime/hw_dspctrl", False], - ["musyx/runtime/hw_volconv", False], + ["musyx/runtime/hw_volconv", True], ["musyx/runtime/snd3d", False], ["musyx/runtime/snd_init", True], ["musyx/runtime/snd_math", True], diff --git a/libc/math.h b/libc/math.h index 5dd235a0..fe3442cc 100644 --- a/libc/math.h +++ b/libc/math.h @@ -78,6 +78,7 @@ _MATH_INLINE float fabsf(float x) { return (float)fabs((double)x); } _MATH_INLINE float sinf(float x) { return (float)sin((double)x); } _MATH_INLINE float cosf(float x) { return (float)cos((double)x); } _MATH_INLINE float atan2f(float y, float x) { return (float)atan2((double)y, (double)x); } +float fmodf(float x, float m) { return (float)fmod((double)x, (double)m); } float tanf(float x); double acos(double x); float acosf(float x); diff --git a/src/musyx/runtime/hw_volconv.c b/src/musyx/runtime/hw_volconv.c index 1ba0685a..343e4cf4 100644 --- a/src/musyx/runtime/hw_volconv.c +++ b/src/musyx/runtime/hw_volconv.c @@ -1,15 +1,48 @@ #include "musyx/musyx_priv.h" +#include "musyx/synth_dbtab.h" + #include static float musyx_vol_tab[129] = { - + 0.f, 3.0518499e-05f, 0.000152593f, 0.000396741f, 0.00070192601f, + 0.00112918f, 0.001648f, 0.00222785f, 0.0029297799f, 0.00372326f, + 0.0046082898f, 0.00558489f, 0.0066530402f, 0.0078432597f, 0.0091250297f, + 0.0104984f, 0.0119633f, 0.0135502f, 0.0151982f, 0.0169988f, + 0.0188604f, 0.0208441f, 0.0229194f, 0.025116701f, 0.027405599f, + 0.0298166f, 0.032319099f, 0.0349437f, 0.037659802f, 0.040467501f, + 0.043427799f, 0.046479698f, 0.049623098f, 0.052888598f, 0.056276102f, + 0.059785798f, 0.063386902f, 0.067110203f, 0.0709555f, 0.074922897f, + 0.078981899f, 0.083162896f, 0.087466002f, 0.091921799f, 0.096469f, + 0.101138f, 0.10593f, 0.110843f, 0.115879f, 0.121036f, + 0.12634701f, 0.13174801f, 0.13730299f, 0.142979f, 0.14877801f, + 0.15472899f, 0.160772f, 0.166997f, 0.173315f, 0.179785f, + 0.186407f, 0.193121f, 0.200018f, 0.20700701f, 0.21417899f, + 0.22147299f, 0.228919f, 0.236488f, 0.24420901f, 0.252083f, + 0.260079f, 0.26825801f, 0.276559f, 0.28501201f, 0.29364899f, + 0.30240801f, 0.31131899f, 0.32038301f, 0.32960001f, 0.33899999f, + 0.34852099f, 0.358226f, 0.36808401f, 0.37809399f, 0.38828701f, + 0.398633f, 0.40913099f, 0.41981301f, 0.43064699f, 0.44166401f, + 0.45286399f, 0.46421701f, 0.47575301f, 0.48744199f, 0.499313f, + 0.51139897f, 0.523606f, 0.53602701f, 0.54863101f, 0.56141901f, + 0.57438898f, 0.587542f, 0.60087901f, 0.61439902f, 0.62813199f, + 0.64201802f, 0.65614802f, 0.67043102f, 0.68492699f, 0.699637f, + 0.71452999f, 0.72963703f, 0.74492598f, 0.76042998f, 0.77614701f, + 0.792077f, 0.808191f, 0.82454902f, 0.84109002f, 0.85784501f, + 0.87484401f, 0.89205599f, 0.90945202f, 0.927122f, 0.94500601f, + 0.96307302f, 0.98141402f, 1.f, 1.f, }; static float pan_tab[4] = { - + 0.f, + 0.7079f, + 1.0f, + 1.0f, }; static float pan_tab_dpl2[4] = { - + 0.575f, + 0.7079f, + 1.f, + 1.f, }; void CalcBus(float* vol_tab, float* vl, float* vr, float* vs, float vol, struct SAL_PANINFO* pi) { @@ -23,25 +56,27 @@ void CalcBus(float* vol_tab, float* vl, float* vr, float* vs, float vol, struct *vs = f * ((1.f - pi->span_f) * pan_tab[pi->span_i] + pi->span_f * pan_tab[pi->span_i + 1]) * 0.7079f; f = f * ((1.f - pi->span_fm) * pan_tab[pi->span_im] + pi->span_fm * pan_tab[pi->span_im + 1]); - *vr = f * ((1.f - pi->span_f) * pan_tab[pi->pan_i] + pi->pan_f * pan_tab[pi->pan_i + 1]); + *vr = f * ((1.f - pi->pan_f) * pan_tab[pi->pan_i] + pi->pan_f * pan_tab[pi->pan_i + 1]); *vl = f * ((1.f - pi->pan_fm) * pan_tab[pi->pan_im] + pi->pan_fm * pan_tab[pi->pan_im + 1]); } void CalcBusDPL2(float* vol_tab, float* fvl, float* fvr, float* rvl, float* rvr, float vol, - struct SAL_PANINFO* pi) { + SAL_PANINFO* pi) { u32 i; // r29 float f; // r62 float v; // r63 float vs; // r61 i = vol * 127; - v = (vol * 127.f) - (float)i * ((1.f - v) * vol_tab[i] + v * vol_tab[i + 1]); - f = v * ((1.f - pi->span_f) * pan_tab[pi->span_i] + pi->span_f * pan_tab[pi->span_i + 1]); - vs = v * ((1.f - pi->span_fm) * pan_tab[pi->span_im] + pi->span_fm * pan_tab[pi->span_im + 1]); - *fvr = vs * ((1.f - pi->pan_f) * pan_tab[pi->pan_i] + pi->pan_f * pan_tab[pi->pan_i + 1]); - *fvl = vs * ((1.f - pi->pan_fm) * pan_tab[pi->pan_im] + pi->pan_fm * pan_tab[pi->pan_im + 1]); - *rvr = f * ((1.f - pi->rpan_f) * pan_tab_dpl2[pi->rpan_i] + pi->rpan_f * pan_tab[pi->rpan_i + 1]); - *rvl = f * + f = vol * 127 - (float)i; + v = (1.f - f) * vol_tab[i] + f * vol_tab[i + 1]; + vs = v * ((1.f - pi->span_f) * pan_tab[pi->span_i] + pi->span_f * pan_tab[pi->span_i + 1]); + v *= (1.f - pi->span_fm) * pan_tab[pi->span_im] + pi->span_fm * pan_tab[pi->span_im + 1]; + *fvr = v * ((1.f - pi->pan_f) * pan_tab[pi->pan_i] + pi->pan_f * pan_tab[pi->pan_i + 1]); + *fvl = v * ((1.f - pi->pan_fm) * pan_tab[pi->pan_im] + pi->pan_fm * pan_tab[pi->pan_im + 1]); + *rvr = + vs * ((1.f - pi->rpan_f) * pan_tab_dpl2[pi->rpan_i] + pi->rpan_f * pan_tab[pi->rpan_i + 1]); + *rvl = vs * ((1.f - pi->rpan_fm) * pan_tab_dpl2[pi->rpan_im] + pi->rpan_fm * pan_tab[pi->rpan_im + 1]); } @@ -63,13 +98,16 @@ void salCalcVolume(u8 voltab_index, SAL_VOLINFO* vi, float vol, u32 pan, u32 spa span = 0x7f0000; } - p = (float)(pan <= 0x10000 ? 0 : pan - 0x10000) * 2.42203e-07f; - sp = (float)(span <= 0x10000 ? 0 : span - 0x10000) * 2.42203e-07f; + pan = (pan <= 0x10000 ? 0 : pan - 0x10000); + span = (span <= 0x10000 ? 0 : span - 0x10000); + + p = pan * 2.4220301e-07f; + sp = span * 2.4220301e-07f; if (dpl2 != FALSE) { - pi.rpan_f = fmod(p, 1.f); + pi.rpan_f = fmodf(p, 1.f); pi.rpan_i = p; - pi.rpan_fm = fmod(2.f - p, 1.f); + pi.rpan_fm = fmodf(2.f - p, 1.f); pi.rpan_im = 2.f - p; } @@ -77,14 +115,16 @@ void salCalcVolume(u8 voltab_index, SAL_VOLINFO* vi, float vol, u32 pan, u32 spa p = (p - 1.f) * 0.76604f + 1.f; } - pi.pan_f = fmod(p, 1.f); + pi.pan_f = fmodf(p, 1.f); pi.pan_i = p; - pi.span_f = fmod(sp, 1.f); + pi.span_f = fmodf(sp, 1.f); pi.span_i = sp; - pi.pan_fm = fmod(2.f - p, 1.f); - pi.pan_im = 2.f - p; - pi.span_fm = fmod(2.f - sp, 1.f); - pi.span_im = 2.f - p; + p = 2.f - p; + sp = 2.f - sp; + pi.pan_fm = fmodf(p, 1.f); + pi.pan_im = p; + pi.span_fm = fmodf(sp, 1.f); + pi.span_im = sp; if (!dpl2) { CalcBus(vol_tab, &vi->volL, &vi->volR, &vi->volS, vol, &pi);