[wip] restore TD Object Renderer tables (9aec5472) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/options.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -166,8 +166,8 @@

		#define FIX_POINT_HRTF_FILE_FORMAT /* All: fix point hrtf binary file format */
		#ifdef FIX_POINT_HRTF_FILE_FORMAT
		#define FIX_1123_CREND_16BIT_ROM
		#define FIX_1123_TDREN_16BIT_ROM
		#define FIX_1123_CREND_16BIT_ROM /* Ora: update CREND ROM tables to 16 bit */
		/#define FIX_1123_TDREN_16BIT_ROM/ /* Eri,Ora: update TD Object Renderer tables to 16 bit */
		/#define FIX_1123_FASTCONV_16BIT_ROM/ /* FhG: issue 1123: update FastConv ROM tables to 16 bit (must regenerate ROM file!) */
		#define FIX_1123_FASTCONV_16BIT_FMT /* FhG: issue 1123: update FastConv binary file format and scripts to 16 bit */
		/#define FIX_1123_PARAMBIN_16BIT_ROM/ /* FhG,Nok: issue 1123: update ParamBin ROM tables and scripts to generate 16 bit tables instead of float */

lib_rend/ivas_rom_TdBinauralRenderer.c

+22 −22

Original line number	Diff line number	Diff line
		@@ -48,10 +48,10 @@
		------------------------------------------------------------------------/
		/* TD renderer default HRIR model */
		#ifdef DEBUGGING
		/* Generated on 18-Jul-2024 with Matlab version 24.1.0.2578822 (R2024a) Update 2 by marcemerit on MACA64 */
		/* Generated on 30-Jul-2024 with Matlab version 9.9.0.2037887 (R2020b) Update 8 by tmu on MACI64 */
		#endif

		#ifdef FIX_POINT_HRTF_FILE_FORMAT
		#ifdef FIX_1123_TDREN_16BIT_ROM
		const int16_t defaultHRIR_rom_latency_s_Q = 31;
		const int32_t defaultHRIR_rom_latency_s = 44741;
		#else
		@@ -86,7 +86,7 @@ const int16_t defaultHRIR_rom_azimShapeIdx[15] = {
		const int16_t defaultHRIR_rom_azimShapeSampFactor[15] = {
		-1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, -1,
		};
		#ifdef FIX_POINT_HRTF_FILE_FORMAT
		#ifdef FIX_1123_TDREN_16BIT_ROM
		const int16_t defaultHRIR_rom_elevKSeq_Q = 8;
		const int16_t defaultHRIR_rom_elevKSeq[13] = {
		-23040, -19200, -15360, -11520, -7680, -3840, 0, 3840, 7680, 11520, 15360, 19200, 23040,
		@@ -96,7 +96,7 @@ const float defaultHRIR_rom_elevKSeq[13] = {
		-90.000000f, -75.000000f, -60.000000f, -45.000000f, -30.000000f, -15.000000f, 0.000000f, 15.000000f, 30.000000f, 45.000000f, 60.000000f, 75.000000f, 90.000000f,
		};
		#endif
		#ifdef FIX_POINT_HRTF_FILE_FORMAT
		#ifdef FIX_1123_TDREN_16BIT_ROM
		const int16_t defaultHRIR_rom_elevBsShape_Q = 15;
		const int16_t defaultHRIR_rom_elevBsShape[36] = {
		32767, 13824, 4096, 512, 0, 0, 16256, 19456, 14976, 8192, 3456, 1024, 128, 0, 0, 2603, 8533, 14976, 19115, 18901, 15360, 10283, 5461, 2304, 683, 85, 0, 0, 85, 683, 2304, 5461, 10325, 15701, 20053, 21845,
		@@ -106,7 +106,7 @@ const uint32_t defaultHRIR_rom_elevBsShape[36] = {
		0x3f7ffe00,0x3ed80000,0x3e000000,0x3c800000,0x00000000,0x00000000,0x3efe0000,0x3f180000,0x3eea0000,0x3e800000,0x3dd80000,0x3d000000,0x3b800000,0x00000000,0x00000000,0x3da2b000,0x3e855400,0x3eea0000,0x3f155600,0x3f13aa00,0x3ef00000,0x3ea0ac00,0x3e2aa800,0x3d900000,0x3caac000,0x3b2a0000,0x00000000,0x00000000,0x3b2a0000,0x3caac000,0x3d900000,0x3e2aa800,0x3ea15400,0x3ef55400,0x3f1caa00,0x3f2aaa00,
		};
		#endif
		#ifdef FIX_POINT_HRTF_FILE_FORMAT
		#ifdef FIX_1123_TDREN_16BIT_ROM
		const int16_t defaultHRIR_rom_azimBsShape_Q = 15;
		const int16_t defaultHRIR_rom_azimBsShape[21] = {
		21845, 21534, 20666, 19339, 17651, 15701, 13588, 11409, 9262, 7247, 5461, 3981, 2796, 1873, 1180, 683, 350, 147, 44, 5, 0,
		@@ -116,7 +116,7 @@ const uint32_t defaultHRIR_rom_azimBsShape[21] = {
		0x3f2aaa00,0x3f283c00,0x3f217400,0x3f171600,0x3f09e600,0x3ef55400,0x3ed45000,0x3eb24400,0x3e90b800,0x3e627800,0x3e2aa800,0x3df8d000,0x3daec000,0x3d6a2000,0x3d138000,0x3caac000,0x3c2f0000,0x3b930000,0x3ab00000,0x39200000,0x00000000,
		};
		#endif
		#ifdef FIX_POINT_HRTF_FILE_FORMAT
		#ifdef FIX_1123_TDREN_16BIT_ROM
		const int16_t defaultHRIR_rom_Alpha48_Q = 14;
		const int16_t defaultHRIR_rom_AlphaL48[470 * 128] = {
		2196, 437, 2620, 2054, 2197, 2199, 2307, 2350, 2385, 2307, 2258, 2205, 2160, 2123, 2102, 2085, 2065, 2056, 2023, 1908, 2395, 344, -284, -1067, 727,
		@@ -4938,7 +4938,7 @@ const uint32_t defaultHRIR_rom_AlphaL48[470 * 128] = {
		0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x3f800000,0xc0000000,0xbf800000,0xc0000000,
		};
		#endif
		#ifdef FIX_POINT_HRTF_FILE_FORMAT
		#ifdef FIX_1123_TDREN_16BIT_ROM
		const int16_t defaultHRIR_rom_AlphaR48[470 * 128] = {
		2196, 2055, 2634, 445, -369, -977, 986, -254, -1006, -1055, -992, -750, -965, -1016, -964, -253, 725, -1060, -270, 350, 2396, 1908, 2023, 2056, 2065,
		2085, 2102, 2123, 2160, 2205, 2258, 2307, 2385, 2350, 2307, 2200, 2195, 2575, 2233, -523, 1684, 585, 688, 1092, 956, 1429, 995, 518, 902, 1045,
		@@ -9759,7 +9759,7 @@ const uint32_t defaultHRIR_rom_AlphaR48[470 * 128] = {
		0xb9000000,0xb9000000,0xb8800000,0xb8800000,0xb8800000,0xb8800000,0xb8800000,0xb8800000,0xb8800000,0xb9000000,
		};
		#endif
		#ifdef FIX_POINT_HRTF_FILE_FORMAT
		#ifdef FIX_1123_TDREN_16BIT_ROM
		const int16_t defaultHRIR_rom_E48_Q = 28;
		const int32_t defaultHRIR_rom_EL48[HRTF_MODEL_N_SECTIONS * 470] = {
		75424032, 74531904, 86612200, 66107596, 75444368, 75727784, 82244496, 84548440, 86432144, 81644744, 78654600, 75132304, 72713520, 70622328, 69310368, 67758128, 66404528, 65047140, 63993372, 57231440, 73522264, 66414948, 76822592, 127171776, 64817104,
		@@ -9881,7 +9881,7 @@ const uint32_t defaultHRIR_rom_EL48[HRTF_MODEL_N_SECTIONS * 470] = {
		0x393ccd00,0x39261500,0x3930cd00,0x392a3f00,0x3924a000,0x38f9b000,0x38ce0a00,0x391f0300,0x38fca800,0x38df3800,
		};
		#endif
		#ifdef FIX_POINT_HRTF_FILE_FORMAT
		#ifdef FIX_1123_TDREN_16BIT_ROM
		const int32_t defaultHRIR_rom_ER48[HRTF_MODEL_N_SECTIONS * 470] = {
		75421488, 66224256, 87588992, 74644368, 88538160, 124750960, 70779776, 76065512, 113076712, 117758280, 114685712, 99697720, 114338256, 116987096, 114060192, 73846616, 64704504, 127022976, 76461672, 66327712, 73764184, 57289788, 63951156, 65053180, 66401008,
		67760256, 69310184, 70635240, 72716416, 75132880, 78649848, 81648760, 86437904, 84547160, 82224888, 75758448, 75321056, 99439824, 100628176, 109349728, 64449932, 52442920, 44442504, 43599928, 37176108, 43589180, 44530888, 42711168, 44908180, 38576748,
		@@ -10002,7 +10002,7 @@ const uint32_t defaultHRIR_rom_ER48[HRTF_MODEL_N_SECTIONS * 470] = {
		0x38927800,0x3894e400,0x38979200,0x389e6600,0x38abf800,0x38a31c00,0x389f6200,0x389dc800,0x389e7800,0x38df3800,
		};
		#endif
		#ifdef FIX_POINT_HRTF_FILE_FORMAT
		#ifdef FIX_1123_TDREN_16BIT_ROM
		const int16_t defaultHRIR_rom_Alpha32_Q = 14;
		const int16_t defaultHRIR_rom_AlphaL32[470 * 86] = {
		4109, 942, 4964, 3820, 4127, 4092, 4325, 4412, 4480, 4339, 4246, 4138, 4049, 3978, 3943, 3907, 3872, 3853, 3804, 3552, 4527, 763, -763, -2805, 1557,
		@@ -13244,7 +13244,7 @@ const uint32_t defaultHRIR_rom_AlphaL32[470 * 86] = {
		0xbf800000,0xbf800000,0xbf800000,0xc0000000,0xbf800000,0xc0000000,0x3f800000,0x00000000,0x3f800000,0x3f800000,0x3f800000,0x3f800000,0x3f800000,0x3f800000,0x3f800000,0x00000000,0x3f800000,0xbf800000,0xbf800000,0xbf800000,
		};
		#endif
		#ifdef FIX_POINT_HRTF_FILE_FORMAT
		#ifdef FIX_1123_TDREN_16BIT_ROM
		const int16_t defaultHRIR_rom_AlphaR32[470 * 86] = {
		4109, 3824, 4994, 960, -958, -2630, 2083, -646, -2577, -2692, -2592, -2122, -2566, -2655, -2563, -660, 1551, -2794, -741, 773, 4530, 3553, 3803, 3853, 3872,
		3907, 3943, 3978, 4049, 4138, 4246, 4339, 4480, 4412, 4324, 4094, 4122, 4780, 4288, -1441, 3195, 995, 1132, 2042, 1718, 2727, 1996, 969, 1815, 2013,
		@@ -16485,7 +16485,7 @@ const uint32_t defaultHRIR_rom_AlphaR32[470 * 86] = {
		0xb8800000,0xb9000000,0xb8800000,0xb8800000,0xb8800000,0xb8800000,0xb8800000,0xb8800000,0xb8800000,0xb8800000,0xb8800000,0xb8800000,0xb8800000,0xb8800000,0xb8800000,0xb8800000,0xb8800000,0xb8800000,0xb8800000,0xb8800000,
		};
		#endif
		#ifdef FIX_POINT_HRTF_FILE_FORMAT
		#ifdef FIX_1123_TDREN_16BIT_ROM
		const int16_t defaultHRIR_rom_E32_Q = 28;
		const int32_t defaultHRIR_rom_EL32[HRTF_MODEL_N_SECTIONS * 470] = {
		88764792, 83154280, 89567896, 78948672, 86760408, 89708736, 94515024, 97075376, 101266112, 94597840, 91159944, 87645936, 84628240, 82086760, 79794632, 78333560, 76692688, 75071136, 73237424, 67923256, 76252432, 74141240, 78189424, 107201392, 71719344,
		@@ -16607,7 +16607,7 @@ const uint32_t defaultHRIR_rom_EL32[HRTF_MODEL_N_SECTIONS * 470] = {
		0x390f3900,0x390ab700,0x390b7000,0x390a1400,0x390d8700,0x38fb8000,0x38f12800,0x38f8a200,0x38f0ca00,0x390dfe00,
		};
		#endif
		#ifdef FIX_POINT_HRTF_FILE_FORMAT
		#ifdef FIX_1123_TDREN_16BIT_ROM
		const int32_t defaultHRIR_rom_ER32[HRTF_MODEL_N_SECTIONS * 470] = {
		88760616, 79018416, 90166504, 83236560, 88159800, 108024648, 77068208, 78038792, 98254112, 100230288, 97137408, 88461312, 96433632, 98852192, 97276480, 75082112, 71550016, 106986256, 78099360, 74156248, 76344976, 67961992, 73216416, 75071136, 76690944,
		78336760, 79795336, 82089656, 84632528, 87644704, 91143080, 94597776, 101275232, 97075600, 94508208, 89736288, 86686056, 117311776, 114996008, 113576624, 78532160, 67534416, 59446544, 56482944, 49819276, 52182616, 52621296, 51400732, 52711936, 48079572,
		@@ -16728,7 +16728,7 @@ const uint32_t defaultHRIR_rom_ER32[HRTF_MODEL_N_SECTIONS * 470] = {
		0x38b2dc00,0x38aba200,0x38a63200,0x38a4d800,0x38a4a800,0x38aaf000,0x38b25600,0x38b82c00,0x38bdd400,0x390dfe00,
		};
		#endif
		#ifdef FIX_POINT_HRTF_FILE_FORMAT
		#ifdef FIX_1123_TDREN_16BIT_ROM
		const int16_t defaultHRIR_rom_Alpha16_Q = 14;
		const int16_t defaultHRIR_rom_AlphaL16[470 * 43] = {
		8380, 6269, 8401, 7771, 8176, 8335, 8674, 8832, 8988, 8768, 8637, 8490, 8326, 8172, 8017, 7913, 7802, 7708, 7597, 7296, 7907, 5897, 4635, 1865, 6344,
		@@ -18354,7 +18354,7 @@ const uint32_t defaultHRIR_rom_AlphaL16[470 * 43] = {
		0xc0400000,0xc0400000,0xc0400000,0xc0400000,0xc0400000,0xc0400000,0xc0400000,0xc1200000,0xc1100000,0xc1200000,
		};
		#endif
		#ifdef FIX_POINT_HRTF_FILE_FORMAT
		#ifdef FIX_1123_TDREN_16BIT_ROM
		const int16_t defaultHRIR_rom_AlphaR16[470 * 43] = {
		8380, 7775, 8425, 6286, 4758, 2311, 6810, 4794, 2430, 2311, 2297, 2492, 2140, 2076, 2069, 4661, 6333, 1872, 4657, 5906, 7911, 7297, 7596, 7708, 7802,
		7913, 8017, 8172, 8326, 8490, 8637, 8768, 8988, 8832, 8673, 8337, 8173, 9111, 8850, 4425, 7313, 5597, 5447, 5995, 5510, 6111, 5715, 4966, 5588, 5509,
		@@ -19979,7 +19979,7 @@ const uint32_t defaultHRIR_rom_AlphaR16[470 * 43] = {
		0xba200000,0xba100000,0xba100000,0xba000000,0xba000000,0xba000000,0xb9e00000,0xb9e00000,0xb9e00000,0xba200000,
		};
		#endif
		#ifdef FIX_POINT_HRTF_FILE_FORMAT
		#ifdef FIX_1123_TDREN_16BIT_ROM
		const int16_t defaultHRIR_rom_E16_Q = 29;
		const int32_t defaultHRIR_rom_EL16[HRTF_MODEL_N_SECTIONS * 470] = {
		206109184, 168120064, 191836192, 182078752, 192106976, 197882288, 207667584, 212469392, 217470368, 208949424, 203938496, 198973968, 193378656, 188390048, 183902768, 179393808, 175609504, 172489072, 169782128, 162989616, 172482848, 153900912, 154645488, 189723344, 148310880,
		@@ -20101,7 +20101,7 @@ const uint32_t defaultHRIR_rom_EL16[HRTF_MODEL_N_SECTIONS * 470] = {
		0x39927c80,0x398f9080,0x39903080,0x398e7280,0x3993ab00,0x39844c80,0x397ec800,0x397fcb00,0x39795c00,0x39928700,
		};
		#endif
		#ifdef FIX_POINT_HRTF_FILE_FORMAT
		#ifdef FIX_1123_TDREN_16BIT_ROM
		const int32_t defaultHRIR_rom_ER16[HRTF_MODEL_N_SECTIONS * 470] = {
		206128352, 182152384, 192350944, 168282528, 165563744, 187485760, 156466208, 150736768, 174374272, 175048048, 172493136, 169116592, 174792992, 177535520, 175115648, 147247616, 148037728, 189523808, 154650752, 153955408, 172592960, 163017504, 169754832, 172491440, 175609504,
		179393808, 183906528, 188398144, 193378656, 198975056, 203956096, 208932816, 217478272, 212479760, 207633888, 197928912, 192060992, 245076096, 237265376, 209167392, 180870912, 154668416, 144999264, 137137200, 126273232, 124687720, 122656800, 123468488, 124295824, 120827176,
		@@ -20222,7 +20222,7 @@ const uint32_t defaultHRIR_rom_ER16[HRTF_MODEL_N_SECTIONS * 470] = {
		0x39341a00,0x392d7b00,0x39276400,0x3926b100,0x39253300,0x392d7a00,0x39335400,0x393c8300,0x39438b00,0x39928700,
		};
		#endif
		#ifdef FIX_POINT_HRTF_FILE_FORMAT
		#ifdef FIX_1123_TDREN_16BIT_ROM
		const int16_t defaultHRIR_rom_ITD_W_Q = 9;
		const int16_t defaultHRIR_rom_ITD_W[658] = {
		0,3,-241,-59,43,264,-385,-146,-25,229,-104,-377,-447,-148,-97,-353,-525,190,-187,-126,-262,1,264,130,196,
		@@ -20302,7 +20302,7 @@ const int16_t defaultHRIR_rom_ITD_azimBsLen[4] = {
		const int16_t defaultHRIR_rom_ITD_azimBsStart[4] = {
		0, 11, 32, 63,
		};
		#ifdef FIX_POINT_HRTF_FILE_FORMAT
		#ifdef FIX_1123_TDREN_16BIT_ROM
		const int16_t defaultHRIR_rom_ITD_azimBsShape_Q = 15;
		const int16_t defaultHRIR_rom_ITD_azimBsShape[84] = {
		32767,23888,16777,11239,7078,4096,2097,885,262,33,0,0,8413,14221,17768,19399,19456,18285,16228,13631,10838,8192,5972,4194,2810,
		@@ -20318,7 +20318,7 @@ const uint32_t defaultHRIR_rom_ITD_azimBsShape[84] = {
		0x3e90b800,0x3eb24400,0x3ed45000,0x3ef55400,0x3f09e600,0x3f171600,0x3f217400,0x3f283c00,0x3f2aaa00,
		};
		#endif
		#ifdef FIX_POINT_HRTF_FILE_FORMAT
		#ifdef FIX_1123_TDREN_16BIT_ROM
		const int16_t defaultHRIR_rom_ITD_azimKSeq_Q = 7;
		const int16_t defaultHRIR_rom_ITD_azimKSeq[19] = {
		0, 1280, 2560, 3840, 5120, 6400, 7680, 8960, 10240, 11520, 12800, 14080, 15360, 16640, 17920, 19200, 20480, 21760, 23040,
		@@ -20328,7 +20328,7 @@ const float defaultHRIR_rom_ITD_azimKSeq[19] = {
		0.000000f, 10.000000f, 20.000000f, 30.000000f, 40.000000f, 50.000000f, 60.000000f, 70.000000f, 80.000000f, 90.000000f, 100.000000f, 110.000000f, 120.000000f, 130.000000f, 140.000000f, 150.000000f, 160.000000f, 170.000000f, 180.000000f,
		};
		#endif
		#ifdef FIX_POINT_HRTF_FILE_FORMAT
		#ifdef FIX_1123_TDREN_16BIT_ROM
		const int16_t defaultHRIR_rom_ITD_elevBsShape_Q = 15;
		const int16_t defaultHRIR_rom_ITD_elevBsShape[28] = {
		32767,9709,1214,0,0,18508,16991,8192,2427,303,0,0,4349,12945,19115,18002,12035,5461,1618,202,0,0,202,1618,5461,
		@@ -20340,7 +20340,7 @@ const uint32_t defaultHRIR_rom_ITD_elevBsShape[28] = {
		0x3ebda000,0x3f12f600,0x3f2aaa00,
		};
		#endif
		#ifdef FIX_POINT_HRTF_FILE_FORMAT
		#ifdef FIX_1123_TDREN_16BIT_ROM
		const int16_t defaultHRIR_rom_ITD_elevKSeq_Q = 8;
		const int16_t defaultHRIR_rom_ITD_elevKSeq[16] = {
		-23040, -19968, -16896, -13824, -10752, -7680, -4608, -1536, 1536, 4608, 7680, 10752, 13824, 16896, 19968, 23040,

lib_rend/ivas_rom_TdBinauralRenderer.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -46,7 +46,7 @@
		* TD Binaural rendering related ROM tables
		------------------------------------------------------------------------/
		/* TD renderer default HRIR model */
		#ifdef FIX_POINT_HRTF_FILE_FORMAT
		#ifdef FIX_1123_TDREN_16BIT_ROM
		extern const int16_t defaultHRIR_rom_latency_s_Q;
		extern const int32_t defaultHRIR_rom_latency_s;
		extern const int16_t defaultHRIR_rom_model_configuration[6];
		@@ -97,7 +97,7 @@ extern const uint32_t defaultHRIR_rom_ER32[HRTF_MODEL_N_SECTIONS * 470];
		extern const uint32_t defaultHRIR_rom_EL16[HRTF_MODEL_N_SECTIONS * 470];
		extern const uint32_t defaultHRIR_rom_ER16[HRTF_MODEL_N_SECTIONS * 470];
		#endif
		#ifdef FIX_POINT_HRTF_FILE_FORMAT
		#ifdef FIX_1123_TDREN_16BIT_ROM
		extern const int16_t defaultHRIR_rom_elevBsLen[4];
		extern const int16_t defaultHRIR_rom_elevBsStart[4];
		extern const int16_t defaultHRIR_rom_elevBsShape_Q;

lib_util/hrtf_file_reader.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1045,12 +1045,12 @@ ivas_error load_HRTF_binary(
		return error;
		}

		#ifndef FIX_POINT_HRTF_FILE_FORMAT
		/---------------------------------------------------------------------
		* HRTF_energy_sections_precalc()
		*
		* Calculate energies of each section and store in model->EL/model->ER
		---------------------------------------------------------------------/
		#ifndef FIX_POINT_HRTF_FILE_FORMAT
		static void HRTF_energy_sections_precalc(
		ModelParams_t model / i/o: HRTF model parameters */
		)

scripts/td_object_renderer/modeling_tool/Gen_Hrf_IVAS_Binary.m

+16 −16

Original line number	Diff line number	Diff line
		@@ -116,7 +116,7 @@ if dataSpec.genRomFile
		' * TD Binaural rendering related ROM tables'
		' ------------------------------------------------------------------------/'
		'/* TD renderer default HRIR model */'
		'#ifdef FIX_POINT_HRTF_FILE_FORMAT'
		'#ifdef FIX_1123_TDREN_16BIT_ROM'
		'extern const int16_t defaultHRIR_rom_latency_s_Q;'
		'extern const int32_t defaultHRIR_rom_latency_s;'
		'extern const int16_t defaultHRIR_rom_model_configuration[6];'
		@@ -215,7 +215,7 @@ if dataSpec.genRomFile
		fileID_c = fopen(c_file_name,'at');

		c_file_content = string(join({
		'#ifdef FIX_POINT_HRTF_FILE_FORMAT'
		'#ifdef FIX_1123_TDREN_16BIT_ROM'
		['const int16_t defaultHRIR_rom_latency_s_Q = ' num2str(Q_latency) ';']
		['const int32_t defaultHRIR_rom_latency_s = ' num2str(integer_latency) ';']
		'#else'
		@@ -430,7 +430,7 @@ for fs = [48000 32000 16000]
		fwrite(fileID, integer_latency, "int32");
		% ITD model active/inactive:
		% 1 = ITD model is used
		% 0 = ITD model is not usedclc
		% 0 = ITD model is not used
		fwrite(fileID, useITD, 'short');
		% The sampling frequency in kHz of the HR filter set:
		fwrite(fileID, fs_khz, 'short');
		@@ -573,7 +573,7 @@ for fs = [48000 32000 16000]
		arr_str_fx = replace(arr_str_fx,' ', ', ');

		c_file_content = ...
		['#ifdef FIX_POINT_HRTF_FILE_FORMAT' newline ...
		['#ifdef FIX_1123_TDREN_16BIT_ROM' newline ...
		'const int16_t defaultHRIR_rom_elevKSeq_Q = ' num2str( Q_elevKSeq) ';' newline ...
		'const int16_t defaultHRIR_rom_elevKSeq[' num2str(length(mod_hrf.elevKSeq{1})) '] = {' newline ...
		arr_str_fx ...
		@@ -631,7 +631,7 @@ for fs = [48000 32000 16000]
		arr_str_fx(end) = ';';
		arr_str_fx = replace(arr_str_fx, ";",', ');
		c_file_content = ...
		['#ifdef FIX_POINT_HRTF_FILE_FORMAT' newline ...
		['#ifdef FIX_1123_TDREN_16BIT_ROM' newline ...
		'const int16_t defaultHRIR_rom_elevBsShape_Q = ' num2str( Q_elevSplineShape_all) ';' newline ...
		'const int16_t defaultHRIR_rom_elevBsShape[' num2str(length(elevSplineShape_all)) '] = {' newline ...
		arr_str_fx ...
		@@ -654,7 +654,7 @@ for fs = [48000 32000 16000]
		arr_str_fx(end) = ';';
		arr_str_fx = replace(arr_str_fx, ";",', ');
		c_file_content = ...
		['#ifdef FIX_POINT_HRTF_FILE_FORMAT' newline ...
		['#ifdef FIX_1123_TDREN_16BIT_ROM' newline ...
		'const int16_t defaultHRIR_rom_azimBsShape_Q = ' num2str( Q_azimSplineShape{n}) ';' newline ...
		'const int16_t defaultHRIR_rom_azimBsShape[' num2str(length(azimSplineShape{n})) '] = {' newline ...
		arr_str_fx ...
		@@ -680,7 +680,7 @@ for fs = [48000 32000 16000]
		numIter = floor(size(mod_hrf.WL{1},1)*size(mod_hrf.WL{1},2)/numCol);
		numRemain = size(mod_hrf.WL{1},1)size(mod_hrf.WL{1},2) - numCol numIter;
		c_file_content = ...
		['#ifdef FIX_POINT_HRTF_FILE_FORMAT' newline ...
		['#ifdef FIX_1123_TDREN_16BIT_ROM' newline ...
		'const int16_t defaultHRIR_rom_Alpha' num2str(fs/1000) '_Q = ' num2str( Q_WL) ';' newline ...
		'const int16_t defaultHRIR_rom_AlphaL' num2str(fs/1000) '[' int2str(size(mod_hrf.WL{1}, 1)) ' * ' int2str(size(mod_hrf.WL{1}, 2)) '] = {' newline ];
		fprintf(fileID_c,'%s', c_file_content);
		@@ -727,7 +727,7 @@ for fs = [48000 32000 16000]
		numIter = floor(size(mod_hrf.WR{1},1)*size(mod_hrf.WR{1},2)/numCol);
		numRemain = size(mod_hrf.WR{1},1)size(mod_hrf.WR{1},2) - numCol numIter;
		c_file_content = ...
		['#ifdef FIX_POINT_HRTF_FILE_FORMAT' newline ...
		['#ifdef FIX_1123_TDREN_16BIT_ROM' newline ...
		'const int16_t defaultHRIR_rom_AlphaR' num2str(fs/1000) '[' int2str(size(mod_hrf.WL{1}, 1)) ' * ' int2str(size(mod_hrf.WL{1}, 2)) '] = {' newline ];
		fprintf(fileID_c,'%s', c_file_content);
		for ind = 1: numIter
		@@ -824,7 +824,7 @@ for fs = [48000 32000 16000]
		numIter = floor(HRTF_MODEL_N_SECTIONS*size(mod_hrf.WL{1},1)/numCol);
		numRemain = HRTF_MODEL_N_SECTIONSsize(mod_hrf.WL{1},1) - numCol numIter;
		c_file_content = ...
		['#ifdef FIX_POINT_HRTF_FILE_FORMAT' newline ...
		['#ifdef FIX_1123_TDREN_16BIT_ROM' newline ...
		'const int16_t defaultHRIR_rom_E' num2str(fs/1000) '_Q = ' num2str( Q_EL) ';' newline ...
		'const int32_t defaultHRIR_rom_EL' num2str(fs/1000) '[HRTF_MODEL_N_SECTIONS * ' int2str(size(mod_hrf.WL{1}, 1)) '] = {' newline ];
		fprintf(fileID_c,'%s', c_file_content);
		@@ -870,7 +870,7 @@ for fs = [48000 32000 16000]
		numRemain = HRTF_MODEL_N_SECTIONSsize(mod_hrf.WL{1},1) - numCol numIter;

		c_file_content = ...
		['#ifdef FIX_POINT_HRTF_FILE_FORMAT' newline ...
		['#ifdef FIX_1123_TDREN_16BIT_ROM' newline ...
		'const int32_t defaultHRIR_rom_ER' num2str(fs/1000) '[HRTF_MODEL_N_SECTIONS * ' int2str(size(mod_hrf.WL{1}, 1)) '] = {' newline ];
		fprintf(fileID_c,'%s', c_file_content);
		for ind = 1: numIter
		@@ -964,7 +964,7 @@ for fs = [48000 32000 16000]
		numIter = floor(length(mod_itd.W)/numCol);
		numRemain = length(mod_itd.W) - numCol * numIter;
		c_file_content = ...
		['#ifdef FIX_POINT_HRTF_FILE_FORMAT' newline ...
		['#ifdef FIX_1123_TDREN_16BIT_ROM' newline ...
		'const int16_t defaultHRIR_rom_ITD_W_Q = ' num2str(Q_itd_W) ';' newline ...
		'const int16_t defaultHRIR_rom_ITD_W[' num2str(length(mod_itd.W)) '] = {' newline ];
		fprintf(fileID_c,'%s', c_file_content);
		@@ -1072,7 +1072,7 @@ for fs = [48000 32000 16000]
		numIter = floor(length(azimSplineShapeITD_all)/numCol);
		numRemain = length(azimSplineShapeITD_all) - numCol * numIter;
		c_file_content = ...
		['#ifdef FIX_POINT_HRTF_FILE_FORMAT' newline ...
		['#ifdef FIX_1123_TDREN_16BIT_ROM' newline ...
		'const int16_t defaultHRIR_rom_ITD_azimBsShape_Q = ' num2str(Q_azimSplineShapeITD_all) ';' newline ...
		'const int16_t defaultHRIR_rom_ITD_azimBsShape[' num2str(length(azimSplineShapeITD_all)) '] = {' newline ];
		fprintf(fileID_c,'%s', c_file_content);
		@@ -1121,7 +1121,7 @@ for fs = [48000 32000 16000]
		arr_str_fx(end) = ' ';
		arr_str_fx = replace(arr_str_fx,' ', ', ');
		c_file_content = ...
		['#ifdef FIX_POINT_HRTF_FILE_FORMAT' newline ...
		['#ifdef FIX_1123_TDREN_16BIT_ROM' newline ...
		'const int16_t defaultHRIR_rom_ITD_azimKSeq_Q = ' num2str(Q_itd_azimKSeq) ';' newline ...
		'const int16_t defaultHRIR_rom_ITD_azimKSeq[' num2str(length(mod_itd.azimKSeq{2})) '] = {' newline ...
		arr_str_fx ...
		@@ -1139,7 +1139,7 @@ for fs = [48000 32000 16000]
		numIter = floor(length(elevSplineShapeITD_all)/numCol);
		numRemain = length(elevSplineShapeITD_all) - numCol * numIter;
		c_file_content = ...
		['#ifdef FIX_POINT_HRTF_FILE_FORMAT' newline ...
		['#ifdef FIX_1123_TDREN_16BIT_ROM' newline ...
		'const int16_t defaultHRIR_rom_ITD_elevBsShape_Q = ' num2str(Q_elevSplineShapeITD_all) ';' newline ...
		'const int16_t defaultHRIR_rom_ITD_elevBsShape[' num2str(length(elevSplineShapeITD_all)) '] = {' newline ];
		fprintf(fileID_c,'%s', c_file_content);
		@@ -1188,7 +1188,7 @@ for fs = [48000 32000 16000]
		arr_str_fx(end) = ' ';
		arr_str_fx = replace(arr_str_fx,' ', ', ');
		c_file_content = ...
		['#ifdef FIX_POINT_HRTF_FILE_FORMAT' newline ...
		['#ifdef FIX_1123_TDREN_16BIT_ROM' newline ...
		'const int16_t defaultHRIR_rom_ITD_elevKSeq_Q = ' num2str(Q_elevKSeq_itd) ';' newline ...
		'const int16_t defaultHRIR_rom_ITD_elevKSeq[' num2str(length(mod_itd.elevKSeq)) '] = {' newline ...
		arr_str_fx ...
		@@ -1216,7 +1216,7 @@ end % fs loop

		if dataSpec.genRomFile
		h_file_content = string(join({''
		'#ifdef FIX_POINT_HRTF_FILE_FORMAT'
		'#ifdef FIX_1123_TDREN_16BIT_ROM'
		['extern const int16_t defaultHRIR_rom_elevBsLen[' int2str(length(len_e)) '];']
		['extern const int16_t defaultHRIR_rom_elevBsStart[' int2str(length(start_e)) '];']
		'extern const int16_t defaultHRIR_rom_elevBsShape_Q;'

scripts/td_object_renderer/modeling_tool/preprocessing/data_SOFA.m

+1 −1

File changed.

Contains only whitespace changes.