Commit eb062fd8 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'main' into ci/improve-be-and-regression-checks

parents 4535432e 20cb1008

.gitlab-ci.yml

+5 −3
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ variables: 
  PRM_FILES: "scripts/config/self_test.prm scripts/config/self_test_ltv.prm"

  TESTCASE_TIMEOUT_STV: 900

  TESTCASE_TIMEOUT_LTV: 2400

  TESTCASE_TIMEOUT_LTV_SANITIZERS: 7200

  TESTCASE_TIMEOUT_LTV_SANITIZERS: 10800

  CI_REGRESSION_THRESH_MLD: "0.1"

  CI_REGRESSION_THRESH_MAX_ABS_DIFF: "50"

  CI_REGRESSION_THRESH_SSNR: "-1"
@@ -610,7 +610,7 @@ stages: 
.ivas-pytest-sanitizers-anchor: &ivas-pytest-sanitizers-anchor

  stage: test

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

  timeout: "420 minutes"

  timeout: "600 minutes"

  rules:

    - if: $CI_PIPELINE_SOURCE == 'push'

      when: never
@@ -1428,7 +1428,9 @@ voip-be-on-merge-request: 
  - public_dir="$CI_JOB_NAME-public"



  # if is needed to catch case when no artifact is there (first run), similarly as above

  - if [[ -d $public_dir ]]; then

  # 1. check for public_dir being there as this might not be the case when artifact download failed

  # 2. check for public dir not being empty - handle job failures in prev job that happen after the dir is created. In that case, the empty dir is in the artifacts

  - if [ -d $public_dir ] && [ ! -z "$( ls -A $public_dir )" ]; then

  -   mv $public_dir/* wmops/

  # check here if we have the split-by-levels files present - if not, fake them up with the existing global one

  # this is needed for the first run with split graphs on a branch where the global version did run previously

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ 
#define FIX_ISSUE_1185                          /* Ittiam: Fix for issue 1185: Assertion in ivas_dirac_dec_binaural_internal_fx() for crash in decoder in fft30_with_cmplx_data()*/

#define FIX_ISSUE_1209                          /* Ittiam: Fix for issue 1209: Assertion exit in BASOP encoder (stereo_dmx_evs)*/

#define FIX_ISSUE_1218                          /* Ittiam: Fix for issue 1218: Assert in stereo_dft_generate_comfort_noise_fx of BASOP decoder with BASOP MASA DTX bitstream at 32 kbps*/

#define FIX_ISSUE_1290                          /* Ittiam: Fix for issue 1218: Assert in stereo_dft_generate_comfort_noise_fx of BASOP decoder with BASOP MASA DTX bitstream at 32 kbps*/

#define IVAS_ISSUE_1188_EVS_CRASH               /* Ittiam: Fix for issue 1188: Issue due to ASAN */

#define FIX_ISSUE_1155                          /* Ittiam: Fix for issue 1155: Encoder crash for Stereo at 32kbps in PostShortTerm_ivas_enc_fx()*/

#define FIX_1010_OPT_DIV                        /* FhG: SVD complexity optimizations (non-be) */
@@ -160,4 +161,5 @@ 
#define SVD_WMOPS_OPT                           /* Ittiam : SVD related optimizations */

#define NONBE_FIX_1087_OOB_SBA_DTX_RS           /* VA: issue 1087: Extend the length of the buffer for MCT decoding to avoid out-of-bound writing in SBA SID bitrate switching decoding */

#define FIX_ISSUE_1279                          /* VA: correction of wrong scaling update */

#define FIX_ISSUE_1247

#endif

lib_com/prot_fx.h

