Merge remote-tracking branch 'remotes/origin/main' into ericsson/low-rate-encoding-of-transients (e73bfcb3) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/ivas_prot.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -3119,10 +3119,11 @@ int16_t ivas_sba_get_analysis_order(
		const int16_t sba_order /* i : Ambisonic (SBA) order */
		);

		#ifndef SBA_DIRAC_RENDERER_TYPE_CLEANUP
		int16_t ivas_sba_get_order_transport(
		const int16_t nchan_transport /* i : Number of transport channels */
		);

		#endif
		/! r: number of Ambisonic channels /
		int16_t ivas_sba_get_nchan(
		const int16_t sba_order, /* i : Ambisonic (SBA) order */

+2 −2

Original line number	Diff line number	Diff line
		@@ -246,7 +246,7 @@ int16_t ivas_sba_get_analysis_order(
		return sba_analysis_order;
		}


		#ifndef SBA_DIRAC_RENDERER_TYPE_CLEANUP
		/-------------------------------------------------------------------
		* ivas_sba_get_order_transport()
		*
		@@ -272,7 +272,7 @@ int16_t ivas_sba_get_order_transport(

		return ( sba_order );
		}

		#endif

		/-------------------------------------------------------------------
		* ivas_sba_get_nchan()

+1 −0

Original line number	Diff line number	Diff line
		@@ -149,6 +149,7 @@
		#define BRATE_SWITCHING_RENDERING /* Bitrate switching changes related to the renderers */
		#define FIX_150 /* Issue 150: Crash in EVS mono, HQ_HARMONIC mode, related to BASOP_NOGLOB */
		#define FIX_VBR_COMPLEXITY /* Issue 234: fix extremely high complexity numbers for IVAS EVS mode */
		#define SBA_DIRAC_RENDERER_TYPE_CLEANUP /* Remove leftovers in renderer_type logic in SBA DirAC decoder */
		#define LOW_RATE_TRANS /* Eri: Contribution 20: low rate encoding of transients */

		/* ################## End DEVELOPMENT switches ######################### */

+3 −1

Original line number	Diff line number	Diff line
		@@ -839,7 +839,7 @@ ivas_error ivas_init_decoder(
		st_ivas->hSpar->dirac_to_spar_md_bands, st_ivas->hQMetaData->useLowerBandRes, st_ivas->hSpar->enc_param_start_band, 0 );
		}
		}
		else
		else /* SBA_MODE_DIRAC */
		{
		if ( ( error = ivas_dirac_sba_config( st_ivas->hQMetaData, &st_ivas->nchan_transport, &st_ivas->nSCE, &st_ivas->nCPE, &st_ivas->element_mode_init, ivas_total_brate, st_ivas->sba_analysis_order, st_ivas->sba_mode, -1 ) ) != IVAS_ERR_OK )
		{
		@@ -848,6 +848,7 @@ ivas_error ivas_init_decoder(

		st_ivas->sba_dirac_stereo_flag = ( st_ivas->nchan_transport == 1 && output_config == AUDIO_CONFIG_STEREO );

		#ifndef SBA_DIRAC_RENDERER_TYPE_CLEANUP
		if ( ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_DEC ) && st_ivas->hOutSetup.is_loudspeaker_setup )
		{
		int16_t ambisonics_order;
		@@ -869,6 +870,7 @@ ivas_error ivas_init_decoder(
		return error;
		}
		}
		#endif
		}
		}

+2 −0

Original line number	Diff line number	Diff line
		@@ -334,6 +334,7 @@ ivas_error ivas_sba_dec_reinit(

		st_ivas->sba_dirac_stereo_flag = ( st_ivas->nchan_transport == 1 && output_config == AUDIO_CONFIG_STEREO );

		#ifndef SBA_DIRAC_RENDERER_TYPE_CLEANUP
		if ( ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_DEC ) && st_ivas->hOutSetup.is_loudspeaker_setup )
		{
		int16_t ambisonics_order;
		@@ -355,6 +356,7 @@ ivas_error ivas_sba_dec_reinit(
		return error;
		}
		}
		#endif
		}
		if ( st_ivas->renderer_type != RENDERER_BINAURAL_MIXER_CONV && st_ivas->renderer_type != RENDERER_BINAURAL_MIXER_CONV_ROOM &&
		st_ivas->renderer_type != RENDERER_DISABLE && st_ivas->renderer_type != RENDERER_SBA_LINEAR_DEC && st_ivas->sba_mode != SBA_MODE_SPAR )