accept NONBE_FIX_802_PARAMUPMIX_HIGHPASS (1545e20e) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -171,7 +171,6 @@


		#define NONBE_FIX_787_PARAM_UPMIX_LEVEL /* Dlb: issue 787: fix level of Mono/Stereo for ParamUpmix mode */
		#define NONBE_FIX_802_PARAMUPMIX_HIGHPASS /* Dlb: issue 802: Move HighPass filter operation for ParamUpmix */
		#define NONBE_FIX_775_OSBA_BR_SWITCHING_CRASH /* FhG: issue 775: fix crash in OSBA with bitrate switching and output order lower than input order */
		#define NONBE_FIX_827_JBM_CREND_EARLY_REFLECTIONS /* FhG: issue #827: Resolve "JBM Crend early reflections are wrong" */
		#define NONBE_FIX_833_OSBA_JBM_OBJECT_GAINS /* Fhg: issue #833: Resolve "JBM OSBA: the gains for the discrete objects are not computed" */

lib_dec/ivas_dec.c

+4 −15

Original line number	Diff line number	Diff line
		@@ -860,20 +860,8 @@ ivas_error ivas_dec(
		{
		return error;
		}
		#ifdef NONBE_FIX_802_PARAMUPMIX_HIGHPASS
		for ( n = 0; n < st_ivas->nchan_transport; n++ )
		{
		if ( n != LFE_CHANNEL )
		{
		hp20( p_output[n], output_frame, st_ivas->mem_hp20_out[n], output_Fs );
		}
		}
		#endif
		ivas_mc_paramupmix_dec( st_ivas, p_output );
		#ifndef NONBE_FIX_802_PARAMUPMIX_HIGHPASS

		/* HP filtering */
		if ( st_ivas->renderer_type != RENDERER_BINAURAL_FASTCONV && st_ivas->renderer_type != RENDERER_BINAURAL_FASTCONV_ROOM )
		{
		for ( n = 0; n < st_ivas->nchan_transport; n++ )
		{
		if ( n != LFE_CHANNEL )
		@@ -881,8 +869,9 @@ ivas_error ivas_dec(
		hp20( p_output[n], output_frame, st_ivas->mem_hp20_out[n], output_Fs );
		}
		}
		}
		#endif

		ivas_mc_paramupmix_dec( st_ivas, p_output );

		if ( st_ivas->transport_config != st_ivas->intern_config && ( st_ivas->intern_config == IVAS_AUDIO_CONFIG_FOA \|\| st_ivas->intern_config == IVAS_AUDIO_CONFIG_HOA2 \|\| st_ivas->intern_config == IVAS_AUDIO_CONFIG_HOA3 ) )
		{
		ivas_mc2sba( st_ivas->hTransSetup, p_output, p_output, output_frame, st_ivas->hIntSetup.ambisonics_order, GAIN_LFE );

lib_dec/ivas_jbm_dec.c

+0 −35

Original line number	Diff line number	Diff line
		@@ -578,7 +578,6 @@ ivas_error ivas_jbm_dec_tc(
		return error;
		}

		#ifdef NONBE_FIX_802_PARAMUPMIX_HIGHPASS
		/* HP filtering */
		for ( n = 0; n < st_ivas->nchan_transport; n++ )
		{
		@@ -603,24 +602,6 @@ ivas_error ivas_jbm_dec_tc(
		ivas_ls_setup_conversion( st_ivas, audioCfg2channels( IVAS_AUDIO_CONFIG_5_1_2 ), output_frame, p_output, p_output );
		}
		}
		#else
		/* Rendering */
		if ( st_ivas->renderer_type == RENDERER_MC )
		{
		if ( output_config == IVAS_AUDIO_CONFIG_MONO \|\| output_config == IVAS_AUDIO_CONFIG_STEREO )
		{
		/* HP filtering */
		for ( n = 0; n < st_ivas->nchan_transport; n++ )
		{
		if ( n != LFE_CHANNEL )
		{
		hp20( p_output[n], output_frame, st_ivas->mem_hp20_out[n], output_Fs );
		}
		}
		ivas_ls_setup_conversion( st_ivas, audioCfg2channels( IVAS_AUDIO_CONFIG_5_1_2 ), output_frame, p_output, p_output );
		}
		}
		#endif
		}
		else if ( st_ivas->mc_mode == MC_MODE_PARAMMC )
		{
		@@ -1326,22 +1307,6 @@ ivas_error ivas_jbm_dec_render(
		{
		ivas_mc_paramupmix_dec_render( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, p_tc, p_output );

		#ifndef NONBE_FIX_802_PARAMUPMIX_HIGHPASS
		/* HP filtering */
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		/no HPF when rendering is already done/
		if ( st_ivas->renderer_type != RENDERER_BINAURAL_FASTCONV && st_ivas->renderer_type != RENDERER_BINAURAL_FASTCONV_ROOM )
		#endif
		{
		for ( n = 0; n < st_ivas->nchan_transport; n++ )
		{
		if ( n != LFE_CHANNEL )
		{
		hp20( p_output[n], *nSamplesRendered, st_ivas->mem_hp20_out[n], output_Fs );
		}
		}
		}
		#endif
		if ( st_ivas->transport_config != st_ivas->intern_config && ( st_ivas->intern_config == IVAS_AUDIO_CONFIG_FOA \|\| st_ivas->intern_config == IVAS_AUDIO_CONFIG_HOA2 \|\| st_ivas->intern_config == IVAS_AUDIO_CONFIG_HOA3 ) )
		{
		ivas_mc2sba( st_ivas->hTransSetup, p_output, p_output, *nSamplesRendered, st_ivas->hIntSetup.ambisonics_order, GAIN_LFE );