remove parameter 'st_ivas->last_mc_mode' which was obsolete and uninitialized... (5d3931b7) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/ivas_prot.h

+1 −2

Original line number	Diff line number	Diff line
		@@ -2594,8 +2594,7 @@ ivas_error stereo_memory_dec(
		const int32_t output_Fs, /* i : output sampling rate */
		const IVAS_FORMAT ivas_format, /* i : IVAS format */
		#ifdef FIX_MC_BR_SW_TCX_PLC_FADEOUT
		const MC_MODE mc_mode,
		const MC_MODE last_mc_mode,
		const MC_MODE mc_mode, /* i : MC mode */
		#endif
		const int16_t nchan_transport /* i : number of transport channels */
		);

lib_dec/ivas_cpe_dec.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -104,7 +104,7 @@ ivas_error ivas_cpe_dec(
		----------------------------------------------------------------/

		#ifdef FIX_MC_BR_SW_TCX_PLC_FADEOUT
		if ( ( error = stereo_memory_dec( ivas_total_brate, hCPE, nb_bits_metadata, st_ivas->hDecoderConfig->output_Fs, st_ivas->ivas_format, st_ivas->mc_mode, st_ivas->last_mc_mode, st_ivas->nchan_transport ) ) != IVAS_ERR_OK )
		if ( ( error = stereo_memory_dec( ivas_total_brate, hCPE, nb_bits_metadata, st_ivas->hDecoderConfig->output_Fs, st_ivas->ivas_format, st_ivas->mc_mode, st_ivas->nchan_transport ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = stereo_memory_dec( ivas_total_brate, hCPE, nb_bits_metadata, st_ivas->hDecoderConfig->output_Fs, st_ivas->ivas_format, st_ivas->nchan_transport ) ) != IVAS_ERR_OK )
		#endif

lib_dec/ivas_mct_dec.c

+1 −5

Original line number	Diff line number	Diff line
		@@ -616,9 +616,6 @@ ivas_error ivas_mc_dec_config(

		/* store last frame MC mode */
		last_mc_mode = st_ivas->mc_mode;
		#ifdef FIX_MC_BR_SW_TCX_PLC_FADEOUT
		st_ivas->last_mc_mode = last_mc_mode;
		#endif

		if ( !st_ivas->bfi )
		{
		@@ -957,7 +954,7 @@ static ivas_error ivas_mc_dec_reconfig(
		ivas_cldfb_dec_reconfig( st_ivas, nchan_transport_old, numCldfbAnalyses_old, numCldfbSyntheses_old );

		// !!! VE: what is the following block needed for?
		if ( last_mc_mode == MC_MODE_MCMASA && nchan_transport_old == 1 && ( renderer_type_old == RENDERER_BINAURAL_PARAMETRIC ) \|\| ( renderer_type_old == RENDERER_BINAURAL_PARAMETRIC_ROOM \|\| renderer_type_old == RENDERER_STEREO_PARAMETRIC ) )
		if ( ( last_mc_mode == MC_MODE_MCMASA ) && ( nchan_transport_old == 1 ) && ( ( renderer_type_old == RENDERER_BINAURAL_PARAMETRIC ) \|\| ( renderer_type_old == RENDERER_BINAURAL_PARAMETRIC_ROOM ) \|\| ( renderer_type_old == RENDERER_STEREO_PARAMETRIC ) ) )
		{
		int16_t numCldfbAnalyses, numCldfbSyntheses;

		@@ -976,7 +973,6 @@ static ivas_error ivas_mc_dec_reconfig(
		}
		}
		#else

		ivas_init_dec_get_num_cldfb_instances( st_ivas, &numCldfbAnalyses, &numCldfbSyntheses );

		/* Analysis*/

lib_dec/ivas_stat_dec.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -1946,9 +1946,6 @@ typedef struct Decoder_Struct
		ISM_MODE ism_mode; /* ISM format mode */
		SBA_MODE sba_mode; /* SBA format mode */
		MC_MODE mc_mode; /* MC format mode */
		#ifdef FIX_MC_BR_SW_TCX_PLC_FADEOUT
		MC_MODE last_mc_mode; // !!! VE: could it be removed and get from ivas_mc_mode_select() in ivas_cpe_dec() ?
		#endif
		int16_t sba_order; /* Ambisonic (SBA) order */
		int16_t sba_planar; /* Ambisonic (SBA) planar flag */
		int16_t sba_analysis_order; /* Ambisonic (SBA) order used for analysis and coding */

lib_dec/ivas_stereo_switching_dec.c

+48 −44

Original line number	Diff line number	Diff line
		@@ -343,8 +343,7 @@ ivas_error stereo_memory_dec(
		const int32_t output_Fs, /* i : output sampling rate */
		const IVAS_FORMAT ivas_format, /* i : IVAS format */
		#ifdef FIX_MC_BR_SW_TCX_PLC_FADEOUT
		const MC_MODE mc_mode,
		const MC_MODE last_mc_mode,
		const MC_MODE mc_mode, /* i : MC mode */
		#endif
		const int16_t nchan_transport /* i : number of transport channels*/
		)
		@@ -863,48 +862,6 @@ ivas_error stereo_memory_dec(
		}
		}

		#ifdef FIX_MC_BR_SW_TCX_PLC_FADEOUT
		if ( ivas_format == MC_FORMAT && hCPE->element_mode == IVAS_CPE_MDCT && ( mc_mode != last_mc_mode ) )
		{
		if ( mc_mode == MC_MODE_MCT )
		{
		/* deallocate the FdCNG handle */
		for ( i = 0; i < CPE_CHANNELS; ++i )
		{
		deleteFdCngDec( &hCPE->hCoreCoder[i]->hFdCngDec );
		/* deallocate CLDFB synthesis for LFE channel */
		if ( hCPE->hCoreCoder[i]->mct_chan_mode == MCT_CHAN_MODE_LFE )
		{
		deleteCldfb( &hCPE->hCoreCoder[i]->cldfbSyn );
		}
		}
		}
		else
		{
		/* allocate the FdCNG handle (for noise estimation for TCX PLC fadeout)*/
		for ( i = 0; i < CPE_CHANNELS; ++i )
		{
		if ( hCPE->hCoreCoder[i]->cldfbSyn == NULL ) /* could be NULL when we had the MCT LFE channel */
		{
		if ( ( error = openCldfb( &hCPE->hCoreCoder[i]->cldfbSyn, CLDFB_SYNTHESIS, hCPE->hCoreCoder[i]->output_Fs, CLDFB_PROTOTYPE_1_25MS ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		}

		if ( hCPE->hCoreCoder[i]->hFdCngDec == NULL )
		{
		if ( ( error = createFdCngDec( &hCPE->hCoreCoder[i]->hFdCngDec ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		initFdCngDec( hCPE->hCoreCoder[i] );
		}
		}
		}
		}
		#endif

		/--------------------------------------------------------------
		* Bitrate switching in MASA format
		---------------------------------------------------------------/
		@@ -990,6 +947,53 @@ ivas_error stereo_memory_dec(
		}
		}

		#ifdef FIX_MC_BR_SW_TCX_PLC_FADEOUT
		/--------------------------------------------------------------
		* Bitrate switching in MASA format
		---------------------------------------------------------------/

		if ( ivas_format == MC_FORMAT && hCPE->element_mode == IVAS_CPE_MDCT )
		{
		if ( mc_mode == MC_MODE_MCT )
		{
		/* deallocate the FdCNG handle */
		for ( i = 0; i < CPE_CHANNELS; ++i )
		{
		deleteFdCngDec( &hCPE->hCoreCoder[i]->hFdCngDec );

		/* deallocate CLDFB synthesis for LFE channel */
		if ( hCPE->hCoreCoder[i]->mct_chan_mode == MCT_CHAN_MODE_LFE )
		{
		deleteCldfb( &hCPE->hCoreCoder[i]->cldfbSyn );
		}
		}
		}
		else
		{
		/* allocate the FdCNG handle (for noise estimation for TCX PLC fadeout)*/
		for ( i = 0; i < CPE_CHANNELS; ++i )
		{
		if ( hCPE->hCoreCoder[i]->cldfbSyn == NULL ) /* could be NULL when we had the MCT LFE channel */
		{
		if ( ( error = openCldfb( &hCPE->hCoreCoder[i]->cldfbSyn, CLDFB_SYNTHESIS, hCPE->hCoreCoder[i]->output_Fs, CLDFB_PROTOTYPE_1_25MS ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		}

		if ( hCPE->hCoreCoder[i]->hFdCngDec == NULL )
		{
		if ( ( error = createFdCngDec( &hCPE->hCoreCoder[i]->hFdCngDec ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		initFdCngDec( hCPE->hCoreCoder[i] );
		}
		}
		}
		}
		#endif

		return error;
		}