Loading lib_rend/ivas_crend.c +0 −15 Original line number Diff line number Diff line Loading @@ -1596,29 +1596,14 @@ static ivas_error ivas_rend_initCrend_fx( if ( hHrtf->factor_Q_latency_s_fx != 0 ) { hHrtf->factor_Q_latency_s_fx = sub( hHrtf->factor_Q_latency_s_fx, 31 ); if ( hHrtf->factor_Q_latency_s_fx < 0 ) { hHrtf->factor_Q_latency_s_fx = 0; return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Error: factor_Q_latency_s_fx wrong value too small must be > 30 !\n\n" ); } } if ( hHrtf->factor_Q_inv_diffuse_weight_fx != 0 ) { hHrtf->factor_Q_inv_diffuse_weight_fx = sub( hHrtf->factor_Q_inv_diffuse_weight_fx, 15 ); if ( hHrtf->factor_Q_inv_diffuse_weight_fx < 0 ) { hHrtf->factor_Q_inv_diffuse_weight_fx = 0; return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Error: factor_Q_inv_diffuse_weight_fx wrong value too small must be > 14 !\n\n" ); } } if ( hHrtf->factor_Q_pOut_to_bin_fx != 0 ) { hHrtf->factor_Q_pOut_to_bin_fx = sub( 31, hHrtf->factor_Q_pOut_to_bin_fx ); if ( hHrtf->factor_Q_pOut_to_bin_fx < 0 ) { hHrtf->factor_Q_pOut_to_bin_fx = 0; return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Error: factor_Q_pOut_to_bin_fx wrong value too big must be < 32 !\n\n" ); } } #endif pCrend->hHrtfCrend = hHrtf; Loading lib_rend/ivas_rom_TdBinauralRenderer.c +3 −3 Original line number Diff line number Diff line Loading @@ -29,7 +29,7 @@ the United Nations Convention on Contracts on the International Sales of Goods. *******************************************************************************************************/ /* Generated on 07-Jun-2024 with Matlab version 24.1.0.2578822 (R2024a) Update 2 by marcemerit on MACA64 */ /* Generated on 08-Jun-2024 with Matlab version 24.1.0.2578822 (R2024a) Update 2 by marcemerit on MACA64 */ Loading @@ -51,8 +51,8 @@ *------------------------------------------------------------------------*/ /* TD renderer default HRIR model */ #ifdef IVAS_FLOAT_FIXED const Word16 defaultHRIR_rom_latency_s_Q_fx = 46; const Word32 defaultHRIR_rom_latency_s_fx = 1466062416; const Word16 defaultHRIR_rom_latency_s_Q_fx = 31; const Word32 defaultHRIR_rom_latency_s_fx = 44741; #endif // IVAS_FLOAT_FIXED const float defaultHRIR_rom_latency_s = 0.000020834f; const int16_t defaultHRIR_rom_model_configuration[6] = { lib_rend/ivas_rom_binauralRenderer.c +46 −46 Original line number Diff line number Diff line Loading @@ -51,7 +51,7 @@ /* Tables generated by the script at "scripts/binauralRenderer_interface/fastconv/generate_tables_for_fastconv.m */ /* Can be replaced by your own generated HRIR tables */ /* * Generated on 07-Jun-2024 with Matlab version 24.1.0.2578822 (R2024a) Update 2 by marcemerit on MACA64 * Generated on 08-Jun-2024 with Matlab version 24.1.0.2578822 (R2024a) Update 2 by marcemerit on MACA64 */ Loading Loading @@ -93860,40 +93860,40 @@ const uint32_t rightBRIRImag[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][BINAURAL_NTAP #ifdef IVAS_FLOAT_FIXED #ifdef FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT const Word16 fastconvReverberationTimes_Q_fx = 16; const Word16 fastconvReverberationTimes_Q_fx = 15; #endif // FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT const Word16 fastconvReverberationTimes_fx[CLDFB_NO_CHANNELS_MAX] = { 27450, 13584, 13304, 13575, 14190, 15470, 15108, 15017, 14942, 14410, 14783, 14475, 14660, 14612, 14654, 14898, 14907, 14663, 14429, 14336, 14445, 14303, 13976, 13784, 13593, 13025, 12861, 12774, 12474, 12091, 11818, 11545, 11567, 11638, 12031, 12840, 13320, 13659, 14068, 14418, 14609, 15101, 15331, 15312, 15488, 15560, 15835, 15802, 15653, 15885, 16204, 16118, 16267, 16082, 15988, 15999, 15655, 15900, 15389, 16583, 13725, 6792, 6652, 6788, 7095, 7735, 7554, 7509, 7471, 7205, 7392, 7237, 7330, 7306, 7327, 7449, 7454, 7331, 7214, 7168, 7223, 7152, 6988, 6892, 6797, 6513, 6431, 6387, 6237, 6046, 5909, 5773, 5784, 5819, 6016, 6420, 6660, 6829, 7034, 7209, 7305, 7550, 7665, 7656, 7744, 7780, 7918, 7901, 7827, 7942, 8102, 8059, 8133, 8041, 7994, 7999, 7828, 7950, 7695, 8292, }; #endif // IVAS_FLOAT_FIXED const uint32_t fastconvReverberationTimes[CLDFB_NO_CHANNELS_MAX] = { 0x3ed67400, 0x3e544000, 0x3e4fe000, 0x3e541c00, 0x3e5db800, 0x3e71b800, 0x3e6c1000, 0x3e6aa400, 0x3e697800, 0x3e612800, 0x3e66fc00, 0x3e622c00, 0x3e651000, 0x3e645000, 0x3e64f800, 0x3e68c800, 0x3e68ec00, 0x3e651c00, 0x3e617400, 0x3e600000, 0x3e61b400, 0x3e5f7c00, 0x3e5a6000, 0x3e576000, 0x3e546400, 0x3e4b8400, 0x3e48f400, 0x3e479800, 0x3e42e800, 0x3e3cec00, 0x3e38a800, 0x3e346400, 0x3e34bc00, 0x3e35d800, 0x3e3bfc00, 0x3e48a000, 0x3e502000, 0x3e556c00, 0x3e5bd000, 0x3e614800, 0x3e644400, 0x3e6bf400, 0x3e6f8c00, 0x3e6f4000, 0x3e720000, 0x3e732000, 0x3e776c00, 0x3e76e800, 0x3e749400, 0x3e783400, 0x3e7d3000, 0x3e7bd800, 0x3e7e2c00, 0x3e7b4800, 0x3e79d000, 0x3e79fc00, 0x3e749c00, 0x3e787000, 0x3e707400, 0x3e818e00, 0x3ed67400, 0x3e544000, 0x3e4fe000, 0x3e542000, 0x3e5db800, 0x3e71b800, 0x3e6c1000, 0x3e6aa800, 0x3e697800, 0x3e612800, 0x3e670000, 0x3e622800, 0x3e651000, 0x3e645000, 0x3e64f800, 0x3e68c800, 0x3e68f000, 0x3e651800, 0x3e617000, 0x3e600000, 0x3e61b800, 0x3e5f8000, 0x3e5a6000, 0x3e576000, 0x3e546800, 0x3e4b8800, 0x3e48f800, 0x3e479800, 0x3e42e800, 0x3e3cf000, 0x3e38a800, 0x3e346800, 0x3e34c000, 0x3e35d800, 0x3e3c0000, 0x3e48a000, 0x3e502000, 0x3e556800, 0x3e5bd000, 0x3e614800, 0x3e644800, 0x3e6bf000, 0x3e6f8800, 0x3e6f4000, 0x3e720000, 0x3e732000, 0x3e777000, 0x3e76e800, 0x3e749800, 0x3e783000, 0x3e7d3000, 0x3e7bd800, 0x3e7e2800, 0x3e7b4800, 0x3e79d000, 0x3e79f800, 0x3e74a000, 0x3e787000, 0x3e707800, 0x3e819000, }; #ifdef IVAS_FLOAT_FIXED #ifdef FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT const Word16 fastconvReverberationEneCorrections_Q_fx = 16; const Word16 fastconvReverberationEneCorrections_Q_fx = 15; #endif // FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT const Word16 fastconvReverberationEneCorrections_fx[CLDFB_NO_CHANNELS_MAX] = { 4899, 1761, 1951, 1780, 2157, 12735, 9685, 9205, 10613, 10886, 19464, 20398, 22536, 22664, 22079, 21506, 22915, 22878, 21887, 21171, 28663, 14958, 8281, 5860, 5086, 4494, 4286, 4772, 5032, 4554, 10543, 10141, 8025, 5040, 2300, 893, 600, 425, 336, 256, 201, 151, 116, 106, 101, 93, 79, 74, 69, 66, 57, 51, 38, 28, 20, 14, 8, 5, 3, 2, 19, 7, 8, 7, 8, 50, 38, 36, 41, 43, 76, 80, 88, 89, 86, 84, 90, 89, 85, 83, 112, 58, 32, 23, 20, 18, 17, 19, 20, 18, 41, 40, 31, 20, 9, 3, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; #endif // IVAS_FLOAT_FIXED const uint32_t fastconvReverberationEneCorrections[CLDFB_NO_CHANNELS_MAX] = { 0x3a191800, 0x395c2000, 0x3973e000, 0x395e8000, 0x3986d000, 0x3ac6fc00, 0x3a975400, 0x3a8fd400, 0x3aa5d400, 0x3aaa1800, 0x3b181000, 0x3b1f5c00, 0x3b301000, 0x3b311000, 0x3b2c7e00, 0x3b280400, 0x3b330600, 0x3b32bc00, 0x3b2afe00, 0x3b256600, 0x3b5fee00, 0x3ae9b800, 0x3a816400, 0x3a372000, 0x3a1ef000, 0x3a0c7000, 0x3a05f000, 0x3a152000, 0x3a1d4000, 0x3a0e5000, 0x3aa4bc00, 0x3a9e7400, 0x3a7ac800, 0x3a1d8000, 0x398fc000, 0x38df4000, 0x38960000, 0x38548000, 0x38280000, 0x38000000, 0x37c90000, 0x37970000, 0x37680000, 0x37540000, 0x374a0000, 0x373a0000, 0x371e0000, 0x37140000, 0x370a0000, 0x37040000, 0x36e40000, 0x36cc0000, 0x36980000, 0x36600000, 0x36200000, 0x35e00000, 0x35800000, 0x35200000, 0x34c00000, 0x34800000, 0x3a180000, 0x39600000, 0x39800000, 0x39600000, 0x39800000, 0x3ac80000, 0x3a980000, 0x3a900000, 0x3aa40000, 0x3aac0000, 0x3b180000, 0x3b200000, 0x3b300000, 0x3b320000, 0x3b2c0000, 0x3b280000, 0x3b340000, 0x3b320000, 0x3b2a0000, 0x3b260000, 0x3b600000, 0x3ae80000, 0x3a800000, 0x3a380000, 0x3a200000, 0x3a100000, 0x3a080000, 0x3a180000, 0x3a200000, 0x3a100000, 0x3aa40000, 0x3aa00000, 0x3a780000, 0x3a200000, 0x39900000, 0x38c00000, 0x38800000, 0x38800000, 0x38000000, 0x38000000, 0x38000000, 0x38000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, }; /* * Generated on 07-Jun-2024 with Matlab version 24.1.0.2578822 (R2024a) Update 2 by marcemerit on MACA64 * Generated on 08-Jun-2024 with Matlab version 24.1.0.2578822 (R2024a) Update 2 by marcemerit on MACA64 * Binaural rendering data set based on BRIRs Tables derived from Mozart IIS BRIRs.*/ Loading Loading @@ -94964,60 +94964,60 @@ const uint32_t hrtfShCoeffsIm[BINAURAL_CHANNELS][HRTF_SH_CHANNELS][HRTF_NUM_BINS #ifdef IVAS_FLOAT_FIXED #ifdef FIX_PARAM_CHANGES_AND_HRTF_FILE_FORMAT const Word16 parametricReverberationTimes_Q_fx = 16; const Word16 parametricReverberationTimes_Q_fx = 15; const Word16 parametricReverberationTimes_fx[CLDFB_NO_CHANNELS_MAX]= { 22642, 20936, 21821, 23653, 24530, 24299, 23503, 22813, 22486, 21715, 20742, 19987, 19324, 18845, 18345, 17713, 17304, 16804, 16377, 15862, 15406, 15050, 14662, 14339, 13933, 13611, 13244, 12982, 12708, 12184, 11972, 11925, 11783, 11736, 11570, 11294, 11213, 11007, 11008, 11089, 10967, 10874, 10719, 10588, 10381, 10266, 10181, 10065, 9934, 9828, 9713, 9598, 9482, 9367, 9252, 9137, 9021, 8906, 8791, 8676 11321, 10468, 10910, 11827, 12265, 12150, 11751, 11407, 11243, 10858, 10371, 9993, 9662, 9422, 9172, 8856, 8652, 8402, 8189, 7931, 7703, 7525, 7331, 7169, 6966, 6806, 6622, 6491, 6354, 6092, 5986, 5962, 5891, 5868, 5785, 5647, 5607, 5503, 5504, 5545, 5483, 5437, 5360, 5294, 5191, 5133, 5091, 5033, 4967, 4914, 4856, 4799, 4741, 4684, 4626, 4568, 4511, 4453, 4395, 4338 }; #else const Word32 parametricReverberationTimes_fx[CLDFB_NO_CHANNELS_MAX]= { 741933056, 686030848, 715030528, 775061504, 803799040, 796229632, 770146304, 747536384, 736821248, 711557120, 679673856, 654934016, 633208832, 617512960, 601128960, 580419584, 567017472, 550633472, 536641536, 519766016, 504823808, 493158400, 480444416, 469860352, 456556544, 446005248, 433979392, 425394176, 416415744, 399245312, 392298496, 390758400, 386105344, 384565248, 379125760, 370081792, 367427584, 360677376, 360710144, 363364352, 359366656, 356319232, 351240192, 346947584, 340164608, 336396288, 333611008, 329809920, 325517312, 322043904, 318275584, 314507264, 310706176, 306937856, 303169536, 299401216, 295600128, 291831808, 288063488, 284295168 741933056, 686030848, 714997760, 775094272, 803799040, 796262400, 770113536, 747569152, 736821248, 711589888, 679673856, 654901248, 633208832, 617480192, 601096192, 580386816, 567017472, 550633472, 536674304, 519766016, 504823808, 493158400, 480444416, 469827584, 456523776, 446038016, 433979392, 425394176, 416415744, 399245312, 392298496, 390725632, 386072576, 384565248, 379125760, 370081792, 367460352, 360644608, 360710144, 363397120, 359333888, 356319232, 351272960, 346947584, 340197376, 336396288, 333643776, 329842688, 325517312, 322043904, 318242816, 314507264, 310706176, 306970624, 303169536, 299368448, 295632896, 291831808, 288030720, 284295168 }; #endif // FIX_PARAM_CHANGES_AND_HRTF_FILE_FORMAT #else // IVAS_FLOAT_FIXED const uint32_t parametricReverberationTimes[CLDFB_NO_CHANNELS_MAX] = { 0x3eb0e400, 0x3ea39000, 0x3eaa7a00, 0x3eb8ca00, 0x3ebfa400, 0x3ebdd600, 0x3eb79e00, 0x3eb23a00, 0x3eafac00, 0x3ea9a600, 0x3ea20c00, 0x3e9c2600, 0x3e96f800, 0x3e933a00, 0x3e8f5200, 0x3e8a6200, 0x3e873000, 0x3e834800, 0x3e7fe400, 0x3e77d800, 0x3e70b800, 0x3e6b2800, 0x3e651800, 0x3e600c00, 0x3e59b400, 0x3e54ac00, 0x3e4ef000, 0x3e4ad800, 0x3e469000, 0x3e3e6000, 0x3e3b1000, 0x3e3a5400, 0x3e381c00, 0x3e376000, 0x3e34c800, 0x3e307800, 0x3e2f3400, 0x3e2bfc00, 0x3e2c0000, 0x3e2d4400, 0x3e2b5c00, 0x3e29e800, 0x3e277c00, 0x3e257000, 0x3e223400, 0x3e206800, 0x3e1f1400, 0x3e1d4400, 0x3e1b3800, 0x3e199000, 0x3e17c400, 0x3e15f800, 0x3e142800, 0x3e125c00, 0x3e109000, 0x3e0ec400, 0x3e0cf400, 0x3e0b2800, 0x3e095c00, 0x3e079000 0x3eb0e400, 0x3ea39000, 0x3eaa7800, 0x3eb8cc00, 0x3ebfa400, 0x3ebdd800, 0x3eb79c00, 0x3eb23c00, 0x3eafac00, 0x3ea9a800, 0x3ea20c00, 0x3e9c2400, 0x3e96f800, 0x3e933800, 0x3e8f5000, 0x3e8a6000, 0x3e873000, 0x3e834800, 0x3e7fe800, 0x3e77d800, 0x3e70b800, 0x3e6b2800, 0x3e651800, 0x3e600800, 0x3e59b000, 0x3e54b000, 0x3e4ef000, 0x3e4ad800, 0x3e469000, 0x3e3e6000, 0x3e3b1000, 0x3e3a5000, 0x3e381800, 0x3e376000, 0x3e34c800, 0x3e307800, 0x3e2f3800, 0x3e2bf800, 0x3e2c0000, 0x3e2d4800, 0x3e2b5800, 0x3e29e800, 0x3e278000, 0x3e257000, 0x3e223800, 0x3e206800, 0x3e1f1800, 0x3e1d4800, 0x3e1b3800, 0x3e199000, 0x3e17c000, 0x3e15f800, 0x3e142800, 0x3e126000, 0x3e109000, 0x3e0ec000, 0x3e0cf800, 0x3e0b2800, 0x3e095800, 0x3e079000 }; #endif // IVAS_FLOAT_FIXED #ifdef IVAS_FLOAT_FIXED #ifdef FIX_PARAM_CHANGES_AND_HRTF_FILE_FORMAT const Word16 parametricReverberationEneCorrections_Q_fx = 17; const Word16 parametricReverberationEneCorrections_Q_fx = 15; const Word16 parametricReverberationEneCorrections_fx[CLDFB_NO_CHANNELS_MAX]= { 25163, 18840, 14880, 12299, 11816, 10481, 8729, 9529, 10026, 10756, 11176, 12303, 13356, 14907, 15420, 14876, 16531, 16555, 16243, 15213, 12914, 6748, 3926, 3306, 2771, 2537, 2190, 2127, 2414, 2414, 2241, 1995, 1863, 1270, 524, 211, 126, 84, 65, 55, 40, 24, 15, 15, 13, 10, 8, 8, 8, 8, 8, 7, 5, 4, 2, 1, 0, 0, 0, 0 6291, 4710, 3720, 3075, 2954, 2620, 2182, 2382, 2506, 2689, 2794, 3076, 3339, 3727, 3855, 3719, 4133, 4139, 4061, 3803, 3229, 1687, 981, 826, 693, 634, 547, 532, 603, 604, 560, 499, 466, 318, 131, 53, 32, 21, 16, 14, 10, 6, 4, 4, 3, 3, 2, 2, 2, 2, 2, 2, 1, 1, 0, 0, 0, 0, 0, 0 }; #else // FIX_PARAM_CHANGES_AND_HRTF_FILE_FORMAT const Word32 parametricReverberationEneCorrections_fx[CLDFB_NO_CHANNELS_MAX]= { 412270592, 308674560, 243793920, 201506816, 193593344, 171720704, 143015936, 156123136, 164265984, 176226304, 183107584, 201572352, 218824704, 244236288, 252641280, 243728384, 270843904, 271237120, 266125312, 249249792, 211582976, 110559232, 64323584, 54165504, 45400064, 41566208, 35880960, 34848768, 39550976, 39550976, 36716544, 32686080, 30523392, 20807680, 8585216, 3457024, 2064384, 1376256, 1064960, 901120, 655360, 393216, 245760, 245760, 212992, 163840, 131072, 131072, 131072, 131072, 131072, 114688, 81920, 65536, 32768, 16384, 0, 0, 0, 0 412286976, 308674560, 243793920, 201523200, 193593344, 171704320, 142999552, 156106752, 164233216, 176226304, 183107584, 201588736, 218824704, 244252672, 252641280, 243728384, 270860288, 271253504, 266141696, 249233408, 211615744, 110559232, 64290816, 54132736, 45416448, 41549824, 35848192, 34865152, 39518208, 39583744, 36700160, 32702464, 30539776, 20840448, 8585216, 3473408, 2097152, 1376256, 1048576, 917504, 655360, 393216, 262144, 262144, 196608, 196608, 131072, 131072, 131072, 131072, 131072, 131072, 65536, 65536, 0, 0, 0, 0, 0, 0 }; #endif // FIX_PARAM_CHANGES_AND_HRTF_FILE_FORMAT Loading @@ -95026,12 +95026,12 @@ const Word32 parametricReverberationEneCorrections_fx[CLDFB_NO_CHANNELS_MAX]= { const uint32_t parametricReverberationEneCorrections[CLDFB_NO_CHANNELS_MAX] = { 0x3e449600, 0x3e133000, 0x3de88000, 0x3dc02c00, 0x3db8a000, 0x3da3c400, 0x3d886400, 0x3d94e400, 0x3d9ca800, 0x3da81000, 0x3daea000, 0x3dc03c00, 0x3dd0b000, 0x3de8ec00, 0x3df0f000, 0x3de87000, 0x3e012600, 0x3e015600, 0x3dfdcc00, 0x3dedb400, 0x3dc9c800, 0x3d52e000, 0x3cf56000, 0x3ccea000, 0x3cad3000, 0x3c9e9000, 0x3c88e000, 0x3c84f000, 0x3c96e000, 0x3c96e000, 0x3c8c1000, 0x3c796000, 0x3c68e000, 0x3c1ec000, 0x3b830000, 0x3ad30000, 0x3a7c0000, 0x3a280000, 0x3a020000, 0x39dc0000, 0x39a00000, 0x39400000, 0x38f00000, 0x38f00000, 0x38d00000, 0x38a00000, 0x38800000, 0x38800000, 0x38800000, 0x38800000, 0x38800000, 0x38600000, 0x38200000, 0x38000000, 0x37800000, 0x37000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 0x3e449800, 0x3e133000, 0x3de88000, 0x3dc03000, 0x3db8a000, 0x3da3c000, 0x3d886000, 0x3d94e000, 0x3d9ca000, 0x3da81000, 0x3daea000, 0x3dc04000, 0x3dd0b000, 0x3de8f000, 0x3df0f000, 0x3de87000, 0x3e012800, 0x3e015800, 0x3dfdd000, 0x3dedb000, 0x3dc9d000, 0x3d52e000, 0x3cf54000, 0x3cce8000, 0x3cad4000, 0x3c9e8000, 0x3c88c000, 0x3c850000, 0x3c96c000, 0x3c970000, 0x3c8c0000, 0x3c798000, 0x3c690000, 0x3c1f0000, 0x3b830000, 0x3ad40000, 0x3a800000, 0x3a280000, 0x3a000000, 0x39e00000, 0x39a00000, 0x39400000, 0x39000000, 0x39000000, 0x38c00000, 0x38c00000, 0x38800000, 0x38800000, 0x38800000, 0x38800000, 0x38800000, 0x38800000, 0x38000000, 0x38000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 }; #endif // IVAS_FLOAT_FIXED scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin (1.88 MiB) File changed.No diff preview for this file type. View original file View changed file scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin (2.32 MiB) File changed.No diff preview for this file type. View original file View changed file Loading
lib_rend/ivas_crend.c +0 −15 Original line number Diff line number Diff line Loading @@ -1596,29 +1596,14 @@ static ivas_error ivas_rend_initCrend_fx( if ( hHrtf->factor_Q_latency_s_fx != 0 ) { hHrtf->factor_Q_latency_s_fx = sub( hHrtf->factor_Q_latency_s_fx, 31 ); if ( hHrtf->factor_Q_latency_s_fx < 0 ) { hHrtf->factor_Q_latency_s_fx = 0; return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Error: factor_Q_latency_s_fx wrong value too small must be > 30 !\n\n" ); } } if ( hHrtf->factor_Q_inv_diffuse_weight_fx != 0 ) { hHrtf->factor_Q_inv_diffuse_weight_fx = sub( hHrtf->factor_Q_inv_diffuse_weight_fx, 15 ); if ( hHrtf->factor_Q_inv_diffuse_weight_fx < 0 ) { hHrtf->factor_Q_inv_diffuse_weight_fx = 0; return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Error: factor_Q_inv_diffuse_weight_fx wrong value too small must be > 14 !\n\n" ); } } if ( hHrtf->factor_Q_pOut_to_bin_fx != 0 ) { hHrtf->factor_Q_pOut_to_bin_fx = sub( 31, hHrtf->factor_Q_pOut_to_bin_fx ); if ( hHrtf->factor_Q_pOut_to_bin_fx < 0 ) { hHrtf->factor_Q_pOut_to_bin_fx = 0; return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Error: factor_Q_pOut_to_bin_fx wrong value too big must be < 32 !\n\n" ); } } #endif pCrend->hHrtfCrend = hHrtf; Loading
lib_rend/ivas_rom_TdBinauralRenderer.c +3 −3 Original line number Diff line number Diff line Loading @@ -29,7 +29,7 @@ the United Nations Convention on Contracts on the International Sales of Goods. *******************************************************************************************************/ /* Generated on 07-Jun-2024 with Matlab version 24.1.0.2578822 (R2024a) Update 2 by marcemerit on MACA64 */ /* Generated on 08-Jun-2024 with Matlab version 24.1.0.2578822 (R2024a) Update 2 by marcemerit on MACA64 */ Loading @@ -51,8 +51,8 @@ *------------------------------------------------------------------------*/ /* TD renderer default HRIR model */ #ifdef IVAS_FLOAT_FIXED const Word16 defaultHRIR_rom_latency_s_Q_fx = 46; const Word32 defaultHRIR_rom_latency_s_fx = 1466062416; const Word16 defaultHRIR_rom_latency_s_Q_fx = 31; const Word32 defaultHRIR_rom_latency_s_fx = 44741; #endif // IVAS_FLOAT_FIXED const float defaultHRIR_rom_latency_s = 0.000020834f; const int16_t defaultHRIR_rom_model_configuration[6] = {
lib_rend/ivas_rom_binauralRenderer.c +46 −46 Original line number Diff line number Diff line Loading @@ -51,7 +51,7 @@ /* Tables generated by the script at "scripts/binauralRenderer_interface/fastconv/generate_tables_for_fastconv.m */ /* Can be replaced by your own generated HRIR tables */ /* * Generated on 07-Jun-2024 with Matlab version 24.1.0.2578822 (R2024a) Update 2 by marcemerit on MACA64 * Generated on 08-Jun-2024 with Matlab version 24.1.0.2578822 (R2024a) Update 2 by marcemerit on MACA64 */ Loading Loading @@ -93860,40 +93860,40 @@ const uint32_t rightBRIRImag[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][BINAURAL_NTAP #ifdef IVAS_FLOAT_FIXED #ifdef FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT const Word16 fastconvReverberationTimes_Q_fx = 16; const Word16 fastconvReverberationTimes_Q_fx = 15; #endif // FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT const Word16 fastconvReverberationTimes_fx[CLDFB_NO_CHANNELS_MAX] = { 27450, 13584, 13304, 13575, 14190, 15470, 15108, 15017, 14942, 14410, 14783, 14475, 14660, 14612, 14654, 14898, 14907, 14663, 14429, 14336, 14445, 14303, 13976, 13784, 13593, 13025, 12861, 12774, 12474, 12091, 11818, 11545, 11567, 11638, 12031, 12840, 13320, 13659, 14068, 14418, 14609, 15101, 15331, 15312, 15488, 15560, 15835, 15802, 15653, 15885, 16204, 16118, 16267, 16082, 15988, 15999, 15655, 15900, 15389, 16583, 13725, 6792, 6652, 6788, 7095, 7735, 7554, 7509, 7471, 7205, 7392, 7237, 7330, 7306, 7327, 7449, 7454, 7331, 7214, 7168, 7223, 7152, 6988, 6892, 6797, 6513, 6431, 6387, 6237, 6046, 5909, 5773, 5784, 5819, 6016, 6420, 6660, 6829, 7034, 7209, 7305, 7550, 7665, 7656, 7744, 7780, 7918, 7901, 7827, 7942, 8102, 8059, 8133, 8041, 7994, 7999, 7828, 7950, 7695, 8292, }; #endif // IVAS_FLOAT_FIXED const uint32_t fastconvReverberationTimes[CLDFB_NO_CHANNELS_MAX] = { 0x3ed67400, 0x3e544000, 0x3e4fe000, 0x3e541c00, 0x3e5db800, 0x3e71b800, 0x3e6c1000, 0x3e6aa400, 0x3e697800, 0x3e612800, 0x3e66fc00, 0x3e622c00, 0x3e651000, 0x3e645000, 0x3e64f800, 0x3e68c800, 0x3e68ec00, 0x3e651c00, 0x3e617400, 0x3e600000, 0x3e61b400, 0x3e5f7c00, 0x3e5a6000, 0x3e576000, 0x3e546400, 0x3e4b8400, 0x3e48f400, 0x3e479800, 0x3e42e800, 0x3e3cec00, 0x3e38a800, 0x3e346400, 0x3e34bc00, 0x3e35d800, 0x3e3bfc00, 0x3e48a000, 0x3e502000, 0x3e556c00, 0x3e5bd000, 0x3e614800, 0x3e644400, 0x3e6bf400, 0x3e6f8c00, 0x3e6f4000, 0x3e720000, 0x3e732000, 0x3e776c00, 0x3e76e800, 0x3e749400, 0x3e783400, 0x3e7d3000, 0x3e7bd800, 0x3e7e2c00, 0x3e7b4800, 0x3e79d000, 0x3e79fc00, 0x3e749c00, 0x3e787000, 0x3e707400, 0x3e818e00, 0x3ed67400, 0x3e544000, 0x3e4fe000, 0x3e542000, 0x3e5db800, 0x3e71b800, 0x3e6c1000, 0x3e6aa800, 0x3e697800, 0x3e612800, 0x3e670000, 0x3e622800, 0x3e651000, 0x3e645000, 0x3e64f800, 0x3e68c800, 0x3e68f000, 0x3e651800, 0x3e617000, 0x3e600000, 0x3e61b800, 0x3e5f8000, 0x3e5a6000, 0x3e576000, 0x3e546800, 0x3e4b8800, 0x3e48f800, 0x3e479800, 0x3e42e800, 0x3e3cf000, 0x3e38a800, 0x3e346800, 0x3e34c000, 0x3e35d800, 0x3e3c0000, 0x3e48a000, 0x3e502000, 0x3e556800, 0x3e5bd000, 0x3e614800, 0x3e644800, 0x3e6bf000, 0x3e6f8800, 0x3e6f4000, 0x3e720000, 0x3e732000, 0x3e777000, 0x3e76e800, 0x3e749800, 0x3e783000, 0x3e7d3000, 0x3e7bd800, 0x3e7e2800, 0x3e7b4800, 0x3e79d000, 0x3e79f800, 0x3e74a000, 0x3e787000, 0x3e707800, 0x3e819000, }; #ifdef IVAS_FLOAT_FIXED #ifdef FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT const Word16 fastconvReverberationEneCorrections_Q_fx = 16; const Word16 fastconvReverberationEneCorrections_Q_fx = 15; #endif // FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT const Word16 fastconvReverberationEneCorrections_fx[CLDFB_NO_CHANNELS_MAX] = { 4899, 1761, 1951, 1780, 2157, 12735, 9685, 9205, 10613, 10886, 19464, 20398, 22536, 22664, 22079, 21506, 22915, 22878, 21887, 21171, 28663, 14958, 8281, 5860, 5086, 4494, 4286, 4772, 5032, 4554, 10543, 10141, 8025, 5040, 2300, 893, 600, 425, 336, 256, 201, 151, 116, 106, 101, 93, 79, 74, 69, 66, 57, 51, 38, 28, 20, 14, 8, 5, 3, 2, 19, 7, 8, 7, 8, 50, 38, 36, 41, 43, 76, 80, 88, 89, 86, 84, 90, 89, 85, 83, 112, 58, 32, 23, 20, 18, 17, 19, 20, 18, 41, 40, 31, 20, 9, 3, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; #endif // IVAS_FLOAT_FIXED const uint32_t fastconvReverberationEneCorrections[CLDFB_NO_CHANNELS_MAX] = { 0x3a191800, 0x395c2000, 0x3973e000, 0x395e8000, 0x3986d000, 0x3ac6fc00, 0x3a975400, 0x3a8fd400, 0x3aa5d400, 0x3aaa1800, 0x3b181000, 0x3b1f5c00, 0x3b301000, 0x3b311000, 0x3b2c7e00, 0x3b280400, 0x3b330600, 0x3b32bc00, 0x3b2afe00, 0x3b256600, 0x3b5fee00, 0x3ae9b800, 0x3a816400, 0x3a372000, 0x3a1ef000, 0x3a0c7000, 0x3a05f000, 0x3a152000, 0x3a1d4000, 0x3a0e5000, 0x3aa4bc00, 0x3a9e7400, 0x3a7ac800, 0x3a1d8000, 0x398fc000, 0x38df4000, 0x38960000, 0x38548000, 0x38280000, 0x38000000, 0x37c90000, 0x37970000, 0x37680000, 0x37540000, 0x374a0000, 0x373a0000, 0x371e0000, 0x37140000, 0x370a0000, 0x37040000, 0x36e40000, 0x36cc0000, 0x36980000, 0x36600000, 0x36200000, 0x35e00000, 0x35800000, 0x35200000, 0x34c00000, 0x34800000, 0x3a180000, 0x39600000, 0x39800000, 0x39600000, 0x39800000, 0x3ac80000, 0x3a980000, 0x3a900000, 0x3aa40000, 0x3aac0000, 0x3b180000, 0x3b200000, 0x3b300000, 0x3b320000, 0x3b2c0000, 0x3b280000, 0x3b340000, 0x3b320000, 0x3b2a0000, 0x3b260000, 0x3b600000, 0x3ae80000, 0x3a800000, 0x3a380000, 0x3a200000, 0x3a100000, 0x3a080000, 0x3a180000, 0x3a200000, 0x3a100000, 0x3aa40000, 0x3aa00000, 0x3a780000, 0x3a200000, 0x39900000, 0x38c00000, 0x38800000, 0x38800000, 0x38000000, 0x38000000, 0x38000000, 0x38000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, }; /* * Generated on 07-Jun-2024 with Matlab version 24.1.0.2578822 (R2024a) Update 2 by marcemerit on MACA64 * Generated on 08-Jun-2024 with Matlab version 24.1.0.2578822 (R2024a) Update 2 by marcemerit on MACA64 * Binaural rendering data set based on BRIRs Tables derived from Mozart IIS BRIRs.*/ Loading Loading @@ -94964,60 +94964,60 @@ const uint32_t hrtfShCoeffsIm[BINAURAL_CHANNELS][HRTF_SH_CHANNELS][HRTF_NUM_BINS #ifdef IVAS_FLOAT_FIXED #ifdef FIX_PARAM_CHANGES_AND_HRTF_FILE_FORMAT const Word16 parametricReverberationTimes_Q_fx = 16; const Word16 parametricReverberationTimes_Q_fx = 15; const Word16 parametricReverberationTimes_fx[CLDFB_NO_CHANNELS_MAX]= { 22642, 20936, 21821, 23653, 24530, 24299, 23503, 22813, 22486, 21715, 20742, 19987, 19324, 18845, 18345, 17713, 17304, 16804, 16377, 15862, 15406, 15050, 14662, 14339, 13933, 13611, 13244, 12982, 12708, 12184, 11972, 11925, 11783, 11736, 11570, 11294, 11213, 11007, 11008, 11089, 10967, 10874, 10719, 10588, 10381, 10266, 10181, 10065, 9934, 9828, 9713, 9598, 9482, 9367, 9252, 9137, 9021, 8906, 8791, 8676 11321, 10468, 10910, 11827, 12265, 12150, 11751, 11407, 11243, 10858, 10371, 9993, 9662, 9422, 9172, 8856, 8652, 8402, 8189, 7931, 7703, 7525, 7331, 7169, 6966, 6806, 6622, 6491, 6354, 6092, 5986, 5962, 5891, 5868, 5785, 5647, 5607, 5503, 5504, 5545, 5483, 5437, 5360, 5294, 5191, 5133, 5091, 5033, 4967, 4914, 4856, 4799, 4741, 4684, 4626, 4568, 4511, 4453, 4395, 4338 }; #else const Word32 parametricReverberationTimes_fx[CLDFB_NO_CHANNELS_MAX]= { 741933056, 686030848, 715030528, 775061504, 803799040, 796229632, 770146304, 747536384, 736821248, 711557120, 679673856, 654934016, 633208832, 617512960, 601128960, 580419584, 567017472, 550633472, 536641536, 519766016, 504823808, 493158400, 480444416, 469860352, 456556544, 446005248, 433979392, 425394176, 416415744, 399245312, 392298496, 390758400, 386105344, 384565248, 379125760, 370081792, 367427584, 360677376, 360710144, 363364352, 359366656, 356319232, 351240192, 346947584, 340164608, 336396288, 333611008, 329809920, 325517312, 322043904, 318275584, 314507264, 310706176, 306937856, 303169536, 299401216, 295600128, 291831808, 288063488, 284295168 741933056, 686030848, 714997760, 775094272, 803799040, 796262400, 770113536, 747569152, 736821248, 711589888, 679673856, 654901248, 633208832, 617480192, 601096192, 580386816, 567017472, 550633472, 536674304, 519766016, 504823808, 493158400, 480444416, 469827584, 456523776, 446038016, 433979392, 425394176, 416415744, 399245312, 392298496, 390725632, 386072576, 384565248, 379125760, 370081792, 367460352, 360644608, 360710144, 363397120, 359333888, 356319232, 351272960, 346947584, 340197376, 336396288, 333643776, 329842688, 325517312, 322043904, 318242816, 314507264, 310706176, 306970624, 303169536, 299368448, 295632896, 291831808, 288030720, 284295168 }; #endif // FIX_PARAM_CHANGES_AND_HRTF_FILE_FORMAT #else // IVAS_FLOAT_FIXED const uint32_t parametricReverberationTimes[CLDFB_NO_CHANNELS_MAX] = { 0x3eb0e400, 0x3ea39000, 0x3eaa7a00, 0x3eb8ca00, 0x3ebfa400, 0x3ebdd600, 0x3eb79e00, 0x3eb23a00, 0x3eafac00, 0x3ea9a600, 0x3ea20c00, 0x3e9c2600, 0x3e96f800, 0x3e933a00, 0x3e8f5200, 0x3e8a6200, 0x3e873000, 0x3e834800, 0x3e7fe400, 0x3e77d800, 0x3e70b800, 0x3e6b2800, 0x3e651800, 0x3e600c00, 0x3e59b400, 0x3e54ac00, 0x3e4ef000, 0x3e4ad800, 0x3e469000, 0x3e3e6000, 0x3e3b1000, 0x3e3a5400, 0x3e381c00, 0x3e376000, 0x3e34c800, 0x3e307800, 0x3e2f3400, 0x3e2bfc00, 0x3e2c0000, 0x3e2d4400, 0x3e2b5c00, 0x3e29e800, 0x3e277c00, 0x3e257000, 0x3e223400, 0x3e206800, 0x3e1f1400, 0x3e1d4400, 0x3e1b3800, 0x3e199000, 0x3e17c400, 0x3e15f800, 0x3e142800, 0x3e125c00, 0x3e109000, 0x3e0ec400, 0x3e0cf400, 0x3e0b2800, 0x3e095c00, 0x3e079000 0x3eb0e400, 0x3ea39000, 0x3eaa7800, 0x3eb8cc00, 0x3ebfa400, 0x3ebdd800, 0x3eb79c00, 0x3eb23c00, 0x3eafac00, 0x3ea9a800, 0x3ea20c00, 0x3e9c2400, 0x3e96f800, 0x3e933800, 0x3e8f5000, 0x3e8a6000, 0x3e873000, 0x3e834800, 0x3e7fe800, 0x3e77d800, 0x3e70b800, 0x3e6b2800, 0x3e651800, 0x3e600800, 0x3e59b000, 0x3e54b000, 0x3e4ef000, 0x3e4ad800, 0x3e469000, 0x3e3e6000, 0x3e3b1000, 0x3e3a5000, 0x3e381800, 0x3e376000, 0x3e34c800, 0x3e307800, 0x3e2f3800, 0x3e2bf800, 0x3e2c0000, 0x3e2d4800, 0x3e2b5800, 0x3e29e800, 0x3e278000, 0x3e257000, 0x3e223800, 0x3e206800, 0x3e1f1800, 0x3e1d4800, 0x3e1b3800, 0x3e199000, 0x3e17c000, 0x3e15f800, 0x3e142800, 0x3e126000, 0x3e109000, 0x3e0ec000, 0x3e0cf800, 0x3e0b2800, 0x3e095800, 0x3e079000 }; #endif // IVAS_FLOAT_FIXED #ifdef IVAS_FLOAT_FIXED #ifdef FIX_PARAM_CHANGES_AND_HRTF_FILE_FORMAT const Word16 parametricReverberationEneCorrections_Q_fx = 17; const Word16 parametricReverberationEneCorrections_Q_fx = 15; const Word16 parametricReverberationEneCorrections_fx[CLDFB_NO_CHANNELS_MAX]= { 25163, 18840, 14880, 12299, 11816, 10481, 8729, 9529, 10026, 10756, 11176, 12303, 13356, 14907, 15420, 14876, 16531, 16555, 16243, 15213, 12914, 6748, 3926, 3306, 2771, 2537, 2190, 2127, 2414, 2414, 2241, 1995, 1863, 1270, 524, 211, 126, 84, 65, 55, 40, 24, 15, 15, 13, 10, 8, 8, 8, 8, 8, 7, 5, 4, 2, 1, 0, 0, 0, 0 6291, 4710, 3720, 3075, 2954, 2620, 2182, 2382, 2506, 2689, 2794, 3076, 3339, 3727, 3855, 3719, 4133, 4139, 4061, 3803, 3229, 1687, 981, 826, 693, 634, 547, 532, 603, 604, 560, 499, 466, 318, 131, 53, 32, 21, 16, 14, 10, 6, 4, 4, 3, 3, 2, 2, 2, 2, 2, 2, 1, 1, 0, 0, 0, 0, 0, 0 }; #else // FIX_PARAM_CHANGES_AND_HRTF_FILE_FORMAT const Word32 parametricReverberationEneCorrections_fx[CLDFB_NO_CHANNELS_MAX]= { 412270592, 308674560, 243793920, 201506816, 193593344, 171720704, 143015936, 156123136, 164265984, 176226304, 183107584, 201572352, 218824704, 244236288, 252641280, 243728384, 270843904, 271237120, 266125312, 249249792, 211582976, 110559232, 64323584, 54165504, 45400064, 41566208, 35880960, 34848768, 39550976, 39550976, 36716544, 32686080, 30523392, 20807680, 8585216, 3457024, 2064384, 1376256, 1064960, 901120, 655360, 393216, 245760, 245760, 212992, 163840, 131072, 131072, 131072, 131072, 131072, 114688, 81920, 65536, 32768, 16384, 0, 0, 0, 0 412286976, 308674560, 243793920, 201523200, 193593344, 171704320, 142999552, 156106752, 164233216, 176226304, 183107584, 201588736, 218824704, 244252672, 252641280, 243728384, 270860288, 271253504, 266141696, 249233408, 211615744, 110559232, 64290816, 54132736, 45416448, 41549824, 35848192, 34865152, 39518208, 39583744, 36700160, 32702464, 30539776, 20840448, 8585216, 3473408, 2097152, 1376256, 1048576, 917504, 655360, 393216, 262144, 262144, 196608, 196608, 131072, 131072, 131072, 131072, 131072, 131072, 65536, 65536, 0, 0, 0, 0, 0, 0 }; #endif // FIX_PARAM_CHANGES_AND_HRTF_FILE_FORMAT Loading @@ -95026,12 +95026,12 @@ const Word32 parametricReverberationEneCorrections_fx[CLDFB_NO_CHANNELS_MAX]= { const uint32_t parametricReverberationEneCorrections[CLDFB_NO_CHANNELS_MAX] = { 0x3e449600, 0x3e133000, 0x3de88000, 0x3dc02c00, 0x3db8a000, 0x3da3c400, 0x3d886400, 0x3d94e400, 0x3d9ca800, 0x3da81000, 0x3daea000, 0x3dc03c00, 0x3dd0b000, 0x3de8ec00, 0x3df0f000, 0x3de87000, 0x3e012600, 0x3e015600, 0x3dfdcc00, 0x3dedb400, 0x3dc9c800, 0x3d52e000, 0x3cf56000, 0x3ccea000, 0x3cad3000, 0x3c9e9000, 0x3c88e000, 0x3c84f000, 0x3c96e000, 0x3c96e000, 0x3c8c1000, 0x3c796000, 0x3c68e000, 0x3c1ec000, 0x3b830000, 0x3ad30000, 0x3a7c0000, 0x3a280000, 0x3a020000, 0x39dc0000, 0x39a00000, 0x39400000, 0x38f00000, 0x38f00000, 0x38d00000, 0x38a00000, 0x38800000, 0x38800000, 0x38800000, 0x38800000, 0x38800000, 0x38600000, 0x38200000, 0x38000000, 0x37800000, 0x37000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 0x3e449800, 0x3e133000, 0x3de88000, 0x3dc03000, 0x3db8a000, 0x3da3c000, 0x3d886000, 0x3d94e000, 0x3d9ca000, 0x3da81000, 0x3daea000, 0x3dc04000, 0x3dd0b000, 0x3de8f000, 0x3df0f000, 0x3de87000, 0x3e012800, 0x3e015800, 0x3dfdd000, 0x3dedb000, 0x3dc9d000, 0x3d52e000, 0x3cf54000, 0x3cce8000, 0x3cad4000, 0x3c9e8000, 0x3c88c000, 0x3c850000, 0x3c96c000, 0x3c970000, 0x3c8c0000, 0x3c798000, 0x3c690000, 0x3c1f0000, 0x3b830000, 0x3ad40000, 0x3a800000, 0x3a280000, 0x3a000000, 0x39e00000, 0x39a00000, 0x39400000, 0x39000000, 0x39000000, 0x38c00000, 0x38c00000, 0x38800000, 0x38800000, 0x38800000, 0x38800000, 0x38800000, 0x38800000, 0x38000000, 0x38000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 }; #endif // IVAS_FLOAT_FIXED
scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin (1.88 MiB) File changed.No diff preview for this file type. View original file View changed file
scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin (2.32 MiB) File changed.No diff preview for this file type. View original file View changed file