Commit af411f11 authored by Jan Brouwer's avatar Jan Brouwer
Browse files

make .cfg files support current style roomAcoustics settings as well as the... 

make .cfg files support current style roomAcoustics settings as well as the new style reverbFile setting
parent eff664bf

scripts/reverb/generate_acoustic_environments_metadata.py

+12 −14
Original line number Diff line number Diff line
@@ -398,10 +398,10 @@ def generate_reverb_payload_equivalent_to_rend_config_renderer_cfg(): 
              0.60031 ])



        + concatenate(get_dsr_code,               #     DSR

            [ 1.8811e-08, 2.1428e-08, 1.3972e-08,   1.51e-08,  1.287e-08, 1.8747e-08,  2.413e-08, 3.9927e-08, 8.9719e-08,  1.902e-07,

               3.702e-07, 6.1341e-07, 7.1432e-07, 6.5331e-07, 4.6094e-07, 5.4683e-07, 7.0134e-07,  6.856e-07,  7.114e-07, 6.9604e-07,

              5.2939e-07,  5.699e-07, 6.1773e-07, 5.7488e-07, 4.7748e-07, 2.7213e-07, 1.3681e-07, 1.0941e-07, 6.2001e-08, 2.8483e-08,

              2.6267e-08 ])

            [ 1.9952632e-08, 1.9952632e-08, 1.2589251e-08, 1.5848926e-08, 1.2589251e-08, 1.9952632e-08, 2.511887e-08, 3.9810708e-08, 1e-07, 1.9952633e-07,

              3.981071e-07, 6.3095763e-07, 7.943284e-07, 6.3095763e-07, 5.01187e-07, 5.01187e-07, 6.3095763e-07, 6.3095763e-07, 7.943284e-07, 6.3095763e-07,

              5.01187e-07, 6.3095763e-07, 6.3095763e-07, 6.3095763e-07, 5.01187e-07, 2.511887e-07, 1.2589251e-07, 1e-07, 6.309576e-08, 3.1622776e-08,

              2.511887e-08 ])

        + '0'                                     #   hasEarlyReflections

        , endian='big')
@@ -555,11 +555,10 @@ def generate_reverb_payload_equivalent_to_rend_config_hospital_patientroom_cfg() 
              0.30786 ])



        + concatenate(get_dsr_code,               #     DSR

            [ 0.000219780698, 0.000205275364,   7.18711e-05, 4.5745977e-05, 8.381106e-06, 6.884964e-06, 6.532765e-06, 8.296928e-06, 1.0005793e-05, 9.191127e-06,

                8.635287e-06,   9.627704e-06, 1.0806965e-05, 1.0041916e-05,  7.77047e-06, 9.695803e-06, 9.594324e-06,  8.32215e-06,  7.564813e-06, 6.215871e-06,

                6.379496e-06,   6.358105e-06,    6.6696e-06,  6.369334e-06, 6.378474e-06, 3.339913e-06, 3.129318e-06, 2.892564e-06,   6.00202e-07,  3.40124e-07,

                 3.37705e-07 ])



            [ 0.00019952621, 0.00019952621, 7.9432844e-05, 5.0118702e-05, 7.943284e-06, 6.3095763e-06, 6.3095763e-06, 7.943284e-06, 1e-05, 1e-05,

              7.943284e-06, 1e-05, 1e-05, 1e-05, 7.943284e-06, 1e-05, 1e-05, 7.943284e-06, 7.943284e-06, 6.3095763e-06,

              6.3095763e-06, 6.3095763e-06, 6.3095763e-06, 6.3095763e-06, 6.3095763e-06, 3.1622776e-06, 3.1622776e-06, 3.1622776e-06, 6.3095763e-07, 3.1622776e-07,

              3.1622776e-07 ])

        + '0'                                     #   hasEarlyReflections



        , endian='big')
@@ -597,11 +596,10 @@ def generate_reverb_payload_equivalent_to_rend_config_recreation_cfg(): 
              2.14343 ])



        + concatenate(get_dsr_code,               #     DSR

            [  9.18578e-07,  7.63803e-07,  9.23183e-07, 1.048656e-06,  1.61449e-06,  2.13745e-06, 2.854805e-06, 3.979651e-06, 6.229977e-06, 7.782421e-06,

              9.091754e-06, 8.545798e-06, 7.482083e-06, 7.351071e-06, 7.947039e-06, 8.152676e-06, 5.201189e-06, 4.744103e-06, 4.397069e-06, 3.017449e-06, 

              2.958383e-06, 2.725911e-06,  7.94912e-07,  6.20198e-07,  5.71181e-07,   5.5546e-08,   1.3987e-08,    1.338e-08,    1.322e-09,      1.3e-11,

                     4e-12 ])



            [  1e-06, 7.943284e-07, 1e-06, 1e-06, 1.5848925e-06, 1.9952631e-06, 3.1622776e-06, 3.9810707e-06, 6.3095763e-06, 7.943284e-06,

               1e-05, 7.943284e-06, 7.943284e-06, 7.943284e-06, 7.943284e-06, 7.943284e-06, 5.01187e-06, 5.01187e-06, 3.9810707e-06, 3.1622776e-06,

               3.1622776e-06, 2.511887e-06, 7.943284e-07, 6.3095763e-07, 6.3095763e-07, 5.01187e-08, 1.2589251e-08, 1.2589251e-08, 1.2589265e-09, 1.2589266e-11,

               3.981075e-12 ])

        + '0'                                     #   hasEarlyReflections



        , endian='big')

scripts/testv/rend_config_hospital_patientroom.cfg

+26 −0
Original line number Diff line number Diff line 
[roomAcoustics] 

nBands = 31;



