cleaning (812b7d13) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/renderer.c

+12 −21

Original line number	Diff line number	Diff line
		@@ -935,22 +935,13 @@ int main(
		}

		#ifdef FIX_1227_Crend_HRTF_LOADING_OPTIM
		IVAS_AUDIO_CONFIG hrtf_set_audio_cfg = IVAS_AUDIO_CONFIG_BINAURAL;

		#if 1
		if ( ( error = load_Crend_HRTF_from_binary( *hHrtfCrend, hrtfFileReader, args.outConfig.audioConfig, args.inConfig.ambisonicsBuses->audioConfig != IVAS_AUDIO_CONFIG_INVALID && args.outConfig.audioConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR ? args.inConfig.ambisonicsBuses->audioConfig : IVAS_AUDIO_CONFIG_7_1_4, args.sampleRate ) ) != IVAS_ERR_OK )
		#else
		if ( args.inConfig.ambisonicsBuses->audioConfig == IVAS_AUDIO_CONFIG_FOA \|\| args.inConfig.ambisonicsBuses->audioConfig == IVAS_AUDIO_CONFIG_HOA2 \|\| args.inConfig.ambisonicsBuses->audioConfig == IVAS_AUDIO_CONFIG_HOA3 )
		IVAS_AUDIO_CONFIG hrtf_set_audio_cfg = IVAS_AUDIO_CONFIG_7_1_4;
		if ( args.inConfig.ambisonicsBuses->audioConfig != IVAS_AUDIO_CONFIG_INVALID && args.outConfig.audioConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR )
		{
		hrtf_set_audio_cfg = args.inConfig.ambisonicsBuses->audioConfig;
		}

		if ( args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR )
		{
		hrtf_set_audio_cfg = IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR;
		}
		#endif
		if ( ( error = load_Crend_HRTF_from_binary( *hHrtfCrend, hrtfFileReader, hrtf_set_audio_cfg, hrtf_set_audio_cfg, args.sampleRate ) ) != IVAS_ERR_OK )
		if ( ( error = load_Crend_HRTF_from_binary( *hHrtfCrend, hrtfFileReader, args.outConfig.audioConfig, hrtf_set_audio_cfg, args.sampleRate ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = create_SetOfHRTF_from_binary( *hSetOfHRTF, hrtfFileReader, args.sampleRate ) ) != IVAS_ERR_OK )
		#endif

lib_dec/lib_dec.c

+1 −40

Original line number	Diff line number	Diff line
		@@ -1042,50 +1042,11 @@ ivas_error IVAS_DEC_ReadFormat(
		#ifdef FIX_1227_Crend_HRTF_LOADING_OPTIM
		else if ( *binaural_renderer == IVAS_BIN_RENDERER_TYPE_CREND )
		{
		#if 1
		if ( st_ivas->ivas_format == ISM_FORMAT )
		if ( st_ivas->ivas_format == ISM_FORMAT \|\| ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCT ) )
		{
		/* BRIRs */
		*hrtf_set_audio_cfg = IVAS_AUDIO_CONFIG_7_1_4;
		}
		else if ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCT )
		{
		/* BRIRs */
		*hrtf_set_audio_cfg = IVAS_AUDIO_CONFIG_7_1_4;
		}
		#else
		if ( st_ivas->ivas_format == ISM_FORMAT )
		{
		if ( output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR )
		{
		/* BRIRs */
		*hrtf_set_audio_cfg = IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR;
		}
		}
		else if ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCT )
		{
		/* BRIRs */
		*hrtf_set_audio_cfg = IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR;

		if ( output_config == IVAS_AUDIO_CONFIG_BINAURAL \|\| output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )
		{
		/* HRIRs */
		*hrtf_set_audio_cfg = IVAS_AUDIO_CONFIG_BINAURAL;
		}

		if ( st_ivas->hDecoderConfig->Opt_Headrotation )
		{
		/* SHD transformed HRIRs for low complexity rotation */
		*hrtf_set_audio_cfg = IVAS_AUDIO_CONFIG_HOA3;

		if ( output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR )
		{
		/* BRIRs */
		*hrtf_set_audio_cfg = IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR;
		}
		}
		}
		#endif
		}
		#endif
		#else

lib_util/hrtf_file_reader.c

+30 −35

Original line number	Diff line number	Diff line
		@@ -2386,7 +2386,6 @@ ivas_error create_SetOfHRTF_from_binary(
		}

		#ifdef FIX_1227_Crend_HRTF_LOADING_OPTIM
		#if 1
		if ( ( hrtf_header.rend_type == HRTF_READER_RENDERER_BINAURAL_MIXER_CONV && /* HRIRs */
		( OutputConfig == IVAS_AUDIO_CONFIG_BINAURAL \|\| OutputConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) ) \|\|
		( hrtf_header.rend_type == HRTF_READER_RENDERER_BINAURAL_MIXER_CONV_ROOM && /* BRIRs */
		@@ -2397,21 +2396,12 @@ ivas_error create_SetOfHRTF_from_binary(
		}

		if ( load )
		#else
		if ( ( hrtf_header.rend_type == HRTF_READER_RENDERER_BINAURAL_MIXER_CONV && hrtf_header.input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_COMBINED && hrtf_set_audio_cfg == IVAS_AUDIO_CONFIG_BINAURAL ) \|\|
		( hrtf_header.rend_type == HRTF_READER_RENDERER_BINAURAL_MIXER_CONV_ROOM && hrtf_header.input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_COMBINED && hrtf_set_audio_cfg == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR ) \|\|
		( hrtf_header.rend_type == HRTF_READER_RENDERER_BINAURAL_MIXER_CONV && hrtf_header.input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_FOA && hrtf_set_audio_cfg == IVAS_AUDIO_CONFIG_FOA ) \|\|
		( hrtf_header.rend_type == HRTF_READER_RENDERER_BINAURAL_MIXER_CONV && hrtf_header.input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_HOA2 && hrtf_set_audio_cfg == IVAS_AUDIO_CONFIG_HOA2 ) \|\|
		( hrtf_header.rend_type == HRTF_READER_RENDERER_BINAURAL_MIXER_CONV && hrtf_header.input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_HOA3 && hrtf_set_audio_cfg == IVAS_AUDIO_CONFIG_HOA3 ) \|\|
		hrtf_set_audio_cfg == IVAS_AUDIO_CONFIG_EXTERNAL )
		#endif
		{
		#else
		hHRTF = NULL;
		#endif

		if ( hrtf_header.frequency == output_Fs )
		{
		#ifndef FIX_1227_Crend_HRTF_LOADING_OPTIM
		if ( hrtf_header.rend_type == HRTF_READER_RENDERER_BINAURAL_MIXER_CONV )
		{
		if ( hrtf_header.input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_COMBINED )
		@@ -2438,8 +2428,8 @@ ivas_error create_SetOfHRTF_from_binary(
		hHRTF = &( ( *hSetOfHRTF ).hHRTF_brir_combined );
		}
		}
		#endif
		}
		#endif

		if ( fread( hrtf_data, 1, hrtf_header.data_size, f_hrtf ) != hrtf_header.data_size )
		{
		@@ -2448,6 +2438,11 @@ ivas_error create_SetOfHRTF_from_binary(
		}

		#ifdef FIX_1227_Crend_HRTF_LOADING_OPTIM
		if ( hrtf_header.frequency != output_Fs )
		{
		return IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA;
		}

		if ( ( create_Crend_HRTF_from_rawdata( &hHrtfCrend, hrtf_data ) ) != IVAS_ERR_OK )
		{
		free( hrtf_data );