[cleanup] accept FIX_1547_ISMDTX_HANDLE (060d846d) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/ivas_prot.h

+0 −4

Original line number	Diff line number	Diff line
		@@ -1049,11 +1049,7 @@ ivas_error ivas_ism_metadata_dec(
		const int16_t bfi, /* i : bfi flag */
		int16_t nb_bits_metadata[], /* o : number of metadata bits */
		ISM_MODE ism_mode, /* i : ISM mode */
		#ifdef FIX_1547_ISMDTX_HANDLE
		ISM_DTX_DATA_DEC hISMDTX, / i/o: ISM DTX handle */
		#else
		ISM_DTX_DATA_DEC hISMDTX, /* i/o: ISM DTX structure */
		#endif
		const PARAM_ISM_CONFIG_HANDLE hParamIsm, /* i : Param ISM Config Handle */
		int16_t ism_extended_metadata_flag, / i/o: Extended metadata active in renderer */
		int16_t ism_extmeta_cnt, / i/o: Number of change frames observed */

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -169,7 +169,6 @@
		/* #################### Start NON-BE switches ############################ */
		/* any switch which is non-be wrt. TS 26.258 V3.0 */

		#define FIX_1547_ISMDTX_HANDLE /* VA: float issue 1547: fix use of 'hISMDTX' handle */
		#define FIX_1540_EXPOSE_PT_IN_RTP_HEADER_API /* Expose Payload Type setting in RTP Header */
		#define FIX_1563_FIX_STEREO_SW /* VA: float issue 1563: fix clicks in stereo switching */
		#define FIX_1562_DTX_CRASH_DECODER /* VA: float issue 1562: fix crash in stereo decoding in DTX and bitrate switching */

lib_dec/ivas_dec.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -126,11 +126,7 @@ ivas_error ivas_dec(
		}
		else if ( st_ivas->ism_mode == ISM_MODE_PARAM )
		{
		#ifdef FIX_1547_ISMDTX_HANDLE
		if ( ( error = ivas_ism_metadata_dec( ivas_total_brate, st_ivas->nchan_ism, &( st_ivas->nchan_transport ), st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->bfi, nb_bits_metadata, st_ivas->ism_mode, &( st_ivas->hISMDTX ), st_ivas->hParamIsmDec->hParamIsm, &st_ivas->ism_extmeta_active, &st_ivas->ism_extmeta_cnt, st_ivas->hSCE[0]->hCoreCoder[0] ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = ivas_ism_metadata_dec( ivas_total_brate, st_ivas->nchan_ism, &( st_ivas->nchan_transport ), st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->bfi, nb_bits_metadata, st_ivas->ism_mode, st_ivas->hISMDTX, st_ivas->hParamIsmDec->hParamIsm, &st_ivas->ism_extmeta_active, &st_ivas->ism_extmeta_cnt, st_ivas->hSCE[0]->hCoreCoder[0] ) ) != IVAS_ERR_OK )
		#endif
		{
		return error;
		}
		@@ -139,11 +135,7 @@ ivas_error ivas_dec(
		}
		else /* ISM_MODE_DISC */
		{
		#ifdef FIX_1547_ISMDTX_HANDLE
		if ( ( error = ivas_ism_metadata_dec( ivas_total_brate, st_ivas->nchan_ism, &( st_ivas->nchan_transport ), st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->bfi, nb_bits_metadata, st_ivas->ism_mode, &( st_ivas->hISMDTX ), NULL, &st_ivas->ism_extmeta_active, &st_ivas->ism_extmeta_cnt, st_ivas->hSCE[0]->hCoreCoder[0] ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = ivas_ism_metadata_dec( ivas_total_brate, st_ivas->nchan_ism, &( st_ivas->nchan_transport ), st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->bfi, nb_bits_metadata, st_ivas->ism_mode, st_ivas->hISMDTX, NULL, &st_ivas->ism_extmeta_active, &st_ivas->ism_extmeta_cnt, st_ivas->hSCE[0]->hCoreCoder[0] ) ) != IVAS_ERR_OK )
		#endif
		{
		return error;
		}

lib_dec/ivas_ism_metadata_dec.c

+0 −12

Original line number	Diff line number	Diff line
		@@ -148,11 +148,7 @@ ivas_error ivas_ism_metadata_dec(
		const int16_t bfi, /* i : bfi flag */
		int16_t nb_bits_metadata[], /* o : number of metadata bits */
		ISM_MODE ism_mode, /* i : ISM mode */
		#ifdef FIX_1547_ISMDTX_HANDLE
		ISM_DTX_DATA_DEC hISMDTX, / i/o: ISM DTX handle */
		#else
		ISM_DTX_DATA_DEC hISMDTX, /* i/o: ISM DTX structure */
		#endif
		const PARAM_ISM_CONFIG_HANDLE hParamIsm, /* i : Param ISM Config Handle */
		int16_t ism_extmeta_active, / i/o: Extended metadata active in renderer */
		int16_t ism_extmeta_cnt, / i/o: Number of change frames observed */
		@@ -533,19 +529,11 @@ ivas_error ivas_ism_metadata_dec(
		}
		}

		#ifdef FIX_1547_ISMDTX_HANDLE
		if ( hISMDTX->ism_dtx_hangover_cnt < IVAS_ISM_DTX_HO_MAX )
		{
		ism_metadata_smooth( hIsmMeta, ism_total_brate, nchan_ism );
		hISMDTX->ism_dtx_hangover_cnt += 1;
		}
		#else
		if ( hISMDTX.ism_dtx_hangover_cnt < IVAS_ISM_DTX_HO_MAX )
		{
		ism_metadata_smooth( hIsmMeta, ism_total_brate, nchan_ism );
		hISMDTX.ism_dtx_hangover_cnt += 1;
		}
		#endif

		if ( ism_mode == ISM_SBA_MODE_DISC )
		{

lib_dec/ivas_ism_param_dec.c

+0 −20

Original line number	Diff line number	Diff line
		@@ -199,11 +199,7 @@ static void ivas_param_ism_collect_slot(
		static void ivas_param_ism_compute_mixing_matrix(
		const int16_t nchan_ism, /* i : number of ISM channels */
		PARAM_ISM_DEC_HANDLE hParamIsmDec, /* i/o: decoder ParamISM handle */
		#ifdef FIX_1547_ISMDTX_HANDLE
		const ISM_DTX_DATA_DEC hISMDTX, / i : ISM DTX handle */
		#else
		ISM_DTX_DATA_DEC hISMDTX, /* i : ISM DTX handle */
		#endif
		float direct_response[MAX_NUM_OBJECTS][PARAM_ISM_MAX_CHAN],
		const int16_t nchan_transport,
		const int16_t nchan_out_woLFE,
		@@ -227,11 +223,7 @@ static void ivas_param_ism_compute_mixing_matrix(
		assert( ( nchan_ism == 3 ) \|\| ( nchan_ism == 4 ) );
		assert( nchan_transport == 2 );

		#ifdef FIX_1547_ISMDTX_HANDLE
		if ( hParamIsmDec->hParamIsm->flag_noisy_speech \|\| hISMDTX->dtx_flag )
		#else
		if ( hParamIsmDec->hParamIsm->flag_noisy_speech \|\| hISMDTX.dtx_flag )
		#endif
		{
		num_wave = nchan_ism;
		}
		@@ -252,11 +244,7 @@ static void ivas_param_ism_compute_mixing_matrix(
		{
		set_zero( cy_diag_tmp[w], nchan_out_woLFE );

		#ifdef FIX_1547_ISMDTX_HANDLE
		if ( hParamIsmDec->hParamIsm->flag_noisy_speech \|\| hISMDTX->dtx_flag )
		#else
		if ( hParamIsmDec->hParamIsm->flag_noisy_speech \|\| hISMDTX.dtx_flag )
		#endif
		{
		dir_res_ptr = direct_response[w];
		}
		@@ -276,11 +264,7 @@ static void ivas_param_ism_compute_mixing_matrix(
		set_zero( cy_diag, nchan_out_woLFE );
		for ( w = 0; w < num_wave; w++ )
		{
		#ifdef FIX_1547_ISMDTX_HANDLE
		if ( hParamIsmDec->hParamIsm->flag_noisy_speech \|\| hISMDTX->dtx_flag )
		#else
		if ( hParamIsmDec->hParamIsm->flag_noisy_speech \|\| hISMDTX.dtx_flag )
		#endif
		{
		direct_power[w] = ( 1.0f / nchan_ism ) * ref_power[bin_idx];
		}
		@@ -1006,11 +990,7 @@ void ivas_param_ism_dec_prepare_renderer(
		}

		/* Compute mixing matrix */
		#ifdef FIX_1547_ISMDTX_HANDLE
		ivas_param_ism_compute_mixing_matrix( st_ivas->nchan_ism, hParamIsmDec, &( st_ivas->hISMDTX ), direct_response, nchan_transport, nchan_out_woLFE, cx_diag, ref_power, hParamIsmDec->hParamIsmRendering->mixing_matrix_lin );
		#else
		ivas_param_ism_compute_mixing_matrix( st_ivas->nchan_ism, hParamIsmDec, st_ivas->hISMDTX, direct_response, nchan_transport, nchan_out_woLFE, cx_diag, ref_power, hParamIsmDec->hParamIsmRendering->mixing_matrix_lin );
		#endif

		return;
		}