Commit 9b0bb393 authored Jan 22, 2026 by vaillancour

proposition to harm. find_wsp

parent a9c6f8d8

lib_com/options.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -101,6 +101,7 @@
		#define FIX_BASOP_2332_ASAN_OVERFLOW_IN_EXT_DIRAC_REND /* Nokia: basop issue 2332: Uses predefined memory sizes instead computing wrong */
		#define FIX_BASOP_2333_MCMASA_ANA_MEMORY_LEAK /* Nokia: basop issue 2333: Add missing free for direction_vector_e to ivas_mcmasa_ana_fx.c */
		#define HARM_COREDECODER_FUNCTIONS /* VA: basop issue 2347: Remove various duplicated code in core-decoder */
		#define FIX_2363_FIND_WSP /* VA: basop issue 2363 : harmonizing find_wsp function */

		/* #################### End BE switches ################################## */

lib_com/prot_fx.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -11010,7 +11010,7 @@ void bands_and_bit_alloc_ivas_fx(
		const Word16 element_mode, /* i : element mode */
		const Word16 GSC_IVAS_mode /* i : GSC IVAS mode */
		);

		#ifndef FIX_2363_FIND_WSP
		void ivas_find_wsp_fx(
		const Word16 L_frame, /* i : length of the frame Q0*/
		const Word16 L_subfr, /* i : length of subframe Q0*/
		@@ -11024,7 +11024,7 @@ void ivas_find_wsp_fx(
		const Word16 gamma, /* i : weighting factor Q15 */
		const Word16 L_look /* i : look-ahead Q0*/
		);

		#endif
		Word16 RCcontextMapping_encode2_estimate_bandWise_start_fx(
		Word16 x, / Q0 */
		const Word16 nt, /* Q0 */

lib_enc/find_wsp_fx.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -77,7 +77,7 @@ void find_wsp_fx(
		deemph_fx( &wsp[L_frame], preemph_fac, lookahead, &wtmp );
		}
		}

		#ifndef FIX_2363_FIND_WSP
		/-------------------------------------------------------------------
		* ivas_find_wsp_fx()
		*
		@@ -134,3 +134,4 @@ void ivas_find_wsp_fx(
		deemph_fx( &wsp_fx[L_frame], tilt_fact, L_look, &tmp_fx );
		return;
		}
		#endif
		No newline at end of file

lib_enc/ivas_core_pre_proc_front_fx.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -1085,9 +1085,11 @@ ivas_error pre_proc_front_ivas_fx(
		st->mem_wsp_q = *Q_new;
		move16();
		move16();

		#ifndef FIX_2363_FIND_WSP
		ivas_find_wsp_fx( L_FRAME, L_SUBFR, NB_SUBFR, A_fx, Aw_fx, inp_12k8_fx, TILT_FAC_FX, wsp_fx, &st->mem_wsp_fx, GAMMA1, L_LOOK_12k8 );

		#else
		find_wsp_fx( A_fx, inp_12k8_fx, wsp_fx, &st->mem_wsp_fx, TILT_FAC_FX, L_FRAME, L_LOOK_12k8, L_SUBFR, Aw_fx, GAMMA1, NB_SUBFR );
		#endif
		Word16 Q_wsp = *Q_new;
		move16();
		IF( st->vad_flag == 0 )

lib_enc/ivas_core_pre_proc_fx.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -1251,8 +1251,11 @@ ivas_error ivas_compute_core_buffers_fx(
		/--------------------------------------------------------------
		* Compute Weighted Input
		---------------------------------------------------------------/

		#ifndef FIX_2363_FIND_WSP
		ivas_find_wsp_fx( L_FRAME16k, L_SUBFR, NB_SUBFR16k, A_fx, Aw_fx, st->speech_enc_pe, PREEMPH_FAC_16k, st->wspeech_enc, &st->mem_wsp_enc, st->gamma, L_LOOK_16k );
		#else
		find_wsp_fx( A_fx, st->speech_enc_pe, st->wspeech_enc, &st->mem_wsp_enc, PREEMPH_FAC_16k, L_FRAME16k, L_LOOK_16k, L_SUBFR, Aw_fx, st->gamma, NB_SUBFR16k );
		#endif
		}

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