Commit ec64607a authored May 04, 2026 by Manuel Jander

Fix another 2 cases of norm_s( 0 ) returns 0. Use norm_arr( , 1 ) instead.

parent c86cf6c0

lib_enc/ivas_core_pre_proc_front_fx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -756,7 +756,7 @@ void pre_proc_front_ivas_fx(
		/* Avoid saturation of resampling/delay decimation buffer. */
		shift = s_min( shift, st->q_mem_decim16k_fx );
		#ifdef NONBE_FIX_ISSUE_2569
		shift = s_min( shift, add( -1, norm_s( st->mem_preemph16k_fx ) ) );
		shift = s_min( shift, add( -1, norm_arr( &st->mem_preemph16k_fx, 1 ) ) );
		#endif

		/* Limit Q_new here to st->q_inp because inside ivas_compute_core_buffers_fx() st->input is rescaled to Q_new */

lib_enc/ivas_core_pre_proc_fx.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -706,7 +706,11 @@ void pre_proc_ivas_fx(
		#ifdef NONBE_FIX_ISSUE_2206
		// L_FRAME16k + L_SUBFR + L_FRAME16k + L_NEXT_MAX_16k + 320 );
		tmp = add( norm_arr( wsp_fx, L_FRAME + L_LOOK_12k8 ), sub( Q15, e_old_wsp ) );
		#ifdef NONBE_FIX_ISSUE_2569
		tmp = s_min( tmp, add( norm_arr( &st->mem_wsp_enc, 1 ), sub( Q15, st->exp_buf_wspeech_enc ) ) );
		#else
		tmp = s_min( tmp, add( norm_s( st->mem_wsp_enc ), sub( Q15, st->exp_buf_wspeech_enc ) ) );
		#endif
		tmp = s_min( tmp, add( norm_arr( st->buf_wspeech_enc, (Word16) ( st->wspeech_enc - st->buf_wspeech_enc ) ), sub( Q15, st->exp_buf_wspeech_enc ) ) );
		tmp = s_min( tmp, add( norm_arr( st->wspeech_enc + L_FRAME + L_LOOK_12k8, /* L_NEXT_MAX_16k + */ 320 ), sub( Q15, st->exp_buf_wspeech_enc ) ) );
		tmp = s_min( Q15, tmp );

lib_enc/updt_enc_fx.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -61,7 +61,6 @@ void updt_enc_fx(
		tmp = s_min( tmp, norm_s( hLPDmem->mem_w0 ) );
		#endif
		tmp = s_min( tmp, sub( 15, hLPDmem->q_mem_syn ) );
		// tmp = sub( tmp, 1 );
		scale_sig( hLPDmem->mem_syn, M, tmp );
		scale_sig( hLPDmem->mem_syn1_fx, M, tmp );
		scale_sig( hLPDmem->mem_syn2, M, tmp );