Commit 3b94e993 authored by multrus's avatar multrus
Browse files

Merge branch '20260324_cleanup' into 'main' 

20260324 cleanup

See merge request !2900
parents 2d8cbe5e 99df4394

lib_com/options.h

+0 −7
Original line number Diff line number Diff line
@@ -84,11 +84,6 @@ 
#define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR      /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */

#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */

#define HARM_HQ_CORE_KEEP_BE                            /* hack to keep all BE after HQ core functions harmonization; pending resolving issues #2450, #2451, #2452 */

#define FIX_BASOP_2457_HARM_GEN                         /* FhG: harmonization of function generate_comfort_noise_dec_hf_ivas_fx()*/

#define FIX_BASOP_2478_HARM_ENC_PRM_HM                  /* FhG: basop issue 2478: harmonize enc_prm_hm() and enc_prm_hm_ivas_fx() */

#define FIX_2455_HARMONIZE_generate_comfort_noise_enc   /* FhG: harmonize generate_comfort_noise_enc and generate_comfort_noise_enc_ivas */

#define FIX_2455_HARMONIZE_configureFdCngEnc            /* FhG: harmonize generate_comfort_noise_enc and generate_comfort_noise_enc_ivas */

#define FIX_2463_EVS_BWE_LSF                            /* VA: basop issue 2463: harmonize calling of Quant_BWE_LSF_fx() */

#define FIX_2452_HQ_CORE_PEAQ_AVR_RATIO_HARM            /* Eri: Basop issue 2453: Fix alignment of peak_avrg_ratio_fx */

#define FIX_2480_HARM_TONALMDCT                         /* FhG: basop issue 2480: Harmonize TonalMDCTConceal_Detect_fx() and TonalMDCTConceal_Detect_ivas_fx() */

#define FIX_2479_HARM_PITCH_GAIN                        /* FhG: basop issue 2479: Harmonize tcx_ltp_pitch_search_*(), tcx_ltp_find_gain_*fx() */
@@ -99,8 +94,6 @@ 
/* #################### Start NON-BE switches ############################ */

/* any switch which is non-be wrt. TS 26.251 V3.0 */



#define FIX_BASOP_2451_HQ_FEC_SELECTOR                  /* Eri: Resolve basop issue 2451, wrong condition on env_stab_plc_fx */

#define FIX_2398_PRECISSION_ORIENTATION_TRACKING        /* FhG: use refinement of Sqrt32 within certain functions*/

#define FIX_BASOP_2486_HQ_FINE_GAIN_ALIGNMENT           /* Eri: Basop issue 2486: IVAS BASOP used calculations with truncation, EVS BASOP used rounding. This aligns the use of a table lookup. */

#define FIX_1543_MID_LSF_BITS                           /* VA: float issue 1543: Resolve "MSAN: use-of-uninitialized-value in lib_enc/lsf_enc.c:262:5 for EVS encoder" */

#define FIX_2488_PREVENT_NEG_PITCH                      /* VA: Fix for 2488, use saturation to prevent possible wrap-around, thus negative pitch values */

lib_com/prot_fx.h

+0 −16
Original line number Diff line number Diff line
@@ -6620,15 +6620,6 @@ void generate_comfort_noise_dec_ivas_fx( 
    const Word16 nchan_out /* i  : number of output channels     */

);



#ifndef FIX_BASOP_2457_HARM_GEN

void generate_comfort_noise_dec_hf_ivas_fx(

    Word32 **bufferReal,         /* o   : matrix to real part of input bands   bufferScale*/

    Word32 **bufferImag,         /* o   : matrix to imaginary part of input bands  bufferScale*/

    Word16 *bufferScale,         /* o   : pointer to scalefactor for real and imaginary part of input bands */

    HANDLE_FD_CNG_COM hFdCngCom, /* i/o: FD_CNG structure containing all buffers and variables  */

    const Word16 cng_coh_flag    /* i  : CNG Flag for coherence handling                        Q0*/

);

#endif



