[cleanup] accept NONBE_1325_TD_STEREO_QUANT_LSF_SEC (61d55412) · Commits · SA4 / Audio / IVAS BASOP

lib_com/bits_alloc_fx.c

+0 −10

Original line number	Diff line number	Diff line
		@@ -623,9 +623,6 @@ ivas_error config_acelp1_fx(
		const Word16 tdm_lp_reuse_flag, /* i : LPC reuse flag (can be 1 only with secondary channel */
		const Word16 tdm_low_rate_mode, /* i : secondary channel low rate mode flag */
		const Word16 idchan, /* i : stereo channel ID */
		#ifndef NONBE_1325_TD_STEREO_QUANT_LSF_SEC
		const Word16 active_cnt, /* i : Active frame counter */
		#endif
		const Word16 tdm_Pitch_reuse_flag, /* i : primary channel pitch reuse flag*/
		const Word16 tdm_LRTD_flag, /* i : LRTD stereo mode flag */
		const Word16 GSC_IVAS_mode /* i : GSC IVAS mode */
		@@ -808,9 +805,6 @@ ivas_error config_acelp1_fx(

		test();
		test();
		#ifndef NONBE_1325_TD_STEREO_QUANT_LSF_SEC
		test();
		#endif
		IF( !tdm_lp_reuse_flag \|\| idchan == 0 )
		{
		/* LSF Q bit-budget */
		@@ -887,11 +881,7 @@ ivas_error config_acelp1_fx(

		bits = sub( bits, acelp_cfg->mid_lsf_bits );
		}
		#ifdef NONBE_1325_TD_STEREO_QUANT_LSF_SEC
		ELSE IF( EQ_16( tdm_lp_reuse_flag, 1 ) && EQ_16( idchan, 1 ) )
		#else
		ELSE IF( EQ_16( tdm_lp_reuse_flag, 1 ) && EQ_16( idchan, 1 ) && NE_16( active_cnt, 1 ) )
		#endif
		{
		bits = sub( bits, TDM_IC_LSF_PRED_BITS );
		}

lib_com/ivas_prot_fx.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -883,9 +883,6 @@ void td_stereo_param_updt_fx(
		const Word16 lsp_old_PCh_fx[], /* i : primary channel old LSPs Q15 */
		const Word16 lsf_old_PCh_fx[], /* i : primary channel old LSFs Qlog2(2.56) */
		const Word16 pitch_buf_PCh_fx[], /* i : primary channel pitch buffer Q6 */
		#ifndef NONBE_1325_TD_STEREO_QUANT_LSF_SEC
		Word16 tdm_lspQ_PCh_fx[], /* o : Q LSPs for primary channel Q15 */
		#endif
		Word16 tdm_lsfQ_PCh_fx[], /* o : Q LSFs for primary channel Qlog2(2.56) */
		Word16 tdm_Pri_pitch_buf_fx[], /* o : pitch values for primary channel Q6 */
		const Word16 flag_ACELP16k, /* i : ACELP@16kHz flag */

lib_com/ivas_stereo_td_bit_alloc_fx.c

+0 −29

Original line number	Diff line number	Diff line
		@@ -558,9 +558,6 @@ void td_stereo_param_updt_fx(
		const Word16 lsp_old_PCh_fx[], /* i : primary channel old LSPs Q15 */
		const Word16 lsf_old_PCh_fx[], /* i : primary channel old LSFs Qlog2(2.56) */
		const Word16 pitch_buf_PCh_fx[], /* i : primary channel pitch buffer Q6 */
		#ifndef NONBE_1325_TD_STEREO_QUANT_LSF_SEC
		Word16 tdm_lspQ_PCh_fx[], /* o : Q LSPs for primary channel Q15 */
		#endif
		Word16 tdm_lsfQ_PCh_fx[], /* o : Q LSFs for primary channel Qlog2(2.56) */
		Word16 tdm_Pri_pitch_buf_fx[], /* o : pitch values for primary channel Q6 */
		const Word16 flag_ACELP16k, /* i : ACELP@16kHz flag Q0*/
		@@ -574,42 +571,16 @@ void td_stereo_param_updt_fx(
		{
		/not being assert/
		Copy( IAWB_Ave_fx, tdm_lsfQ_PCh_fx, M ); /Qlog2(2.56)/
		#ifndef NONBE_1325_TD_STEREO_QUANT_LSF_SEC

		IF( tdm_lspQ_PCh_fx != NULL )
		{
		lsf2lsp_fx( tdm_lsfQ_PCh_fx, tdm_lspQ_PCh_fx, M, INT_FS_12k8 );
		}
		#endif
		}
		ELSE IF( EQ_16( flag_ACELP16k, 1 ) )
		{
		#ifndef NONBE_1325_TD_STEREO_QUANT_LSF_SEC
		IF( tdm_lspQ_PCh_fx != NULL )
		{
		Copy( lsp_old_PCh_fx, tdm_lspQ_PCh_fx, M ); /Q15/
		lsp_convert_poly_fx( tdm_lspQ_PCh_fx, L_FRAME, 0 );
		lsp2lsf_fx( tdm_lspQ_PCh_fx, tdm_lsfQ_PCh_fx, M, INT_FS_12k8 );
		}
		ELSE
		{
		#endif
		Word16 lsp_temp[M];
		Copy( lsp_old_PCh_fx, lsp_temp, M ); /Q15/
		lsp_convert_poly_fx( lsp_temp, L_FRAME, 0 );
		lsp2lsf_fx( lsp_temp, tdm_lsfQ_PCh_fx, M, INT_FS_12k8 );
		#ifndef NONBE_1325_TD_STEREO_QUANT_LSF_SEC
		}
		#endif
		}
		ELSE
		{
		#ifndef NONBE_1325_TD_STEREO_QUANT_LSF_SEC
		IF( tdm_lspQ_PCh_fx != NULL )
		{
		Copy( lsp_old_PCh_fx, tdm_lspQ_PCh_fx, M ); /Q15/
		}
		#endif
		Copy( lsf_old_PCh_fx, tdm_lsfQ_PCh_fx, M ); /Qlog2(2.56)/
		}

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -86,7 +86,6 @@

		/* #################### Start BASOP porting switches ############################ */

		#define NONBE_1325_TD_STEREO_QUANT_LSF_SEC /* Nokia: issue 1325: fix for usage of active_cnt variable in TD stereo LSFQ */
		#define NONBE_1329_FIX_OSBA_CRASH /* FhG: issue 1329: prevent assert when bit budget is low*/
		#define NONBE_FIX_1128_OSBA_EXT_OUTPUT_ORDER /* FhG: issue 1128: set output ambisonics order to input order for EXT output */
		#define FIX_1138_SBA_EXT_ERROR_PRINTOUT /* VA: issue 1138: Fix SBA EXT output call of audioCfg2channels() */

lib_com/prot_fx.h

+0 −6

Original line number	Diff line number	Diff line
		@@ -10236,9 +10236,6 @@ ivas_error acelp_core_dec_fx(
		Word16 unbits, / o : number of unused bits */
		Word16 sid_bw, / o : 0-NB/WB, 1-SWB SID */
		STEREO_TD_DEC_DATA_HANDLE hStereoTD, /* i/o: TD stereo decoder handle */
		#ifndef NONBE_1325_TD_STEREO_QUANT_LSF_SEC
		const Word16 tdm_lspQ_PCh_fx[M], /* i : Q LSPs for primary channel */
		#endif
		const Word16 tdm_lsfQ_PCh_fx[M], /* i : Q LSFs for primary channel */
		const Word16 use_cldfb_for_dft, /* i : flag to use of CLDFB for DFT Stereo */
		const Word16 last_element_mode, /* i : last element mode */
		@@ -10575,9 +10572,6 @@ ivas_error config_acelp1_fx(
		const Word16 tdm_lp_reuse_flag, /* i : LPC reuse flag (can be 1 only with secondary channel */
		const Word16 tdm_low_rate_mode, /* i : secondary channel low rate mode flag */
		const Word16 idchan, /* i : stereo channel ID */
		#ifndef NONBE_1325_TD_STEREO_QUANT_LSF_SEC
		const Word16 active_cnt, /* i : Active frame counter */
		#endif
		const Word16 tdm_Pitch_reuse_flag, /* i : primary channel pitch reuse flag*/
		const Word16 tdm_LRTD_flag, /* i : LRTD stereo mode flag */
		const Word16 GSC_IVAS_mode /* i : GSC IVAS mode */