fix warning and ceil to ceilf (aee1a028) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_rend/ivas_objectRenderer_mix.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -524,7 +524,7 @@ static ivas_error DefaultBSplineModel(
		model->EL = (const float *) defaultHRIR_rom_EL32;
		model->ER = (const float *) defaultHRIR_rom_ER32;
		#ifdef FIX_989_TD_REND_ROM
		model->K = (int16_t) ceil( RESAMPLE_FACTOR_32_48 * defaultHRIR_rom_model_configuration[5] );
		model->K = (int16_t) ceilf( RESAMPLE_FACTOR_32_48 * defaultHRIR_rom_model_configuration[5] );
		#else
		model->K = 86;
		#endif

lib_util/hrtf_file_reader.c

+30 −30

Original line number	Diff line number	Diff line
		@@ -432,10 +432,10 @@ static void LoadBSplineBinaryITD_fx(
		modelITD->elevBsShape = (const float *) modelITD->elevBsShape_dyn;
		#ifdef FIX_TDREND_HRTF_FILE_FORMAT_OR
		#ifdef FIX_989_TD_REND_ROM
		modelITD->azimBsLen = (const int16_t *) modelITD->azimBsLen_dyn;
		modelITD->azimBsStart = (const int16_t *) modelITD->azimBsStart_dyn;
		modelITD->elevBsLen = (const int16_t *) modelITD->elevBsLen_dyn;
		modelITD->elevBsStart = (const int16_t *) modelITD->elevBsStart_dyn;
		modelITD->azimBsLen = modelITD->azimBsLen_dyn;
		modelITD->azimBsStart = modelITD->azimBsStart_dyn;
		modelITD->elevBsLen = modelITD->elevBsLen_dyn;
		modelITD->elevBsStart = modelITD->elevBsStart_dyn;
		#endif
		#endif

		@@ -520,10 +520,10 @@ static void LoadBSplineBinaryITD(
		modelITD->azimBsShape = (const float *) modelITD->azimBsShape_dyn;
		modelITD->elevBsShape = (const float *) modelITD->elevBsShape_dyn;
		#ifdef FIX_989_TD_REND_ROM
		modelITD->azimBsLen = (const int16_t *) modelITD->azimBsLen_dyn;
		modelITD->azimBsStart = (const int16_t *) modelITD->azimBsStart_dyn;
		modelITD->elevBsLen = (const int16_t *) modelITD->elevBsLen_dyn;
		modelITD->elevBsStart = (const int16_t *) modelITD->elevBsStart_dyn;
		modelITD->azimBsLen = modelITD->azimBsLen_dyn;
		modelITD->azimBsStart = modelITD->azimBsStart_dyn;
		modelITD->elevBsLen = modelITD->elevBsLen_dyn;
		modelITD->elevBsStart = modelITD->elevBsStart_dyn;
		#endif

		return;

scripts/td_object_renderer/modeling_tool/Gen_Hrf_IVAS_Binary.m

+8 −8

Original line number	Diff line number	Diff line
		@@ -941,7 +941,7 @@ for fs = [48000 32000 16000]
		arr_str = replace(arr_str, ";",',');
		arr_str = replace(arr_str, " ",', ');
		c_file_content = ...
		['const int16_t defaultHRIR_rom_ITD_elevBsLen[' num2str(length(len_e_ITD)) '] = {' newline ...
		['int16_t defaultHRIR_rom_ITD_elevBsLen[' num2str(length(len_e_ITD)) '] = {' newline ...
		arr_str ...
		newline '};' newline ...
		];
		@@ -953,7 +953,7 @@ for fs = [48000 32000 16000]
		arr_str = replace(arr_str, ";",',');
		arr_str = replace(arr_str, " ",', ');
		c_file_content = ...
		['const int16_t defaultHRIR_rom_ITD_elevBsStart[' num2str(length(start_e_ITD)) '] = {' newline ...
		['int16_t defaultHRIR_rom_ITD_elevBsStart[' num2str(length(start_e_ITD)) '] = {' newline ...
		arr_str ...
		newline '};' newline ...
		];
		@@ -965,7 +965,7 @@ for fs = [48000 32000 16000]
		arr_str = replace(arr_str, ";",',');
		arr_str = replace(arr_str, " ",', ');
		c_file_content = ...
		['const int16_t defaultHRIR_rom_ITD_azimBsLen[' num2str(length(len_a_ITD)) '] = {' newline ...
		['int16_t defaultHRIR_rom_ITD_azimBsLen[' num2str(length(len_a_ITD)) '] = {' newline ...
		arr_str ...
		newline '};' newline ...
		];
		@@ -977,7 +977,7 @@ for fs = [48000 32000 16000]
		arr_str = replace(arr_str, ";",',');
		arr_str = replace(arr_str, " ",', ');
		c_file_content = ...
		['const int16_t defaultHRIR_rom_ITD_azimBsStart[' num2str(length(start_a_ITD)) '] = {' newline ...
		['int16_t defaultHRIR_rom_ITD_azimBsStart[' num2str(length(start_a_ITD)) '] = {' newline ...
		arr_str ...
		newline '};' newline ...
		'#endif' newline ...
		@@ -1093,10 +1093,10 @@ if dataSpec.genRomFile
		'extern const float defaultHRIR_rom_ITD_elevKSeq[16];'
		'#ifdef FIX_989_TD_REND_ROM'
		'extern const int16_t defaultHRIR_rom_ITD_model_configuration[4];'
		['extern const int16_t defaultHRIR_rom_ITD_elevBsLen[' int2str(length(len_e_ITD)) '];']
		['extern const int16_t defaultHRIR_rom_ITD_elevBsStart[' int2str(length(start_e_ITD)) '];']
		['extern const int16_t defaultHRIR_rom_ITD_azimBsLen[' int2str(length(len_a_ITD)) '];']
		['extern const int16_t defaultHRIR_rom_ITD_azimBsStart[' int2str(length(start_a_ITD)) '];']
		['extern int16_t defaultHRIR_rom_ITD_elevBsLen[' int2str(length(len_e_ITD)) '];']
		['extern int16_t defaultHRIR_rom_ITD_elevBsStart[' int2str(length(start_e_ITD)) '];']
		['extern int16_t defaultHRIR_rom_ITD_azimBsLen[' int2str(length(len_a_ITD)) '];']
		['extern int16_t defaultHRIR_rom_ITD_azimBsStart[' int2str(length(start_a_ITD)) '];']
		'#endif'
		'#endif'
		''