Commit 34832792 authored by vaillancour's avatar vaillancour
Browse files

Merge remote-tracking branch 'origin/main' into eval_complexity_0128

parents 1da44342 7ddadf2c

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ stages: 
.ivas-pytest-mld-anchor: &ivas-pytest-mld-anchor

  stage: test

  needs: ["build-codec-linux-make"]

  timeout: "120 minutes"

  timeout: "240 minutes"

  script:

    - *print-common-info

    - *update-scripts-repo

lib_com/common_api_types.h

+9 −0
Original line number Diff line number Diff line
@@ -149,6 +149,15 @@ typedef struct 


} IVAS_VECTOR3;



#ifdef IVAS_FLOAT_FIXED

typedef struct

{

    Word32 x_fx, y_fx, z_fx;

    Word16 x_qfact, y_qfact, z_qfact;



} IVAS_VECTOR3_FX;

#endif



typedef enum

{

    IVAS_HEAD_ORIENT_TRK_NONE,

lib_com/ivas_stereo_td_bit_alloc.c

+15 −5
Original line number Diff line number Diff line
@@ -521,14 +521,24 @@ void td_stereo_param_updt_fx( 
    }



    /* This is only to keep the buffer up-to-date */

    Word16 mult_factor = float_to_fix16( 0.8f, 15 );



    Word16 mult_factor = 26214/*0.8f in Q15*/;

    Word16 min_tdm_Pri_pitch_buf_fx = 0;

    Word16 Flag = 0;

    IF( flag_ACELP16k == 1 )

    {

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

        {

            tdm_Pri_pitch_buf_fx[i] = mult(pitch_buf_PCh_fx[i], mult_factor);

            tdm_Pri_pitch_buf_fx[i] = max( tdm_Pri_pitch_buf_fx[i], float_to_fix16( PIT_MIN, Q_var ) );

            min_tdm_Pri_pitch_buf_fx = s_min(tdm_Pri_pitch_buf_fx[i], min_tdm_Pri_pitch_buf_fx);

        }

        Flag = BASOP_Util_Cmp_Mant32Exp( L_deposit_l(min_tdm_Pri_pitch_buf_fx), 31 - Q_var, PIT_MIN, 31 );

        IF(Flag == -1)

        {

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

            {



                tdm_Pri_pitch_buf_fx[i] = s_max(tdm_Pri_pitch_buf_fx[i], shr(PIT_MIN, Q_var));

            }

        }

    }

    ELSE

lib_dec/ivas_tcx_core_dec.c

+1 −6
Original line number Diff line number Diff line
@@ -895,12 +895,7 @@ static void dec_prm_tcx( 


    if ( st->use_partial_copy == 0 )

    {

        getTCXparam( st, st, hm_cfg, param, bits_common, start_bit_pos, NULL, NULL, NULL, -1 );

        // Q-factor for hTcxLtpDec->tcxltp_gain is 15

        // To be removed later

        st->hTcxLtpDec->tcxltp_gain_float = fixedToFloat( st->hTcxLtpDec->tcxltp_gain, 15 );

        st->hTcxDec->tcxltp_last_gain_unmodified_float = st->hTcxLtpDec->tcxltp_gain_float;

        //

        getTCXparam_ivas( st, st, hm_cfg, param, bits_common, start_bit_pos, NULL, NULL, NULL, -1 );

    }



    if ( !st->use_partial_copy )

lib_rend/ivas_limiter.c

+24 −1
Original line number Diff line number Diff line
@@ -280,7 +280,30 @@ ivas_error ivas_limiter_open( 
    return IVAS_ERR_OK;

}

#endif

#ifdef IVAS_FLOAT_FIXED

/*-------------------------------------------------------------------*

 * ivas_limiter_close()

 *

 * Deallocate limiter struct

 *-------------------------------------------------------------------*/



void ivas_limiter_close(

    IVAS_LIMITER_HANDLE *phLimiter /* i/o: pointer to limiter handle, can be NULL  */

)

{

    IF ( phLimiter == NULL || *phLimiter == NULL )

    {

        return;

    }



    free( ( *phLimiter )->channel_ptrs );

    free( ( *phLimiter )->channel_ptrs_fx );

    free( *phLimiter );

    *phLimiter = NULL;



    return;

}

#else

/*-------------------------------------------------------------------*

 * ivas_limiter_close()

 *
@@ -302,7 +325,7 @@ void ivas_limiter_close( 


    return;

}



#endif



/*-------------------------------------------------------------------*

 * ivas_limiter_dec()