Add switches to remaining parts. (8b42fbf0) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/ivas_cnst.h

+6 −0

Original line number	Diff line number	Diff line
		@@ -1587,19 +1587,25 @@ typedef enum
		#define RV_FILTER_MAX_HISTORY ( 512 - 160 ) /* for longest history */
		#define RV_LENGTH_NR_FC ( RV_FILTER_MAX_FFT_SIZE / 2 ) + 1
		#define RV_LENGTH_NR_FC_16KHZ ( RV_FILTER_MAX_FFT_SIZE / 4 ) + 1
		#ifdef FIX_1318_ROOM_SIZE_CMD_LINE
		#define IVAS_REVERB_DEFAULT_L_N_BANDS 31
		#define IVAS_REVERB_DEFAULT_M_N_BANDS 31
		#define IVAS_REVERB_DEFAULT_S_N_BANDS 60
		#else
		#define IVAS_REVERB_DEFAULT_N_BANDS 31
		#endif

		#define LR_IAC_LENGTH_NR_FC ( RV_LENGTH_NR_FC )
		#define LR_IAC_LENGTH_NR_FC_16KHZ ( RV_LENGTH_NR_FC_16KHZ )

		#ifdef FIX_1318_ROOM_SIZE_CMD_LINE
		typedef enum
		{
		DEFAULT_REVERB_SMALL,
		DEFAULT_REVERB_MEDIUM,
		DEFAULT_REVERB_LARGE
		} IVAS_DefaultReverbSize;
		#endif

		/----------------------------------------------------------------------------------
		* FB mixer constants

lib_dec/ivas_init_dec.c

+9 −28

