port FIX_1052_EXT_OUTPUT (41e89d4b) · Commits · SA4 / Audio / IVAS BASOP

lib_com/options.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -210,6 +210,8 @@
		#define FIX_998_UNUSED_FUNCTION /* FhG: issue 998: delete unused funtion ivas_dirac_dec_get_response_split_order */
		#define NONBE_FIX_1014_1015_1016_OSBA_JBM_STEREO /* FhG: issues #1014, #1015, #1016: fix tc buffer info update in the discrete ism renderer */
		#define NONBE_FIX_987_PARAMC_BINAURAL_REVERB_RENDERING /* FhG: issue 987: solution b: downmix HOA3 to stereo a input for the reverberator */
		#define FIX_1052_EXT_OUTPUT /* VA: issue 1052: define EXT decoder output configuration for stereo and MC formats */


		/* #################### End BASOP porting switches ############################ */

lib_dec/ivas_init_dec.c

+36 −4

Original line number	Diff line number	Diff line
		@@ -1059,7 +1059,19 @@ ivas_error ivas_init_decoder(

		if ( output_config == IVAS_AUDIO_CONFIG_EXTERNAL )
		{
		#ifdef FIX_1052_EXT_OUTPUT
		if ( st_ivas->ivas_format == STEREO_FORMAT )
		{
		hDecoderConfig->nchan_out = CPE_CHANNELS;
		}
		else if ( st_ivas->ivas_format == MC_FORMAT )
		{
		hDecoderConfig->nchan_out = audioCfg2channels( st_ivas->transport_config );
		}
		else if ( st_ivas->ivas_format == SBA_ISM_FORMAT )
		#else
		if ( st_ivas->ivas_format == SBA_ISM_FORMAT )
		#endif
		{
		hDecoderConfig->nchan_out = audioCfg2channels( IVAS_AUDIO_CONFIG_HOA3 );
		hDecoderConfig->nchan_out += st_ivas->nchan_ism;
		@@ -1082,7 +1094,19 @@ ivas_error ivas_init_decoder(

		st_ivas->intern_config = output_config;

		#ifdef FIX_1052_EXT_OUTPUT
		if ( output_config == IVAS_AUDIO_CONFIG_EXTERNAL && st_ivas->ivas_format == MC_FORMAT )
		{
		ivas_output_init( &( st_ivas->hOutSetup ), st_ivas->transport_config );
		st_ivas->intern_config = st_ivas->transport_config;
		}
		else
		{
		ivas_output_init( &( st_ivas->hOutSetup ), output_config );
		}
		#else
		ivas_output_init( &( st_ivas->hOutSetup ), output_config );
		#endif

		if ( st_ivas->ivas_format == SBA_ISM_FORMAT && output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR )
		{
		@@ -2920,11 +2944,18 @@ static ivas_error doSanityChecks_IVAS(
		/* Verify stereo output configuration */
		if ( st_ivas->ivas_format == STEREO_FORMAT )
		{
		#ifdef FIX_1052_EXT_OUTPUT
		if ( output_config != IVAS_AUDIO_CONFIG_MONO && output_config != IVAS_AUDIO_CONFIG_STEREO && output_config != IVAS_AUDIO_CONFIG_5_1 && output_config != IVAS_AUDIO_CONFIG_7_1 && output_config != IVAS_AUDIO_CONFIG_5_1_2 && output_config != IVAS_AUDIO_CONFIG_5_1_4 && output_config != IVAS_AUDIO_CONFIG_7_1_4 && output_config != IVAS_AUDIO_CONFIG_LS_CUSTOM && output_config != IVAS_AUDIO_CONFIG_EXTERNAL )
		#else
		if ( output_config != IVAS_AUDIO_CONFIG_MONO && output_config != IVAS_AUDIO_CONFIG_STEREO && output_config != IVAS_AUDIO_CONFIG_5_1 && output_config != IVAS_AUDIO_CONFIG_7_1 && output_config != IVAS_AUDIO_CONFIG_5_1_2 && output_config != IVAS_AUDIO_CONFIG_5_1_4 && output_config != IVAS_AUDIO_CONFIG_7_1_4 && output_config != IVAS_AUDIO_CONFIG_LS_CUSTOM )
		#endif
		{
		return IVAS_ERROR( IVAS_ERR_INVALID_OUTPUT_FORMAT, "Wrong output configuration specified for Stereo!" );
		}
		}
		#ifdef FIX_1052_EXT_OUTPUT
		if ( output_config != IVAS_AUDIO_CONFIG_MONO && output_config != IVAS_AUDIO_CONFIG_STEREO && output_config != IVAS_AUDIO_CONFIG_5_1 && output_config != IVAS_AUDIO_CONFIG_7_1 && output_config != IVAS_AUDIO_CONFIG_5_1_2 && output_config != IVAS_AUDIO_CONFIG_5_1_4 && output_config != IVAS_AUDIO_CONFIG_7_1_4 && output_config != IVAS_AUDIO_CONFIG_LS_CUSTOM && output_config != IVAS_AUDIO_CONFIG_EXTERNAL )
		#else
		else if ( st_ivas->ivas_format == ISM_FORMAT )
		{
		/* Verify ISM output configuration */
		@@ -2956,6 +2987,7 @@ static ivas_error doSanityChecks_IVAS(
		return IVAS_ERROR( IVAS_ERR_INVALID_OUTPUT_FORMAT, "Incorrect output configuration specified for Multi-channel" );
		}
		}
		#endif

		if ( ( output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED \|\| output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) && output_Fs != 48000 )
		{

lib_dec/ivas_jbm_dec.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -660,7 +660,11 @@ ivas_error ivas_jbm_dec_tc(
		/* Delay the separated channel to sync with CLDFB delay of the DirAC synthesis, and synthesize the LFE signal. */
		if ( output_config == IVAS_AUDIO_CONFIG_5_1 \|\| output_config == IVAS_AUDIO_CONFIG_7_1 \|\|
		output_config == IVAS_AUDIO_CONFIG_5_1_4 \|\| output_config == IVAS_AUDIO_CONFIG_7_1_4 \|\|
		#ifdef FIX_1052_EXT_OUTPUT
		output_config == IVAS_AUDIO_CONFIG_5_1_2 \|\| ( output_config == IVAS_AUDIO_CONFIG_LS_CUSTOM && st_ivas->hOutSetup.num_lfe > 0 ) \|\| output_config == IVAS_AUDIO_CONFIG_EXTERNAL )
		#else
		output_config == IVAS_AUDIO_CONFIG_5_1_2 \|\| ( output_config == IVAS_AUDIO_CONFIG_LS_CUSTOM && st_ivas->hOutSetup.num_lfe > 0 ) )
		#endif
		{
		ivas_lfe_synth_with_filters( st_ivas->hMasa->hMasaLfeSynth, p_output, output_frame, n, LFE_CHANNEL );
		}

lib_dec/ivas_masa_dec.c

+20 −9

Original line number	Diff line number	Diff line
		@@ -388,10 +388,14 @@ ivas_error ivas_masa_decode(

		hMasa->config.coherencePresent = !hQMetaData->all_coherence_zero;

		#ifdef FIX_1052_EXT_OUTPUT
		if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_EXTERNAL && ( st_ivas->ivas_format == MASA_FORMAT \|\| st_ivas->ivas_format == MASA_ISM_FORMAT ) )
		#else
		if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_EXTERNAL )
		{
		index_16bits( hQMetaData, hMasa->data.sph_grid16 );
		}
		#endif

		/* If LBR mode is not disabled, then we restore metadata to 5 bands and 4 subframes based on the LBR mode. */
		if ( low_bitrate_mode != -1 )
		@@ -598,7 +602,11 @@ ivas_error ivas_masa_dec_open(
		hMasa->config.joinedSubframes = FALSE;

		/* Create spherical grid only for external output */
		#ifdef FIX_1052_EXT_OUTPUT
		if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_EXTERNAL && ( st_ivas->ivas_format == MASA_FORMAT \|\| st_ivas->ivas_format == MASA_ISM_FORMAT ) )
		#else
		if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_EXTERNAL )
		#endif
		{
		if ( ( hMasa->data.sph_grid16 = (SPHERICAL_GRID_DATA *) malloc( sizeof( SPHERICAL_GRID_DATA ) ) ) == NULL )
		{
		@@ -1024,6 +1032,9 @@ static ivas_error init_lfe_synth_data(
		( output_config == IVAS_AUDIO_CONFIG_5_1 \|\| output_config == IVAS_AUDIO_CONFIG_7_1 \|\|
		output_config == IVAS_AUDIO_CONFIG_5_1_2 \|\|
		output_config == IVAS_AUDIO_CONFIG_5_1_4 \|\| output_config == IVAS_AUDIO_CONFIG_7_1_4 \|\|
		#ifdef FIX_1052_EXT_OUTPUT
		output_config == IVAS_AUDIO_CONFIG_EXTERNAL \|\|
		#endif
		output_config == IVAS_AUDIO_CONFIG_FOA \|\| output_config == IVAS_AUDIO_CONFIG_HOA2 \|\|
		output_config == IVAS_AUDIO_CONFIG_HOA3 \|\|
		( output_config == IVAS_AUDIO_CONFIG_LS_CUSTOM && st_ivas->hOutSetup.num_lfe > 0 ) ) )

lib_dec/ivas_mc_param_dec.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -150,7 +150,11 @@ ivas_error ivas_param_mc_dec_open(
		hParamMC->hoa_encoder = NULL;

		/* determine the synthesis config */
		#ifdef FIX_1052_EXT_OUTPUT
		if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC \|\| st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV \|\| st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM \|\| st_ivas->renderer_type == RENDERER_BINAURAL_OBJECTS_TD \|\| st_ivas->transport_config == output_config \|\| output_config == IVAS_AUDIO_CONFIG_EXTERNAL )
		#else
		if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC \|\| st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV \|\| st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM \|\| st_ivas->renderer_type == RENDERER_BINAURAL_OBJECTS_TD \|\| st_ivas->transport_config == output_config )
		#endif
		{
		hParamMC->synthesis_conf = PARAM_MC_SYNTH_DIRECT;
		}