Commit 0893074c authored by emerit's avatar emerit
Browse files

fix sxripts to work with matlab 2018

parent 5a68ef42

lib_rend/ivas_rom_TdBinauralRenderer.c

+2 −2
Original line number Diff line number Diff line
@@ -6325,7 +6325,7 @@ const uint32_t defaultHRIR_rom_AlphaL32[470 * 86] = { 
0xbb957b84,0xbbb8d395,0xbba8b42c,0xbb81fd6e,0xbb073c8f,0xba9bc95d,0xb9648787,0x3a822880,0x3a2d0014,0x3a00b1fe,0x39883aec,0xb9c03938,0xba23f049,0xba2c02d6,0x3918ba92,0x3a9f9244,0x3b060cac,0x3aa13e9b,0x3a2e6807,0x384241f8,0x3925068d,0x39b35293,0x39d11225,0x39b97038,0x399e9142,

0xba28bc53,0xb9bbd4d0,0x3a6176f9,0x3b6c7921,0x3bbe5683,0xbb8c6958,0xbb85eeef,0xbb2d28ea,0xbb57094b,0xbb808953,0xbb8754e3,0xbb53828a,0xbae921b5,0x3a9f7f2a,0x3b4e076c,0x3b88ccd6,0x3b98c1df,0x3b9722b5,0x3b81a456,0x3b4ab25f,0x3ad6627d,0xb9a91f14,0xbaca6efb,0xbb10bc61,0xbb26874a,

0xbb2c537d,0xbaee69d1,0xb9f597af,0x3a2e7037,0x3a61fb42,0x39b18868,0xba289649,0xba869504,0xba796980,0xba51326c,0xba4adb95,0xbaaba136,0xbac76abd,0xbb172203,0xbb4d1c11,0xbb811d33,0x3a2700fa,0xb93aea42,0xba45b81d,0xb9c7a0ad,0xb90ac357,0x3a8a88b7,0x3afbf374,0x3b2eec6e,0x3b2532b5,

0x3b1e4d30,0x3b2055cd,0x3ad23aa7,0x3a5d9fb9,0xb71d5540,0xb98dccaa,0xba08acad,0xba42b19c,0xba29f16e,0xba3812a9,0xba6d0344,0xb9848613,0x390044b7,0x39d6f675,0x3aa1e975,0x3b170495,0x3b72ccdf,0x3b622585,0x3b4d2d49,0x3b48459b,0x3b03eb18,0x3a97cc04,0x3900e2cc,0x3a083812,0x3a609321,

0x3b1e4d30,0x3b2055cd,0x3ad23aa7,0x3a5d9fb9,0xb71d553f,0xb98dccaa,0xba08acad,0xba42b19c,0xba29f16e,0xba3812a9,0xba6d0344,0xb9848613,0x390044b7,0x39d6f675,0x3aa1e975,0x3b170495,0x3b72ccdf,0x3b622585,0x3b4d2d49,0x3b48459b,0x3b03eb18,0x3a97cc04,0x3900e2cc,0x3a083812,0x3a609321,

0x3a82b319,0x3a2e11e8,0x3b68b981,0x3b78d75a,0x3b6b68dd,0x3b546810,0x3b3413ca,0x3b1bc552,0x3b023bfd,0x3aede079,0x3a9d7142,0x3a34bf25,0x39639412,0xb997f2b5,0xba3e41e2,0xbaa7ecac,0xba9defbb,0xbaa04489,0xbaa33820,0xbab33ef1,0xbab927ad,0xbacf2c2f,0xbabf99e7,0xba54f979,0xb9b3daa7,

0x386721f9,0x396b201f,0x3a451aed,0x3a7d6f45,0x3aad4fc2,0x3ad79924,0x3b05d173,0x3b23b4bb,0x3b37ed2a,0x3b38c03e,0x3b3589f6,0x3b444014,0x3b50f38a,0x3a05df78,0x3a31ff6b,0x3a002c40,0x39dc9730,0x39d3a6dc,0x399cbed7,0x3942cd56,0x38bfc838,0xb90033eb,0xb9a609c8,0xba109065,0xba3dfeae,

0xba6bddba,0xba95cf9c,0xba8cc7ee,0xba8e3936,0xba8c0186,0xba88850c,0xba85496f,0xba7b0a0d,0xba80b117,0xba70a61d,0xba89e4c6,0xb9b39345,0xb9a43e1f,0xba033d3b,0xb9d5cdfa,0xb9946dca,0xb94ebf73,0xb8738a06,0x3831e3a3,0x3973bb2c,0x39ddc922,0x3a24d7f9,0x39c8d1cb,0x3a078ed1,0xba588e0b,
@@ -10109,7 +10109,7 @@ const uint32_t defaultHRIR_rom_ER16[HRTF_MODEL_N_SECTIONS * 470] = { 
0x3933fa02,0x392db0b4,0x39271386,0x39265737,0x39253cfa,0x392dce3c,0x39336a79,0x393c7fe4,0x3944b0c9,0x39929d53,

};

const uint32_t defaultHRIR_rom_ITD_W[658] = {

0xb58b2818,0x3bdea435,0xbef12e52,0xbdeb5ab7,0x3dab4e66,0x3f042e6d,0xbf409841,0xbe91c05f,0xbd4540cb,0x3ee4982c,0xbe4f34d7,0xbf3c944d,0xbf5f4288,0xbe93aac2,0xbe41b919,0xbf30a7bb,0xbf8323e1,0x3ebe1f75,0xbebaee5e,0xbe7b161f,0xbf02cc15,0x3b313b38,0x3f0434ee,0x3e8240b5,0x3ec41384,

0xb58b2816,0x3bdea435,0xbef12e52,0xbdeb5ab7,0x3dab4e66,0x3f042e6d,0xbf409841,0xbe91c05f,0xbd4540cb,0x3ee4982c,0xbe4f34d7,0xbf3c944d,0xbf5f4288,0xbe93aac2,0xbe41b919,0xbf30a7bb,0xbf8323e1,0x3ebe1f75,0xbebaee5e,0xbe7b161f,0xbf02cc15,0x3b313b38,0x3f0434ee,0x3e8240b5,0x3ec41384,

0xbebd76c6,0x3f817fba,0x3f2f49e6,0x3e3d1acf,0x3e95178f,0x3f5ba8c7,0x3f366b13,0x3e4c380a,0xbed1f70f,0x3da000be,0x3e8ed0a6,0x3f3c34bd,0xbf08b389,0xbd9e0cca,0x3e05095b,0x3ef1ac80,0x3da7646f,0xbcd0576f,0x3e83e76e,0x3f870465,0xbf1894ad,0xbf475073,0xbff88503,0xc0368ecb,0xc03cf196,

0xc072281a,0xc0177033,0xbfe11f51,0xbfa3dc3f,0xc01c4557,0xc036030a,0xc0057814,0xbfb60610,0xbef03ace,0x3e105793,0x3fa28542,0x3e9390c2,0xbba00d1b,0xbe99f207,0xbfa3a0da,0xbe329ba0,0x3eef141d,0x3fb9604c,0x40058f0e,0x4036eac0,0x401b7835,0x3fa743f6,0x3fe5dc68,0x401807dc,0x406e3515,

0x40399f8f,0x4037b7c7,0x3ffabd23,0x3f51dc1c,0x3f11a8f6,0xbf868061,0xbea0be67,0x3e09ea72,0x3cb8fdf8,0x3d41b101,0xbfb65ff8,0xc03bf299,0xc073eb6a,0xc09e3e70,0xc0c35434,0xc10268f5,0xc0f009f8,0xc118ddc8,0xc11dbb79,0xc12f3e4a,0xc10f9075,0xc10e9eca,0xc0d71c87,0xc0c2d2c4,0xc09c2687,

scripts/binauralRenderer_interface/matlab_hrir_generation_scripts/SOFA_save.m

+14 −13
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ if isfile(inputSofaTemplatePath) 
                sofa_data.Variables(indVar).Size(3) = size(IR,3);        

                sofa_data.Variables(indVar).ChunkSize(1) = size(IR,1);

                sofa_data.Variables(indVar).ChunkSize(2) = size(IR,2);

                sofa_data.Variables(indVar).ChunkSize(3) = size(IR,3);

                sofa_data.Variables(indVar).ChunkSize(3) = size(IR,3)/2;

                sofa_data.Variables(indVar).Dimensions(1).Length = size(IR,1);

                sofa_data.Variables(indVar).Dimensions(2).Length = size(IR,2);

                sofa_data.Variables(indVar).Dimensions(3).Length = size(IR,3);
@@ -88,17 +88,25 @@ if isfile(inputSofaTemplatePath) 
       for inDim = 1 : length(sofa_data.Dimensions)

            netcdf.defDim(ncid, sofa_data.Dimensions(inDim).Name, sofa_data.Dimensions(inDim).Length);

       end

       for inVar = 1 : length(sofa_data.Variables)

            varId = netcdf.inqVarID(ncid_in,sofa_data.Variables(inVar).Name);

       for indVar = 1 : length(sofa_data.Variables)

            varId = netcdf.inqVarID(ncid_in,sofa_data.Variables(indVar).Name);

            [name,xtype,dimids,natts] = netcdf.inqVar(ncid_in,varId);

            netcdf.defVar(ncid, name , xtype, dimids);       

            data = zeros(sofa_data.Variables(indVar).Size);

            netcdf.putVar(ncid, varId, data);

            if (strcmp(name, 'Data.IR'))

                netcdf.putVar(ncid, varId, IR);

            end

            for indAtt = 0 : natts - 1

                attName = netcdf.inqAttName(ncid_in, varId, indAtt);

                attVal = netcdf.getAtt(ncid_in,varId,attName);

                netcdf.putAtt(ncid,varId,attName,attVal)

            end

            data = zeros(sofa_data.Variables(inVar).Size);

            netcdf.putVar(ncid, varId, data);

       end

       if inputAsLatencys == false

            netcdf.defVar(ncid, 'latencys' , 6, 0);  

            varId = netcdf.inqVarID(ncid, 'latencys');

            netcdf.putVar(ncid, varId, latency_s);

       end

       netcdf.close(ncid);

       netcdf.close(ncid_in);
@@ -106,16 +114,9 @@ if isfile(inputSofaTemplatePath) 
            ncwriteatt(outputSofaPath, '/', sofa_data.Attributes(inAtt).Name, sofa_data.Attributes(inAtt).Value);

       end



       ncwrite(outputSofaPath,'Data.IR', IR);

       license = ncreadatt(inputSofaTemplatePath,'/','License');

       ncwriteatt(outputSofaPath,'/','License', license);

       ncwrite(outputSofaPath,'Data.SamplingRate', fs);

       if inputAsLatencys == false

            nccreate(outputSofaPath,'latencys',...

                                   'Dimensions',{'I' 1},...

                                   'Format','netcdf4','Datatype','double');

       end

       ncwrite(outputSofaPath,'latencys', latency_s);

       ncwriteatt(outputSofaPath,'/', 'ListenerShortName',ncreadatt(inputSofaTemplatePath,'/','ListenerShortName'));

       ncwriteatt(outputSofaPath,'/', 'DatabaseName',ncreadatt(inputSofaTemplatePath,'/','DatabaseName'));

       ncwriteatt(outputSofaPath,'/','Title' ,ncreadatt(inputSofaTemplatePath,'/','Title'));

scripts/binauralRenderer_interface/matlab_hrir_generation_scripts/convert_SD2SHD_HRIRs.m

+0 −1
Original line number Diff line number Diff line
@@ -64,4 +64,3 @@ data_struct(3).sr_short = sr_short; 
data_struct(3).sr_dft_size  = sr_dft_size;

SOFA_save(data_struct(3).IR_data, sr(1), 1/sr(1), [sofa_path filesep() sofa_file], [sofa_path  filesep()  erase(sofa_file, '.sofa') '_' data_struct(3).HOA_name '.sofa']);

%generate_rom_tables(data_struct)

tests/binaural/constants.py

+6 −2
Original line number Diff line number Diff line
@@ -42,11 +42,15 @@ HRTF_BINARY_DIR = SCRIPTS_DIR.joinpath("binauralRenderer_interface", "binaural_r 
DEC_BINARY_DIR = TESTS_DIR.joinpath("dec_out_bin")



ENCODER_CMD = [

    str(TESTS_DIR.parent.parent.joinpath("build/IVAS_cod"))

    str(TESTS_DIR.parent.parent.joinpath("IVAS_cod"))

]



DECODER_CMD = [

    str(TESTS_DIR.parent.parent.joinpath("build/IVAS_dec"))

    str(TESTS_DIR.parent.parent.joinpath("IVAS_dec"))

]



RENDERER_CMD = [

    str(TESTS_DIR.parent.parent.joinpath("IVAS_rend"))

    ]



HRTF_BINARY_FILE = "ivas_binaural_{}kHz.bin"