Commit e03174cc authored by norvell's avatar norvell
Browse files

Merge branch 'main' into ci/trigger-pytest-error-for-exceptions

parents 6c200ff1 12c27fc8

lib_com/bits_alloc.c

+10 −4
Original line number Diff line number Diff line
@@ -552,7 +552,9 @@ ivas_error config_acelp1( 
    const int16_t tdm_lp_reuse_flag,        /* i  : LPC reuse flag (can be 1 only with secondary channel */

    const int16_t tdm_low_rate_mode,        /* i  : secondary channel low rate mode flag */

    const int16_t idchan,                   /* i  : stereo channel ID               */

#ifndef NONBE_1325_TD_STEREO_QUANT_LSF_SEC

    const int16_t active_cnt, /* i  : Active frame counter            */

#endif

    const int16_t tdm_Pitch_reuse_flag, /* i  : primary channel pitch reuse flag*/

    const int16_t tdm_LRTD_flag,        /* i  : LRTD stereo mode flag           */

    const int16_t GSC_IVAS_mode         /* i  : GSC IVAS mode                   */
@@ -770,7 +772,11 @@ ivas_error config_acelp1( 


            bits -= acelp_cfg->mid_lsf_bits;

        }

#ifdef NONBE_1325_TD_STEREO_QUANT_LSF_SEC

        else if ( tdm_lp_reuse_flag == 1 && idchan == 1 )

#else

        else if ( tdm_lp_reuse_flag == 1 && idchan == 1 && active_cnt != 1 )

#endif

        {

            bits -= TDM_IC_LSF_PRED_BITS;

        }

lib_com/ivas_prot.h

+2 −0
Original line number Diff line number Diff line
@@ -2122,7 +2122,9 @@ void td_stereo_param_updt( 
    const float lsp_old_PCh[],                                  /* i  : primary channel old LSPs                */

    const float lsf_old_PCh[],                                  /* i  : primary channel old LSFs                */

    const float pitch_buf_PCh[],                                /* i  : primary channel pitch buffer            */

#ifndef NONBE_1325_TD_STEREO_QUANT_LSF_SEC

    float tdm_lspQ_PCh[],                                       /* o  : Q LSPs for primary channel              */

#endif

    float tdm_lsfQ_PCh[],                                       /* o  : Q LSFs for primary channel              */

    float tdm_Pri_pitch_buf[],                                  /* o  : pitch values for primary channel        */

    const int16_t flag_ACELP16k,                                /* i  : ACELP@16kHz flag                        */

lib_com/ivas_stereo_td_bit_alloc.c

+14 −4
Original line number Diff line number Diff line
@@ -443,7 +443,9 @@ void td_stereo_param_updt( 
    const float lsp_old_PCh[],   /* i  : primary channel old LSPs            */

    const float lsf_old_PCh[],   /* i  : primary channel old LSFs            */

    const float pitch_buf_PCh[], /* i  : primary channel pitch buffer        */

#ifndef NONBE_1325_TD_STEREO_QUANT_LSF_SEC

    float tdm_lspQ_PCh[], /* o  : Q LSPs for primary channel          */

#endif

    float tdm_lsfQ_PCh[],              /* o  : Q LSFs for primary channel          */

    float tdm_Pri_pitch_buf[],         /* o  : pitch values for primary channel    */

    const int16_t flag_ACELP16k,       /* i  : ACELP@16kHz flag                    */
@@ -456,14 +458,17 @@ void td_stereo_param_updt( 
    if ( tdm_use_IAWB_Ave_lpc == 1 )

    {

        mvr2r( IAWB_Ave, tdm_lsfQ_PCh, M );

#ifndef NONBE_1325_TD_STEREO_QUANT_LSF_SEC



        if ( tdm_lspQ_PCh != NULL )

        {

            lsf2lsp( tdm_lsfQ_PCh, tdm_lspQ_PCh, M, INT_FS_12k8 );

        }

#endif

    }

    else if ( flag_ACELP16k == 1 )

    {

#ifndef NONBE_1325_TD_STEREO_QUANT_LSF_SEC

        if ( tdm_lspQ_PCh != NULL )

        {

            mvr2r( lsp_old_PCh, tdm_lspQ_PCh, M );
@@ -472,18 +477,23 @@ void td_stereo_param_updt( 
        }

        else

        {

#endif

            float lsp_temp[M];

            mvr2r( lsp_old_PCh, lsp_temp, M );

            lsp_convert_poly( lsp_temp, L_FRAME, 0 );

            lsp2lsf( lsp_temp, tdm_lsfQ_PCh, M, INT_FS_12k8 );

#ifndef NONBE_1325_TD_STEREO_QUANT_LSF_SEC

        }

#endif

    }

    else

    {

#ifndef NONBE_1325_TD_STEREO_QUANT_LSF_SEC

        if ( tdm_lspQ_PCh != NULL )

        {

            mvr2r( lsp_old_PCh, tdm_lspQ_PCh, M );

        }

#endif

        mvr2r( lsf_old_PCh, tdm_lsfQ_PCh, M );

    }

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -177,6 +177,7 @@ 
#define NONBE_1244_FIX_SWB_BWE_MEMORY                   /* VA: issue 1244: fix to SWB BWE memory in case of switching from FB coding - pending a review by Huawei */ 

#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 NONBE_FIX_1326_MASA_EXTREND_CUSTOMLS_OUT        /* FhG: Fix crash for external renderer MASA to custom LS rendering, number of output channels not set correctly */

#define NONBE_1325_TD_STEREO_QUANT_LSF_SEC              /* Nokia: issue 1325: fix for usage of active_cnt variable in TD stereo LSFQ */



/* ##################### End NON-BE switches ########################### */

lib_com/prot.h

+17 −13
Original line number Diff line number Diff line
@@ -4551,7 +4551,9 @@ ivas_error acelp_core_dec( 
    int16_t *unbits,                     /* o  : number of unused bits               */

    int16_t *sid_bw,                     /* o  : 0-NB/WB, 1-SWB SID                  */

    STEREO_TD_DEC_DATA_HANDLE hStereoTD, /* i/o: TD stereo decoder handle            */

#ifndef NONBE_1325_TD_STEREO_QUANT_LSF_SEC

    const float tdm_lspQ_PCh[M], /* i  : Q LSPs for primary channel          */

#endif

    const float tdm_lsfQ_PCh[M],      /* i  : Q LSFs for primary channel          */

    const int16_t use_cldfb_for_dft,  /* i  : flag to use of CLDFB for DFT Stereo */

    const int16_t last_element_mode,  /* i  : last element mode                   */
@@ -9113,7 +9115,9 @@ ivas_error config_acelp1( 
    const int16_t tdm_lp_reuse_flag,        /* i  : LPC reuse flag (can be 1 only with secondary channel*/

    const int16_t tdm_low_rate_mode,        /* i  : secondary channel low rate mode flag*/

    const int16_t idchan,                   /* i  : channel id                          */

#ifndef NONBE_1325_TD_STEREO_QUANT_LSF_SEC

    const int16_t active_cnt, /* i  : Active frame counter                */

#endif

    const int16_t tdm_Pitch_reuse_flag, /* i  : primary channel pitch reuse flag    */

    const int16_t tdm_LRTD_flag,        /* i  : LRTD stereo mode flag               */

    const int16_t GSC_IVAS_mode         /* i  : GSC IVAS mode                       */