void generate_comfort_noise_dec_hf_fx(

    Word32 **bufferReal, /* o   : matrix to real part of input bands   bufferScale*/
@@ -9791,13 +9782,6 @@ void core_coder_mode_switch_ivas_fx( 
    const Word16 MCT_flag          /* i  : hMCT handle allocated (1) or not (0)*/

);



#ifndef FIX_2455_HARMONIZE_configureFdCngEnc

void configureFdCngEnc_ivas_fx(

    HANDLE_FD_CNG_ENC hFdCngEnc, /* i/o: Contains the variables related to the FD-based CNG process */

    const Word16 bwidth,         /* Q0 */

    const Word32 total_brate     /* Q0 */

);

#endif



void SetModeIndex_ivas_fx(

    Encoder_State *st,              /* i  : Encoder state                          */

lib_com/window_ola_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -304,11 +304,7 @@ void window_ola_fx( 
            p4 = oldgapsynth + n;

            FOR( i = 0; i < temp; i++ )

            {

#ifdef FIX_BASOP_2451_HQ_FEC_SELECTOR

                *p1 = add_sat( mult( *p1, *p2 ), mult( *p4, *p3 ) ); /*   auOut[i]*SS2[i]+ oldgapsynth[i+n]*(SS2[L-n-i-1]);*/

#else

                *p1 = add( mult( *p1, *p2 ), mult( *p4, *p3 ) ); /*   auOut[i]*SS2[i]+ oldgapsynth[i+n]*(SS2[L-n-i-1]);*/

#endif

                move16();

                p1++;

                p2++;

lib_dec/FEC_HQ_phase_ecu_fx.c

+0 −32
Original line number Diff line number Diff line
@@ -3301,42 +3301,10 @@ void hq_ecu_fx( 
    test();

    test();

    test();

#ifdef FIX_BASOP_2451_HQ_FEC_SELECTOR

    evs_mode_selection = ( GE_32( st_fx->total_brate, 48000 ) && ( GE_16( output_frame, L_FRAME16k ) && !prev_bfi && ( !old_is_transient[0] || old_is_transient[1] ) &&

                                                                   ( ph_ecu_HqVoicing || ( ( ( NE_16( hHQ_core->env_stab_plc_fx, 0 ) ) && ( LT_16( corr, 19661 ) /* 0.6 in Q15 */ ) ) || ( !( NE_16( hHQ_core->env_stab_plc_fx, 0 ) ) && ( GT_16( corr, 27853 ) /* 0.85 in Q15 */ ) ) ) ) ) ) ||

                         ( LT_32( st_fx->total_brate, 48000 ) && ( ( ph_ecu_HqVoicing || GT_16( corr, 27853 ) /* 0.85 in Q15 */ ) && !prev_bfi && ( !old_is_transient[0] || old_is_transient[1] ) ) );



#else

    evs_mode_selection = ( GE_32( st_fx->total_brate, 48000 ) && ( GE_16( output_frame, L_FRAME16k ) && !prev_bfi && ( !old_is_transient[0] || old_is_transient[1] ) &&

                                                                   ( ph_ecu_HqVoicing || ( ( ( GT_16( hHQ_core->env_stab_plc_fx, 16384 ) /* 0.5 in Q15 */ ) && ( LT_16( corr, 19661 ) /* 0.6 in Q15 */ ) ) || ( LT_16( hHQ_core->env_stab_plc_fx, 16384 ) /* 0.5 in Q15 */ && ( GT_16( corr, 27853 ) /* 0.85 in Q15 */ ) ) ) ) ) ) ||

                         ( LT_32( st_fx->total_brate, 48000 ) && ( ( ph_ecu_HqVoicing || GT_16( corr, 27853 ) /* 0.85 in Q15 */ ) && !prev_bfi && ( !old_is_transient[0] || old_is_transient[1] ) ) );

#endif



#ifndef FIX_BASOP_2451_HQ_FEC_SELECTOR

#ifdef HARM_HQ_CORE_KEEP_BE

    IF( st_fx->element_mode == EVS_MONO )

    {

        test();

        test();

        test();

        test();

        test();

        test();

        test();

        test();

        test();

        test();

        test();

        test();

        test();

        test();

        test();

        evs_mode_selection = ( GE_32( st_fx->total_brate, 48000 ) && ( GE_16( output_frame, L_FRAME16k ) && !prev_bfi && ( !old_is_transient[0] || old_is_transient[1] ) &&

                                                                       ( NE_16( ph_ecu_HqVoicing, 0 ) || ( ( ( NE_16( hHQ_core->env_stab_plc_fx, 0 ) ) && ( LT_16( corr, 19661 ) ) ) || ( !( NE_16( hHQ_core->env_stab_plc_fx, 0 ) ) && ( GT_16( corr, 27853 ) ) ) ) ) ) ) ||

                             ( LT_32( st_fx->total_brate, 48000 ) && ( ( ph_ecu_HqVoicing || GT_16( corr, 27853 ) ) && !prev_bfi && ( !old_is_transient[0] || old_is_transient[1] ) ) );

    }

#endif

#endif



    test();

    ivas_mode_selection = ( LT_16( N, PH_ECU_N_LIMIT ) ) || ( LT_16( corr, PH_ECU_CORR_LIMIT_Q15 ) );

lib_dec/acelp_core_dec_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -1985,11 +1985,7 @@ ivas_error acelp_core_dec_fx( 
                {

                    Word16 tmpBufferScale = 0;

                    move16();

#ifndef FIX_BASOP_2457_HARM_GEN

                    generate_comfort_noise_dec_hf_ivas_fx( realBuffer_fx, imagBuffer_fx, /*realBuffer, imagBuffer,*/ &tmpBufferScale, st->hFdCngDec->hFdCngCom, st->cng_ism_flag );

#else

                    generate_comfort_noise_dec_hf_fx( realBuffer_fx, imagBuffer_fx, /*realBuffer, imagBuffer,*/ &tmpBufferScale, st );

#endif // !FIX_BASOP_2457_HARM_GEN





                    FOR( i = 0; i < st->hFdCngDec->hFdCngCom->numSlots; i++ )