[cleanup] accept BRATE_SWITCHING_FRAMEWORK (e39edccd) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -148,7 +148,6 @@
		#define FIX_124_DONT_ALLOC_PLCINFO_IN_IVAS /* Issue 124: do not allocate unused plc struct in IVAS modes which is only used in EVS mono */
		#define SBA_BR_SWITCHING /* Issue 114: Changes for sba bit rate switching*/
		#define FIX_ITD /* Contribution 16: TD renderer ITD improvement and code cleanup */
		#define BRATE_SWITCHING_FRAMEWORK /* Bitrate switching changes related to the general framework */
		#define BRATE_SWITCHING_RENDERING /* Bitrate switching changes related to the renderers */
		#define FIX_185_REDUCE_MD_BITS /* Issue 185: Crash in SBA encoder for 24.4 kbps HOA3 input with longer testvector */
		#ifdef FIX_185_REDUCE_MD_BITS

lib_dec/ivas_dirac_dec.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -258,9 +258,7 @@ ivas_error ivas_dirac_dec_config(
		* set input parameters
		-----------------------------------------------------------------/

		#ifdef BRATE_SWITCHING_FRAMEWORK
		st_ivas->nchan_transport = nchan_transport_orig;
		#endif

		if ( flag_config == DIRAC_OPEN )
		{
		@@ -276,9 +274,6 @@ ivas_error ivas_dirac_dec_config(
		return IVAS_ERR_OK;
		}

		#ifndef BRATE_SWITCHING_FRAMEWORK
		st_ivas->nchan_transport = nchan_transport_orig;
		#endif
		if ( nchan_transport_orig > 2 && hDirAC->hOutSetup.is_loudspeaker_setup && st_ivas->renderer_type == RENDERER_DIRAC )
		{
		hDirAC->synthesisConf = DIRAC_SYNTHESIS_PSD_LS;
		@@ -863,9 +858,6 @@ ivas_error ivas_dirac_dec_config(
		st_ivas->hDirAC = hDirAC;
		}

		#ifndef BRATE_SWITCHING_FRAMEWORK
		st_ivas->nchan_transport = nchan_transport_orig;
		#endif
		return error;
		}

lib_enc/ivas_dirac_enc.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -131,9 +131,7 @@ ivas_error ivas_dirac_enc_open(
		}
		else
		{
		#ifdef BRATE_SWITCHING_FRAMEWORK
		hDirAC->num_samples_synchro_delay = 0;
		#endif

		for ( i = 0; i < DIRAC_MAX_ANA_CHANS; i++ )
		{

lib_enc/ivas_mct_enc.c

+0 −51

Original line number	Diff line number	Diff line
		@@ -44,7 +44,6 @@
		#include "wmops.h"


		#ifdef BRATE_SWITCHING_FRAMEWORK
		/-------------------------------------------------------------------
		* set_mct_enc_params()
		*
		@@ -83,7 +82,6 @@ static void set_mct_enc_params(

		return;
		}
		#endif


		/-------------------------------------------------------------------
		@@ -318,27 +316,7 @@ ivas_error create_mct_enc(
		* Initializations
		-----------------------------------------------------------------/

		#ifdef BRATE_SWITCHING_FRAMEWORK
		set_mct_enc_params( hMCT, ivas_total_brate, st_ivas->sba_mode, 1 );
		#else

		hMCT->currBlockDataCnt = 0;

		/Initialize bits required to signal channel-pair index/
		hMCT->bitsChannelPairIndex = max( 1, (int16_t) ( floor( ( log( hMCT->nchan_out_woLFE * ( hMCT->nchan_out_woLFE - 1 ) / 2 - 1 ) / log( 2. ) ) ) + 1 ) );

		set_s( hMCT->lowE_ch, 0, MCT_MAX_CHANNELS );

		for ( n = 0; n < MCT_MAX_CHANNELS; n++ )
		{
		set_f( hMCT->lastxCorrMatrix[n], 0, MCT_MAX_CHANNELS );
		}
		hMCT->hbr_mct = 0;
		if ( st_ivas->sba_mode == SBA_MODE_SPAR && ivas_total_brate >= IVAS_256k )
		{
		hMCT->hbr_mct = 1;
		}
		#endif

		st_ivas->hMCT = hMCT;

		@@ -379,24 +357,11 @@ ivas_error mct_enc_reconfigure(
		hMCT->nchan_out_woLFE = st_ivas->hEncoderConfig->nchan_inp - 1; /* LFE channel is coded separately */
		hMCT->num_lfe = TRUE;
		}
		#ifdef BRATE_SWITCHING_FRAMEWORK
		else if ( ivas_format == SBA_FORMAT )
		{
		hMCT->nchan_out_woLFE = st_ivas->nchan_transport;
		hMCT->num_lfe = FALSE;
		}
		#else
		else if ( ivas_format == SBA_FORMAT && st_ivas->hDirAC ) // VE: this condition to be reviewed together with the following one
		{
		hMCT->nchan_out_woLFE = ivas_get_sba_num_TCs( ivas_total_brate, st_ivas->sba_analysis_order );
		hMCT->num_lfe = FALSE;
		}
		else if ( ivas_format == SBA_FORMAT )
		{
		hMCT->nchan_out_woLFE = ivas_sba_get_nchan( st_ivas->sba_analysis_order, st_ivas->hEncoderConfig->sba_planar );
		hMCT->num_lfe = FALSE;
		}
		#endif
		else
		{
		assert( !"IVAS format currently not supported for MCT" );
		@@ -509,23 +474,7 @@ ivas_error mct_enc_reconfigure(
		* Initializations
		-----------------------------------------------------------------/

		#ifdef BRATE_SWITCHING_FRAMEWORK
		set_mct_enc_params( hMCT, ivas_total_brate, st_ivas->sba_mode, b_nchan_change );
		#else
		if ( b_nchan_change )
		{
		hMCT->currBlockDataCnt = 0;
		/Initialize bits required to signal channel-pair index/
		hMCT->bitsChannelPairIndex = max( 1, (int16_t) ( floor( ( log( hMCT->nchan_out_woLFE * ( hMCT->nchan_out_woLFE - 1 ) / 2 - 1 ) / log( 2. ) ) ) + 1 ) );

		set_s( hMCT->lowE_ch, 0, MCT_MAX_CHANNELS );

		for ( n = 0; n < MCT_MAX_CHANNELS; n++ )
		{
		set_f( hMCT->lastxCorrMatrix[n], 0, MCT_MAX_CHANNELS );
		}
		}
		#endif

		return IVAS_ERR_OK;
		}