[cleanup] accept ISM_BITRATE_SWITCHING (fcc9e15f) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -144,7 +144,6 @@
		/#define FIX_I4_OL_PITCH/ /* fix open-loop pitch used for EVS core switching */
		/#define FIX_I1_113/ /* under review : MCT bit distribution optimization for SBA high bitrates*/

		#define ISM_BITRATE_SWITCHING /* Issue 115: Support for Bitrate Switching in ISM */
		#define SBA_SPAR_HARM /* Issue 92: maintenance of the SBA SPAR functions */
		#define FIX_155_HP20_ISSUE /* Issue 155: apply hp20 on all input channels instead of just 2 channels */
		#define EFAP_FIX_POLY /* Issue 167: fix bug in EFAP polygon selection */

lib_dec/ivas_corecoder_dec_reconfig.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -271,9 +271,7 @@ ivas_error ivas_corecoder_dec_reconfig(
		-----------------------------------------------------------------/

		/// VE: this could be merged with part of ivas_init_decoder()
		#ifdef ISM_BITRATE_SWITCHING
		if ( st_ivas->ivas_format == SBA_FORMAT )
		#endif
		{
		if ( st_ivas->sba_mode == SBA_MODE_SPAR && st_ivas->nchan_transport == 1 )
		{

lib_dec/ivas_ism_param_dec.c

+0 −15

Original line number	Diff line number	Diff line
		@@ -1004,7 +1004,6 @@ void ivas_param_ism_params_to_masa_param_mapping(
		}


		#ifdef ISM_BITRATE_SWITCHING
		/-------------------------------------------------------------------------
		* ivas_ism_bitrate_switching()
		*
		@@ -1136,7 +1135,6 @@ static ivas_error ivas_ism_bitrate_switching(

		return error;
		}
		#endif

		/*-------------------------------------------------------------------------
		* ivas_ism_dec_config()
		@@ -1154,9 +1152,7 @@ ivas_error ivas_ism_dec_config(
		int32_t ivas_total_brate;
		ISM_MODE last_ism_mode;
		ivas_error error;
		#ifdef ISM_BITRATE_SWITCHING
		int16_t nchan_transport_old;
		#endif

		error = IVAS_ERR_OK;

		@@ -1164,14 +1160,12 @@ ivas_error ivas_ism_dec_config(

		/* store last frame ISM mode */
		last_ism_mode = st_ivas->ism_mode;
		#ifdef ISM_BITRATE_SWITCHING
		/* Assumes that num of input objects are constant */
		nchan_transport_old = num_obj;
		if ( last_ism_mode == ISM_MODE_PARAM )
		{
		nchan_transport_old = 2;
		}
		#endif

		if ( !st_ivas->bfi && ivas_total_brate != IVAS_SID_5k2 && ivas_total_brate != FRAME_NO_DATA )
		{
		@@ -1190,7 +1184,6 @@ ivas_error ivas_ism_dec_config(

		if ( st_ivas->ini_active_frame != 0 )
		{
		#ifdef ISM_BITRATE_SWITCHING
		/* ISM bit-rate switching */
		if ( st_ivas->hDecoderConfig->last_ivas_total_brate != IVAS_SID_5k2 && st_ivas->hDecoderConfig->last_ivas_total_brate != FRAME_NO_DATA )
		{
		@@ -1199,14 +1192,6 @@ ivas_error ivas_ism_dec_config(
		ivas_ism_bitrate_switching( st_ivas, nchan_transport_old, last_ism_mode, num_obj );
		}
		}
		#else
		/* ISM format switching */
		if ( st_ivas->ism_mode != last_ism_mode )
		{
		/ivas_ism_dec_reconfigure( st_ivas );/
		return IVAS_ERROR( IVAS_ERR_RECONFIGURE_NOT_SUPPORTED, "\n\n!!! Error: ISM format switching not supported yet!!!\n\n" );
		}
		#endif
		}
		}
		else if ( !st_ivas->bfi && ivas_total_brate == IVAS_SID_5k2 )

lib_enc/ivas_ism_param_enc.c

+0 −11

Original line number	Diff line number	Diff line
		@@ -417,9 +417,7 @@ ivas_error ivas_ism_enc_config(
		{
		ivas_error error;
		ISM_MODE last_ism_mode;
		#ifdef ISM_BITRATE_SWITCHING
		int16_t nchan_transport_old;
		#endif

		error = IVAS_ERR_OK;
		last_ism_mode = st_ivas->ism_mode;
		@@ -427,7 +425,6 @@ ivas_error ivas_ism_enc_config(
		/* select ISM format mode */
		st_ivas->ism_mode = ivas_ism_mode_select( st_ivas->hEncoderConfig->nchan_inp, st_ivas->hEncoderConfig->ivas_total_brate );

		#ifdef ISM_BITRATE_SWITCHING
		/* ISM bit-rate switching */
		if ( ( st_ivas->ism_mode != last_ism_mode ) \|\| ( st_ivas->hEncoderConfig->ivas_total_brate != st_ivas->hEncoderConfig->last_ivas_total_brate ) )
		{
		@@ -472,14 +469,6 @@ ivas_error ivas_ism_enc_config(
		ivas_hp20_reconfig( st_ivas, nchan_transport_old );
		#endif
		}
		#else
		/* ISM format switching */
		if ( st_ivas->ism_mode != last_ism_mode )
		{
		/ivas_ism_dec_reconfigure( st_ivas );/
		return IVAS_ERROR( IVAS_ERR_RECONFIGURE_NOT_SUPPORTED, "Error: ISM format switching not supported yet!!!\n\n" );
		}
		#endif

		return error;
		}

lib_enc/lib_enc.c

+0 −27

Original line number	Diff line number	Diff line
		@@ -78,9 +78,7 @@ static int16_t getInputBufferSize( const Encoder_Struct *st_ivas );
		static ivas_error doCommonConfigureChecks( IVAS_ENC_HANDLE hIvasEnc );
		static ivas_error doCommonSetterChecks( IVAS_ENC_HANDLE hIvasEnc );
		static ivas_error sanitizeBandwidth( const IVAS_ENC_HANDLE hIvasEnc );
		#ifdef ISM_BITRATE_SWITCHING
		static ivas_error sanitizeBitrateISM( const ENCODER_CONFIG_HANDLE hEncoderConfig );
		#endif
		static void init_encoder_config( ENCODER_CONFIG_HANDLE hEncoderConfig );
		static void resetIsmMetadataProvidedFlags( IVAS_ENC_HANDLE hIvasEnc );
		static ivas_error bandwidthApiToInternal( const IVAS_ENC_BANDWIDTH maxBandwidth, int16_t *internalMaxBandwidth );
		@@ -772,29 +770,10 @@ static ivas_error configureEncoder(
		}
		else if ( hEncoderConfig->ivas_format == ISM_FORMAT )
		{
		#ifdef ISM_BITRATE_SWITCHING
		if ( ( error = sanitizeBitrateISM( hEncoderConfig ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		#else
		if ( hEncoderConfig->ivas_total_brate > IVAS_256k )
		{
		return IVAS_ERROR( IVAS_ERR_INVALID_BITRATE, "Too high bitrate for ISm specified in IVAS: %d", hEncoderConfig->ivas_total_brate );
		}
		if ( hEncoderConfig->ivas_total_brate < IVAS_16k4 && hEncoderConfig->nchan_inp == 2 )
		{
		return IVAS_ERROR( IVAS_ERR_INVALID_BITRATE, "Too low bitrate for 2 ISm specified in IVAS: %d", hEncoderConfig->ivas_total_brate );
		}
		if ( hEncoderConfig->ivas_total_brate < IVAS_24k4 && hEncoderConfig->nchan_inp == 3 )
		{
		return IVAS_ERROR( IVAS_ERR_INVALID_BITRATE, "Too low bitrate for 3 ISm specified in IVAS: %d", hEncoderConfig->ivas_total_brate );
		}
		if ( hEncoderConfig->ivas_total_brate < IVAS_24k4 && hEncoderConfig->nchan_inp == 4 )
		{
		return IVAS_ERROR( IVAS_ERR_INVALID_BITRATE, "Too low bitrate for 4 ISm specified in IVAS: %d", hEncoderConfig->ivas_total_brate );
		}
		#endif
		}
		else if ( hEncoderConfig->ivas_format == SBA_FORMAT )
		{
		@@ -1669,9 +1648,7 @@ static ivas_error setBitrate(
		{
		Encoder_Struct *st_ivas;
		ENCODER_CONFIG_HANDLE hEncoderConfig;
		#ifdef ISM_BITRATE_SWITCHING
		ivas_error error;
		#endif

		st_ivas = hIvasEnc->st_ivas;
		hEncoderConfig = st_ivas->hEncoderConfig;
		@@ -1718,7 +1695,6 @@ static ivas_error setBitrate(
		}
		}

		#ifdef ISM_BITRATE_SWITCHING
		if ( hEncoderConfig->ivas_format == ISM_FORMAT )
		{
		if ( ( error = sanitizeBitrateISM( hEncoderConfig ) ) != IVAS_ERR_OK )
		@@ -1726,7 +1702,6 @@ static ivas_error setBitrate(
		return error;
		}
		}
		#endif

		st_ivas->codec_mode = MODE1;

		@@ -1954,7 +1929,6 @@ static ivas_error sanitizeBandwidth(
		}


		#ifdef ISM_BITRATE_SWITCHING
		/---------------------------------------------------------------------
		* sanitizeBitrateISM()
		*
		@@ -1986,7 +1960,6 @@ static ivas_error sanitizeBitrateISM(

		return IVAS_ERR_OK;
		}
		#endif


		/---------------------------------------------------------------------