+1 −1
Original line number Diff line number Diff line
@@ -6641,7 +6641,7 @@ void nb_post_filt_fx( 
    const Word16 tmp_noise,  /* i  : noise energy                       Q0   */

    Word16 *Synth,           /* i  : 12k8 synthesis                    Qsyn  */

    const Word16 *Aq,        /* i  : LP filter coefficient             Q12   */

    const Word16 *Pitch_buf, /* i  : Fractionnal subframe pitch buffer Q6    */

    const Word16 *Pitch_buf, /* i  : Fractionnal subframe pitch buffer Q0    */

    const Word16 coder_type, /* i  : coder_type                              */

    const Word16 BER_detect, /* i  : BER detect flag                         */

    const Word16 disable_hpf /* i  : flag to diabled HPF                     */

lib_dec/acelp_core_dec_ivas_fx.c

+7 −3
Original line number Diff line number Diff line
@@ -802,7 +802,11 @@ ivas_error acelp_core_dec_ivas_fx( 
            Copy_Scale_sig( syn1_fx, temp_buf_fx, st->L_frame, sub( -1, st->Q_syn ) ); // Q_syn

            IF( st->hBWE_FD != NULL )

            {

#ifdef FIX_ISSUE_1290

                save_old_syn_fx( st->L_frame, temp_buf_fx, old_syn_12k8_16k_fx, st->hBWE_FD->old_syn_12k8_16k_fx, st->preemph_fac, &st->hBWE_FD->mem_deemph_old_syn_fx );

#else

                save_old_syn_fx( st->L_frame, syn1_fx, old_syn_12k8_16k_fx, st->hBWE_FD->old_syn_12k8_16k_fx, st->preemph_fac, &st->hBWE_FD->mem_deemph_old_syn_fx );

#endif

            }

        }
@@ -1247,7 +1251,7 @@ ivas_error acelp_core_dec_ivas_fx( 
             *------------------------------------------------------------*/





            Copy_Scale_sig( pitch_buf_fx, pitch_buf_tmp, NB_SUBFR16k, -Q6 ); // Q0

            Copy_Scale_sig( pitch_buf_fx, pitch_buf_tmp, st->nb_subfr, -Q6 ); // Q0

            FEC_scale_syn_ivas_fx( st->L_frame, &update_flg, st->clas_dec, st->last_good, psyn_fx, pitch_buf_tmp, st->enr_old_fx, enr_q_fx, st->coder_type, LSF_Q_prediction,

                                   &st->scaling_flag, &st->lp_ener_FEC_av, &st->lp_ener_FEC_max, st->bfi, st->total_brate, st->prev_bfi, st->last_core_brate,

                                   exc_fx, exc2_fx, Aq_fx, &st->old_enr_LP, mem_tmp_fx, st->mem_syn2_fx, st->Q_exc, st->Q_syn, avoid_lpc_burst_on_recovery, 0 );
@@ -1405,7 +1409,7 @@ ivas_error acelp_core_dec_ivas_fx( 
        test();

        IF( EQ_32( st->total_brate, ACELP_7k20 ) || EQ_32( st->total_brate, ACELP_8k00 ) )

        {

            Copy_Scale_sig( pitch_buf_fx, pitch_buf_tmp, NB_SUBFR16k, -Q6 ); // Q0

            Copy_Scale_sig( pitch_buf_fx, pitch_buf_tmp, st->nb_subfr, -Q6 ); // Q0



            FEC_scale_syn_ivas_fx( st->L_frame, &update_flg, st->clas_dec, st->last_good, psyn_fx, pitch_buf_tmp, st->enr_old_fx, enr_q_fx, st->coder_type, LSF_Q_prediction,

                                   &st->scaling_flag, &st->lp_ener_FEC_av, &st->lp_ener_FEC_max, st->bfi, st->total_brate, st->prev_bfi, st->last_core_brate,
@@ -1442,7 +1446,7 @@ ivas_error acelp_core_dec_ivas_fx( 
    test();

    IF( st->last_bwidth == NB && st->hPFstat != NULL )

    {

        Copy( pitch_buf_fx, pitch_buf_tmp, NB_SUBFR16k );

        Copy_Scale_sig( pitch_buf_fx, pitch_buf_tmp, st->nb_subfr, -Q6 ); // Q0

        IF( st->bwidth == NB )

        {

            st->hPFstat->on = 1;

lib_dec/dec_post_fx.c

+4 −4
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ void nb_post_filt_fx( 
    const Word16 tmp_noise,  /* i  : noise energy                       Q0   */

    Word16 *Synth,           /* i  : 12k8 synthesis                    Qsyn  */

    const Word16 *Aq,        /* i  : LP filter coefficient             Q12   */

    const Word16 *Pitch_buf, /* i  : Fractionnal subframe pitch buffer Q6    */

    const Word16 *Pitch_buf, /* i  : Fractionnal subframe pitch buffer Q0    */

    const Word16 coder_type, /* i  : coder_type                              */

    const Word16 BER_detect, /* i  : BER detect flag                         */

    const Word16 disable_hpf /* i  : flag to diabled HPF                     */
@@ -142,7 +142,7 @@ void nb_post_filt_fx( 
    move16();

    FOR( i = 0; i < L_frame; i += L_SUBFR )

    {

        T0_first = Pitch_buf[j]; // Q6

        T0_first = Pitch_buf[j]; // Q0

        move16();

        Dec_postfilt_fx( hPFstat, T0_first, &Pf_in[i], p_Aq, &Synth[i], Post_G1, Post_G2, Gain_factor, disable_hpf );
@@ -179,7 +179,7 @@ void nb_post_filt_fx( 
 *----------------------------------------------------------------------------*/

static void Dec_postfilt_fx(

    PFSTAT_HANDLE hPFstat,    /* i : core decoder parameters */

    const Word16 t0,          /* i  : pitch delay given by coder Q6                   */

    const Word16 t0,          /* i  : pitch delay given by coder Q0                   */

    const Word16 *signal_ptr, /* i  : input signal (pointer to current subframe Q0    */

    const Word16 *coeff,      /* i  : LPC coefficients for current subframe Q12        */

    Word16 *sig_out,          /* o  : postfiltered output                          Q15*/
@@ -749,7 +749,7 @@ static void modify_pst_param_fx( 
 * Perform harmonic postfilter

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

static void pst_ltp_fx(

    Word16 t0,            /* i  : pitch delay given by coder Q6       */

    Word16 t0,            /* i  : pitch delay given by coder Q0       */

    Word16 *ptr_sig_in,   /* i  : postfilter i  filter (residu2) Qx   */

    Word16 *ptr_sig_pst0, /* o  : harmonic postfilter o Qx           */

    Word16 gain_factor    /* i  : Gain Factor (Q15)                */