CodeFileLineColumn (4d29115f) · Commits · SA4 / Audio / IVAS BASOP

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -119,7 +119,6 @@
		#define FIX_2261_REMOVE_LP_RESCALING /* VA: Remove of unnecessary lpc coefficient rescaling */

		#define FIX_2338_HARM_GSC_GAIN_COMP /* VA: basop issue 2338: harmonization of band gain computation for both EVS and IVAS */
		#define FIX_2338_HARM_GSC_GAIN_COMP_PART2 /* VA: basop issue 2338: harmonization of band gain computation for both EVS and IVAS, reducing MLD regressions */
		/* ##################### End NON-BE switches ########################### */

		/* #################### Start BASOP optimization switches ############################ */

lib_com/prot_fx.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -7944,9 +7944,6 @@ void LD_music_post_filter_fx(
		Word16 Old_ener_Q, / i/o: Old energy scaling factor */
		const Word16 coder_type, /* i : Coder type : -1 in case of IO Q0 */
		const Word16 Last_coder_type, /* i : i scaling Q0 */
		#ifdef FIX_2338_HARM_GSC_GAIN_COMP_PART2
		const Word16 element_mode, /* i : IVAS element mode Q0 */
		#endif
		const Word16 Qdct /* i : i scaling Q0 */
		);

lib_dec/LD_music_post_filter_fx.c

+1 −16

Original line number	Diff line number	Diff line
		@@ -48,9 +48,6 @@ void LD_music_post_filter_fx(
		Word16 Old_ener_Q, / i/o : Old energy scaling factor */
		const Word16 coder_type, /* i : Coder type : -1 in case of IO Q0 */
		const Word16 Last_coder_type, /* i : input scaling Q0 */
		#ifdef FIX_2338_HARM_GSC_GAIN_COMP_PART2
		const Word16 element_mode, /* i : IVAS element mode Q0 */
		#endif
		const Word16 Qdct /* i : input scaling Q0 */
		)
		{
		@@ -72,9 +69,6 @@ void LD_music_post_filter_fx(
		Word16 mant, exp1, s_ave, tmp16, old_tmp16;
		Word16 diff_sc;
		Word16 old_tmp16_1;
		#ifdef FIX_2338_HARM_GSC_GAIN_COMP_PART2
		Word16 previous_flag;
		#endif
		move16();
		move16();
		move16();
		@@ -99,17 +93,8 @@ void LD_music_post_filter_fx(
		/------------------------------------------------------------------------
		* Find signal classification
		------------------------------------------------------------------------/
		#ifdef FIX_2338_HARM_GSC_GAIN_COMP_PART2
		previous_flag = hMusicPF->LDm_last_music_flag;
		#endif
		music_flag2 = stab_est_fx( LG_etot, hMusicPF->LDm_lt_diff_etot_fx, &hMusicPF->LDm_mem_etot_fx, &hMusicPF->LDm_nb_thr_3, &hMusicPF->LDm_nb_thr_1, hMusicPF->LDm_thres_fx, &hMusicPF->LDm_last_music_flag, 1 );
		#ifdef FIX_2338_HARM_GSC_GAIN_COMP_PART2
		/* delay going back to 0 by one frame, prevent single frame switching during audio segment */
		if ( EQ_16( Last_coder_type, AUDIO ) && EQ_16( coder_type, AUDIO ) && EQ_16( previous_flag, 1 ) && music_flag2 == 0 && element_mode > EVS_MONO )
		{
		music_flag2 = previous_flag;
		}
		#endif

		test();
		if ( LT_32( core_brate, ACELP_6k60 ) \|\| NE_16( Last_coder_type, AUDIO ) )
		{

lib_dec/acelp_core_dec_fx.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -1213,11 +1213,8 @@ ivas_error acelp_core_dec_fx(
		}

		/* LD music post-filter */
		#ifdef FIX_2338_HARM_GSC_GAIN_COMP_PART2
		LD_music_post_filter_fx( st->hMusicPF, dct_buffer_fx, dct_buffer_fx, st->core_brate, &st->hMusicPF->Old_ener_Q, AUDIO, last_coder_type, st->element_mode, qdct );
		#else
		LD_music_post_filter_fx( st->hMusicPF, dct_buffer_fx, dct_buffer_fx, st->core_brate, &st->hMusicPF->Old_ener_Q, AUDIO, last_coder_type, qdct );
		#endif

		/* Inverse DCT transform, retrieval of the aligned excitation, re-synthesis */
		IF( NE_16( st->element_mode, EVS_MONO ) ) // VE: TBC whether needed in IVAS
		{

lib_dec/amr_wb_dec_fx.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -586,11 +586,8 @@ ivas_error amr_wb_dec_fx(
		Prep_music_postP_fx( exc_buffer_fx, dct_buffer_fx, hMusicPF->filt_lfE_fx, st_fx->last_core, st_fx->element_mode, pitch_buf_fx, hMusicPF->LDm_enh_lp_gbin_fx, st_fx->Q_exc, &Qdct );

		/* LD music post-filter */
		#ifdef FIX_2338_HARM_GSC_GAIN_COMP_PART2
		LD_music_post_filter_fx( hMusicPF, dct_buffer_fx, dct_buffer_fx, st_fx->core_brate, &hMusicPF->Old_ener_Q, -1, tmp_coder_type, EVS_MONO, Qdct );
		#else
		LD_music_post_filter_fx( hMusicPF, dct_buffer_fx, dct_buffer_fx, st_fx->core_brate, &hMusicPF->Old_ener_Q, -1, tmp_coder_type, Qdct );
		#endif

		/* Inverse DCT transform, retrieval of the aligned excitation, re-synthesis */
		Post_music_postP_fx( dct_buffer_fx, exc2_fx, mem_tmp_fx, st_fx->mem_syn2_fx, Aq_fx, syn_fx, &st_fx->Q_exc, &st_fx->prev_Q_syn,
		&st_fx->Q_syn, st_fx->mem_syn_clas_estim_fx, 1, &st_fx->mem_deemph_fx, hBPF->pst_old_syn_fx,