Original line number	Diff line number	Diff line
		@@ -1381,9 +1381,15 @@ ivas_error ivas_init_decoder(
		}
		}

		#ifdef FIX_1318_ROOM_SIZE_CMD_LINE
		/--------------------------------------------------------------------------
		* Allocate and initialize HRTF Statistics handle, get default reverb values
		--------------------------------------------------------------------------/
		#else
		/--------------------------------------------------------------------
		* Allocate and initialize HRTF Statistics handle
		--------------------------------------------------------------------/
		#endif

		if ( st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )
		{
		@@ -1392,12 +1398,11 @@ ivas_error ivas_init_decoder(
		{
		return error;
		}

		#ifdef FIX_1318_ROOM_SIZE_CMD_LINE
		/* Get default reverb values based on format, if custom values were not given */
		if ( st_ivas->hDecoderConfig->Opt_RendConfigCustom == 0 )
		{
		IVAS_DefaultReverbSize defaultReverbSize;
		#ifdef FIX_1318_ROOM_SIZE_CMD_LINE
		switch ( st_ivas->hDecoderConfig->Opt_RoomSize )
		{
		case IVAS_ROOM_SIZE_AUTO:
		@@ -1436,36 +1441,12 @@ ivas_error ivas_init_decoder(
		defaultReverbSize = DEFAULT_REVERB_LARGE;
		break;
		}
		#else
		switch ( st_ivas->ivas_format )
		{
		case ISM_FORMAT:
		defaultReverbSize = DEFAULT_REVERB_MEDIUM;
		break;
		case SBA_FORMAT:
		defaultReverbSize = DEFAULT_REVERB_SMALL;
		break;
		case MASA_FORMAT:
		defaultReverbSize = DEFAULT_REVERB_SMALL;
		break;
		case MC_FORMAT:
		defaultReverbSize = DEFAULT_REVERB_MEDIUM;
		break;
		case MASA_ISM_FORMAT:
		defaultReverbSize = DEFAULT_REVERB_MEDIUM;
		break;
		case SBA_ISM_FORMAT:
		defaultReverbSize = DEFAULT_REVERB_MEDIUM;
		break;
		default:
		defaultReverbSize = DEFAULT_REVERB_LARGE;
		}
		#endif
		if ( ( error = ivas_render_config_change_defaults( st_ivas->hRenderConfig, defaultReverbSize ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		}
		#endif
		}

		/-----------------------------------------------------------------

lib_rend/ivas_prot_rend.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -1343,11 +1343,13 @@ ivas_error ivas_render_config_init_from_rom(
		RENDER_CONFIG_HANDLE hRenderConfig / i/o: Renderer config handle */
		);

		#ifdef FIX_1318_ROOM_SIZE_CMD_LINE
		ivas_error ivas_render_config_change_defaults(
		RENDER_CONFIG_HANDLE hRenderConfig, /* i/o: Renderer config handle */
		IVAS_DefaultReverbSize reverbDefault /* i: Reverb default size */
		);

		#endif

		/----------------------------------------------------------------------------------
		* Quaternion operations

lib_rend/ivas_render_config.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -45,6 +45,7 @@
		* Local constants
		-----------------------------------------------------------------------/

		#ifdef FIX_1318_ROOM_SIZE_CMD_LINE
		#define IVAS_REVERB_DEFAULT_L_PRE_DELAY 0.016f
		#define IVAS_REVERB_DEFAULT_L_INPUT_DELAY 0.1f

		@@ -53,6 +54,7 @@

		#define IVAS_REVERB_DEFAULT_M_PRE_DELAY 0.0125f
		#define IVAS_REVERB_DEFAULT_M_INPUT_DELAY 0.0f
		#endif

		#define IVAS_REVERB_DEFAULT_USE_ER 0

		@@ -119,17 +121,21 @@ ivas_error ivas_render_config_init_from_rom(
		#ifdef DEBUGGING
		( *hRenderConfig )->renderer_type_override = IVAS_RENDER_TYPE_OVERRIDE_NONE;
		#endif
		#ifdef FIX_1318_ROOM_SIZE_CMD_LINE
		( *hRenderConfig )->roomAcoustics.nBands = IVAS_REVERB_DEFAULT_L_N_BANDS;
		( *hRenderConfig )->roomAcoustics.acousticPreDelay = IVAS_REVERB_DEFAULT_L_PRE_DELAY;
		( *hRenderConfig )->roomAcoustics.inputPreDelay = IVAS_REVERB_DEFAULT_L_INPUT_DELAY;
		#endif
		( *hRenderConfig )->roomAcoustics.use_er = IVAS_REVERB_DEFAULT_USE_ER;
		set_zero( &( *hRenderConfig )->roomAcoustics.pFc_input[0], CLDFB_NO_CHANNELS_MAX );
		set_zero( &( *hRenderConfig )->roomAcoustics.pAcoustic_rt60[0], CLDFB_NO_CHANNELS_MAX );
		set_zero( &( *hRenderConfig )->roomAcoustics.pAcoustic_dsr[0], CLDFB_NO_CHANNELS_MAX );

		#ifdef FIX_1318_ROOM_SIZE_CMD_LINE
		mvr2r( ivas_reverb_default_large_fc, ( *hRenderConfig )->roomAcoustics.pFc_input, IVAS_REVERB_DEFAULT_L_N_BANDS );
		mvr2r( ivas_reverb_default_large_RT60, ( *hRenderConfig )->roomAcoustics.pAcoustic_rt60, IVAS_REVERB_DEFAULT_L_N_BANDS );
		mvr2r( ivas_reverb_default_large_DSR, ( *hRenderConfig )->roomAcoustics.pAcoustic_dsr, IVAS_REVERB_DEFAULT_L_N_BANDS );
		#endif

		for ( i = 0; i < MAX_NUM_OBJECTS; i++ )
		{
		@@ -157,6 +163,7 @@ ivas_error ivas_render_config_init_from_rom(
		return IVAS_ERR_OK;
		}

		#ifdef FIX_1318_ROOM_SIZE_CMD_LINE

		/-------------------------------------------------------------------
		* ivas_render_config_change_defaults()
		@@ -216,3 +223,4 @@ ivas_error ivas_render_config_change_defaults(

		return IVAS_ERR_OK;
		}
		#endif

lib_rend/ivas_rom_rend.c

+14 −0

Original line number	Diff line number	Diff line
		@@ -346,6 +346,7 @@ const float t_design_11_elevation[70] =
		* Reverberator ROM tables
		-----------------------------------------------------------------------/

		#ifdef FIX_1318_ROOM_SIZE_CMD_LINE
		const float ivas_reverb_default_small_fc[IVAS_REVERB_DEFAULT_S_N_BANDS] =
		{
		200.0f, 600.0f, 1000.0f, 1400.0f, 1800.0f, 2200.0f, 2600.0f, 3000.0f, 3400.0f, 3800.0f,
		@@ -411,8 +412,13 @@ const float ivas_reverb_default_medium_DSR[IVAS_REVERB_DEFAULT_M_N_BANDS] =
		1.271521e-05f, 6.951610e-06f, 6.154952e-06f, 1.181682e-05f,
		7.084896e-06f, 3.571991e-06f, 2.210372e-06f
		};
		#endif

		#ifdef FIX_1318_ROOM_SIZE_CMD_LINE
		const float ivas_reverb_default_large_fc[IVAS_REVERB_DEFAULT_L_N_BANDS] =
		#else
		const float ivas_reverb_default_fc[IVAS_REVERB_DEFAULT_N_BANDS] =
		#endif
		{
		20.0f, 25.0f, 31.5f, 40.0f,
		50.0f, 63.0f, 80.0f, 100.0f,
		@@ -424,7 +430,11 @@ const float ivas_reverb_default_large_fc[IVAS_REVERB_DEFAULT_L_N_BANDS] =
		12500.0f, 16000.0f, 20000.0f
		};

		#ifdef FIX_1318_ROOM_SIZE_CMD_LINE
		const float ivas_reverb_default_large_RT60[IVAS_REVERB_DEFAULT_L_N_BANDS] =
		#else
		const float ivas_reverb_default_RT60[IVAS_REVERB_DEFAULT_N_BANDS] =
		#endif
		{
		1.3622f, 1.4486f, 1.3168f, 1.5787f,
		1.4766f, 1.3954f, 1.2889f, 1.3462f,
		@@ -436,7 +446,11 @@ const float ivas_reverb_default_large_RT60[IVAS_REVERB_DEFAULT_L_N_BANDS] =
		0.71945f, 0.61682f, 0.60031f
		};

		#ifdef FIX_1318_ROOM_SIZE_CMD_LINE
		const float ivas_reverb_default_large_DSR[IVAS_REVERB_DEFAULT_L_N_BANDS] =
		#else
		const float ivas_reverb_default_DSR[IVAS_REVERB_DEFAULT_N_BANDS] =
		#endif
		{
		1.8811e-08f, 2.1428e-08f, 1.3972e-08f, 1.51e-08f,
		1.287e-08f, 1.8747e-08f, 2.413e-08f, 3.9927e-08f,