Commit a516fe33 authored by Marek Szczerba's avatar Marek Szczerba
Browse files

Minor refactoring

parent efc7a668

lib_rend/ivas_rom_rend.c

+36 −36
Original line number Diff line number Diff line
@@ -346,42 +346,6 @@ const float t_design_11_elevation[70] = 
* Reverberator ROM tables

*-----------------------------------------------------------------------*/



const float ivas_reverb_default_large_fc[IVAS_REVERB_DEFAULT_L_N_BANDS] =

{

    20.0f, 25.0f, 31.5f, 40.0f,

    50.0f, 63.0f, 80.0f, 100.0f,

    125.0f, 160.0f, 200.0f, 250.0f,

    315.0f, 400.0f, 500.0f, 630.0f,

    800.0f, 1000.0f, 1250.0f, 1600.0f,

    2000.0f, 2500.0f, 3150.0f, 4000.0f,

    5000.0f, 6300.0f, 8000.0f, 10000.0f,

    12500.0f, 16000.0f, 20000.0f

};



const float ivas_reverb_default_large_RT60[IVAS_REVERB_DEFAULT_L_N_BANDS] =

{

    1.3622f, 1.4486f, 1.3168f, 1.5787f,

    1.4766f, 1.3954f, 1.2889f, 1.3462f,

    1.0759f, 1.0401f, 1.097f, 1.085f,

    1.091f, 1.0404f, 1.0499f, 1.0699f,

    1.1028f, 1.1714f, 1.1027f, 1.0666f,

    1.055f, 1.0553f, 1.0521f, 1.0569f,

    1.0421f, 0.97822f, 0.80487f, 0.75944f,

    0.71945f, 0.61682f, 0.60031f

};



const float ivas_reverb_default_large_DSR[IVAS_REVERB_DEFAULT_L_N_BANDS] =

{

    1.8811e-08f, 2.1428e-08f, 1.3972e-08f, 1.51e-08f,

    1.287e-08f, 1.8747e-08f, 2.413e-08f, 3.9927e-08f,

    8.9719e-08f, 1.902e-07f, 3.702e-07f, 6.1341e-07f,

    7.1432e-07f, 6.5331e-07f, 4.6094e-07f, 5.4683e-07f,

    7.0134e-07f, 6.856e-07f, 7.114e-07f, 6.9604e-07f,

    5.2939e-07f, 5.699e-07f, 6.1773e-07f, 5.7488e-07f,

    4.7748e-07f, 2.7213e-07f, 1.3681e-07f, 1.0941e-07f,

    6.2001e-08f, 2.8483e-08f, 2.6267e-08f

};



const float ivas_reverb_default_small_fc[IVAS_REVERB_DEFAULT_S_N_BANDS] =

{

    200.0f, 600.0f, 1000.0f, 1400.0f, 1800.0f, 2200.0f, 2600.0f, 3000.0f, 3400.0f, 3800.0f,
@@ -448,6 +412,42 @@ const float ivas_reverb_default_medium_DSR[IVAS_REVERB_DEFAULT_M_N_BANDS] = 
    2.210372e-06f, 2.210372e-06f, 2.210372e-06f

};



const float ivas_reverb_default_large_fc[IVAS_REVERB_DEFAULT_L_N_BANDS] =

{

    20.0f, 25.0f, 31.5f, 40.0f,

    50.0f, 63.0f, 80.0f, 100.0f,

    125.0f, 160.0f, 200.0f, 250.0f,

    315.0f, 400.0f, 500.0f, 630.0f,

    800.0f, 1000.0f, 1250.0f, 1600.0f,

    2000.0f, 2500.0f, 3150.0f, 4000.0f,

    5000.0f, 6300.0f, 8000.0f, 10000.0f,

    12500.0f, 16000.0f, 20000.0f

};



const float ivas_reverb_default_large_RT60[IVAS_REVERB_DEFAULT_L_N_BANDS] =

{

    1.3622f, 1.4486f, 1.3168f, 1.5787f,

    1.4766f, 1.3954f, 1.2889f, 1.3462f,

    1.0759f, 1.0401f, 1.097f, 1.085f,

    1.091f, 1.0404f, 1.0499f, 1.0699f,

    1.1028f, 1.1714f, 1.1027f, 1.0666f,

    1.055f, 1.0553f, 1.0521f, 1.0569f,

    1.0421f, 0.97822f, 0.80487f, 0.75944f,

    0.71945f, 0.61682f, 0.60031f

};



const float ivas_reverb_default_large_DSR[IVAS_REVERB_DEFAULT_L_N_BANDS] =

{

    1.8811e-08f, 2.1428e-08f, 1.3972e-08f, 1.51e-08f,

    1.287e-08f, 1.8747e-08f, 2.413e-08f, 3.9927e-08f,

    8.9719e-08f, 1.902e-07f, 3.702e-07f, 6.1341e-07f,

    7.1432e-07f, 6.5331e-07f, 4.6094e-07f, 5.4683e-07f,

    7.0134e-07f, 6.856e-07f, 7.114e-07f, 6.9604e-07f,

    5.2939e-07f, 5.699e-07f, 6.1773e-07f, 5.7488e-07f,

    4.7748e-07f, 2.7213e-07f, 1.3681e-07f, 1.0941e-07f,

    6.2001e-08f, 2.8483e-08f, 2.6267e-08f

};





/*----------------------------------------------------------------------------------*

 * Renderer SBA & MC enc/dec matrices