fc   = [20.0, 25.0, 31.5, 40.0, 

    50.0, 63.0, 80.0, 100.0, 

    125.0, 160.0, 200.0, 250.0, 

    315.0, 400.0, 500.0, 630.0, 

    800.0, 1000.0, 1250.0, 1600.0, 

    2000.0, 2500.0, 3150.0, 4000.0, 

    5000.0, 6300.0, 8000.0, 10000.0, 

    12500.0, 16000.0, 20000.0];



rt60 = [0.81275, 0.61888, 0.45111, 0.34672, 0.46683, 0.53987, 0.61874, 0.70291, 0.66657, 0.73037,

        0.75090, 0.72470, 0.75486, 0.75857, 0.76844, 0.74999, 0.77622, 0.78227, 0.77441, 0.74688, 

        0.73521, 0.73782, 0.71928, 0.71708, 0.71465, 0.60592, 0.52031, 0.51768, 0.52102, 0.37956,

        0.30786];



dsr  = [0.00019952621, 0.00019952621, 7.9432844e-05, 5.0118702e-05, 7.943284e-06, 6.3095763e-06, 6.3095763e-06, 7.943284e-06, 1e-05, 1e-05,

        7.943284e-06, 1e-05, 1e-05, 1e-05, 7.943284e-06, 1e-05, 1e-05, 7.943284e-06, 7.943284e-06, 6.3095763e-06,

        6.3095763e-06, 6.3095763e-06, 6.3095763e-06, 6.3095763e-06, 6.3095763e-06, 3.1622776e-06, 3.1622776e-06, 3.1622776e-06, 6.3095763e-07, 3.1622776e-07,

        3.1622776e-07];





acousticPreDelay = 0.016; 

inputPreDelay =  0.08163;



[general]

reverbFile = rend_config_hospital_patientroom.dat;

scripts/testv/rend_config_recreation.cfg

+26 −0
Original line number Diff line number Diff line 
[roomAcoustics] 

nBands = 31;



fc   = [20.0, 25.0, 31.5, 40.0, 

    50.0, 63.0, 80.0, 100.0, 

    125.0, 160.0, 200.0, 250.0, 

    315.0, 400.0, 500.0, 630.0, 

    800.0, 1000.0, 1250.0, 1600.0, 

    2000.0, 2500.0, 3150.0, 4000.0, 

    5000.0, 6300.0, 8000.0, 10000.0, 

    12500.0, 16000.0, 20000.0];



rt60 = [4.51916, 4.89553, 4.83276, 5.00198, 5.34468, 5.76026, 6.36818, 6.95503, 7.27557, 7.62559,

        8.08892, 8.16002, 8.13900, 8.17919, 8.16280, 8.46226, 9.61806, 9.93048, 9.81353, 8.59340, 

        8.38885, 8.36823, 6.51845, 3.76089, 3.75374, 3.57451, 1.28724, 1.22174, 1.22448, 1.71631,

        2.14343];



dsr  = [1e-06, 7.943284e-07, 1e-06, 1e-06, 1.5848925e-06, 1.9952631e-06, 3.1622776e-06, 3.9810707e-06, 6.3095763e-06, 7.943284e-06,

        1e-05, 7.943284e-06, 7.943284e-06, 7.943284e-06, 7.943284e-06, 7.943284e-06, 5.01187e-06, 5.01187e-06, 3.9810707e-06, 3.1622776e-06,

        3.1622776e-06, 2.511887e-06, 7.943284e-07, 6.3095763e-07, 6.3095763e-07, 5.01187e-08, 1.2589251e-08, 1.2589251e-08, 1.2589265e-09, 1.2589266e-11,

        3.981075e-12];





acousticPreDelay = 0.016; 

inputPreDelay =  0.43031;



[general]

reverbFile = rend_config_recreation.dat;

scripts/testv/rend_config_renderer.cfg

+29 −0
Original line number Diff line number Diff line 
[roomAcoustics]

nBands = 31;



fc   = [20.0, 25.0, 31.5, 40.0,

        50.0, 63.0, 80.0, 100.0,

        125.0, 160.0, 200.0, 250.0,

        315.0, 400.0, 500.0, 630.0,

        800.0, 1000.0, 1250.0, 1600.0,

        2000.0, 2500.0, 3150.0, 4000.0,

        5000.0, 6300.0, 8000.0, 10000.0,

        12500.0, 16000.0, 20000.0];



rt60 = [1.3622, 1.4486, 1.3168, 1.5787,

        1.4766, 1.3954, 1.2889, 1.3462,

        1.0759, 1.0401, 1.0970, 1.0850,

        1.0910, 1.0404, 1.0499, 1.0699,

        1.1028, 1.1714, 1.1027, 1.0666,

        1.0550, 1.0553, 1.0521, 1.0569,

        1.0421, 0.97822, 0.80487, 0.75944,

        0.71945, 0.61682, 0.60031];



dsr  = [1.9952632e-08, 1.9952632e-08, 1.2589251e-08, 1.5848926e-08, 1.2589251e-08, 1.9952632e-08, 2.511887e-08, 3.9810708e-08, 1e-07, 1.9952633e-07,

        3.981071e-07, 6.3095763e-07, 7.943284e-07, 6.3095763e-07, 5.01187e-07, 5.01187e-07, 6.3095763e-07, 6.3095763e-07, 7.943284e-07, 6.3095763e-07,

        5.01187e-07, 6.3095763e-07, 6.3095763e-07, 6.3095763e-07, 5.01187e-07, 2.511887e-07, 1.2589251e-07, 1e-07, 6.309576e-08, 3.1622776e-08,

        2.511887e-08];



acousticPreDelay = 0.016;

inputPreDelay = 0.1;



[general]

reverbFile = rend_config_renderer.dat;