Commit 16e54356 authored Jan 07, 2025 by emerit

on going

parent 7427c2f6

lib_com/common_api_types.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -216,6 +216,7 @@ typedef struct _IVAS_JBM_TRACE_DATA

		} IVAS_JBM_TRACE_DATA;

		#ifdef FIX_POINT_HRTF_FILE_FORMAT
		typedef enum _ivas_binaural_renderer_type
		{
		IVAS_BIN_RENDERER_TYPE_NONE,
		@@ -226,6 +227,7 @@ typedef enum _ivas_binaural_renderer_type
		IVAS_BIN_RENDERER_TYPE_DEFAULT,

		} IVAS_BIN_RENDERER_TYPE;
		#endif

		/----------------------------------------------------------------------------------
		* Renderer API structures and enums

lib_com/ivas_cnst.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -1728,11 +1728,11 @@ typedef enum
		#define RV_FILTER_MAX_FFT_SIZE ( 512 )
		#define RV_FILTER_MAX_HISTORY ( 512 - 160 ) /* for longest history */
		#define RV_LENGTH_NR_FC ( RV_FILTER_MAX_FFT_SIZE / 2 ) + 1
		#ifdef FIX_POINT_CREND_HRTF_FILE_FORMAT
		#ifdef FIX_POINT_HRTF_FILE_FORMAT
		#define RV_LENGTH_NR_FC_16KHZ ( RV_FILTER_MAX_FFT_SIZE / 4 ) + 1
		#endif
		#define IVAS_REVERB_DEFAULT_N_BANDS 31
		#ifdef FIX_POINT_CREND_HRTF_FILE_FORMAT
		#ifdef FIX_POINT_HRTF_FILE_FORMAT
		#define LR_IAC_LENGTH_NR_FC ( RV_LENGTH_NR_FC )
		#define LR_IAC_LENGTH_NR_FC_16KHZ ( RV_LENGTH_NR_FC_16KHZ )
		#endif

lib_dec/ivas_binRenderer_internal.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1114,7 +1114,7 @@ ivas_error ivas_binRenderer_open_fx(
		test();
		IF( EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) && EQ_32( st_ivas->hIntSetup.output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )
		{
		#ifdef FIX_POINT_CREND_HRTF_FILE_FORMAT
		#ifdef FIX_POINT_HRTF_FILE_FORMAT
		IF( NE_32( error = ivas_binaural_reverb_init_fx( &( hBinRenderer->hReverb ), st_ivas->hHrtfStatistics, hBinRenderer->conv_band, hBinRenderer->timeSlots, &( st_ivas->hRenderConfig->roomAcoustics ), st_ivas->hDecoderConfig->output_Fs, st_ivas->hHrtfFastConv->fastconvReverberationTimes_fx, st_ivas->hHrtfFastConv->fastconvReverberationEneCorrections_fx ), IVAS_ERR_OK ) )
		#else
		IF( NE_32( ( error = ivas_binaural_reverb_open_fastconv_fx( &( hBinRenderer->hReverb ), hBinRenderer->conv_band, hBinRenderer->timeSlots, &( st_ivas->hRenderConfig->roomAcoustics ), st_ivas->hIntSetup.output_config, st_ivas->hDecoderConfig->output_Fs, st_ivas->hHrtfFastConv ) ), IVAS_ERR_OK ) )

lib_dec/ivas_ism_dec.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -214,7 +214,7 @@ static ivas_error ivas_ism_bitrate_switching_dec_fx(
		}
		IF( EQ_32( st_ivas->hIntSetup.output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )
		{
		#ifdef FIX_POINT_CREND_HRTF_FILE_FORMAT
		#ifdef FIX_POINT_HRTF_FILE_FORMAT
		IF( NE_32( ( error = ivas_reverb_open_fx( &st_ivas->hReverb, st_ivas->hHrtfStatistics, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ), IVAS_ERR_OK ) )
		#else
		IF( NE_32( ( error = ivas_reverb_open_fx( &st_ivas->hReverb, st_ivas->hDecoderConfig->output_config, NULL, st_ivas->hBinRendererTd->HrFiltSet_p->lr_energy_and_iac_fx, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ), IVAS_ERR_OK ) )
		@@ -241,7 +241,7 @@ static ivas_error ivas_ism_bitrate_switching_dec_fx(
		ivas_dirac_dec_close_binaural_data( &st_ivas->hDiracDecBin );

		/* Open Crend Binaural renderer */
		#ifdef FIX_POINT_CREND_HRTF_FILE_FORMAT
		#ifdef FIX_POINT_HRTF_FILE_FORMAT
		IF( NE_32( ( error = ivas_rend_openCrend( &( st_ivas->hCrendWrapper ), st_ivas->intern_config, st_ivas->hOutSetup.output_config, st_ivas->hRenderConfig, st_ivas->hHrtfCrend, st_ivas->hHrtfStatistics, st_ivas->hDecoderConfig->output_Fs, 0 ) ), IVAS_ERR_OK ) )
		#else
		IF( NE_32( ( error = ivas_rend_openCrend( &( st_ivas->hCrendWrapper ), st_ivas->intern_config, st_ivas->hOutSetup.output_config, st_ivas->hRenderConfig, st_ivas->hSetOfHRTF, st_ivas->hDecoderConfig->output_Fs ) ), IVAS_ERR_OK ) )

lib_dec/ivas_mct_dec.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1532,7 +1532,7 @@ static ivas_error ivas_mc_dec_reconfig_fx(
		}
		ELSE IF( st_ivas->hCrendWrapper == NULL && ( EQ_16( st_ivas->renderer_type, RENDERER_BINAURAL_MIXER_CONV ) \|\| EQ_16( st_ivas->renderer_type, RENDERER_BINAURAL_MIXER_CONV_ROOM ) ) )
		{
		#ifdef FIX_POINT_CREND_HRTF_FILE_FORMAT
		#ifdef FIX_POINT_HRTF_FILE_FORMAT
		IF( NE_32( ( error = ivas_rend_openCrend( &( st_ivas->hCrendWrapper ), st_ivas->intern_config, st_ivas->hOutSetup.output_config, st_ivas->hRenderConfig, st_ivas->hHrtfCrend, st_ivas->hHrtfStatistics, st_ivas->hDecoderConfig->output_Fs, 0 ) ), IVAS_ERR_OK ) )
		#else
		IF( ( error = ivas_rend_openCrend( &( st_ivas->hCrendWrapper ), st_ivas->intern_config, st_ivas->hDecoderConfig->output_config, st_ivas->hRenderConfig, st_ivas->hSetOfHRTF, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )