Commit 0b97c8ed authored by Mohammadreza Naghibzadeh's avatar Mohammadreza Naghibzadeh
Browse files

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

Merge remote-tracking branch 'origin/main' into basop-2491-decoding-MDCT-stereo-64-kbps-with-JBM-introduces-click
parents 460aac07 3007be98

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ 
/* #################### Start NON-BE switches ############################ */

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



#define FIX_BASOP_2469_OBJ_EDIT_TD_REND_GAIN            /* Eri: Basop issue 2469: TD renderer gain has wrong Q and does not support the object editing gain range */

#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_rend/ivas_objectRenderer_fx.c

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

                return error;

            }

#ifdef FIX_BASOP_2469_OBJ_EDIT_TD_REND_GAIN

            if ( ( error = TDREND_MIX_SRC_SetGain( hBinRendererTd, nS, hIsmMetaData[nS]->gain_fx ) ) != IVAS_ERR_OK )

#else

            if ( ( error = TDREND_MIX_SRC_SetGain( hBinRendererTd, nS, hIsmMetaData[nS]->gain_fx ) ) != IVAS_ERR_OK ) // TODO: Check Gain has correct Q-value

#endif

            {

                return error;

            }

lib_rend/ivas_objectRenderer_mix_fx.c

+6 −0
Original line number Diff line number Diff line
@@ -177,8 +177,14 @@ ivas_error TDREND_MIX_Init_fx( 
)

{

    ivas_error error;

#ifdef FIX_BASOP_2469_OBJ_EDIT_TD_REND_GAIN

    hBinRendererTd->Gain_fx = ONE_IN_Q29;

    move32();

#else

    hBinRendererTd->Gain_fx = ONE_IN_Q14;

    move16();

#endif



    /* Init source list */

    /* Spatial settings */

    IF( MixSpatSpec_p != NULL )

lib_rend/ivas_objectRenderer_sfx_fx.c

+34 −3
Original line number Diff line number Diff line
@@ -278,8 +278,14 @@ void TDREND_firfilt_fx( 
    Word32 *mem_fx,                /* i/o: filter memory                    Qx */

    const Word16 subframe_length,  /* i  : Length of signal                 Q0 */

    const Word16 filterlength,     /* i  : Filter length                    Q0 */

#ifdef FIX_BASOP_2469_OBJ_EDIT_TD_REND_GAIN

    const Word32 Gain_fx,    /* i  : Gain                            Q29 */

    const Word32 prevGain_fx /* i  : Previous gain                   Q29 */

#else

    const Word32 Gain_fx,    /* i  : Gain                            Q30 */

    const Word32 prevGain_fx /* i  : Previous gain                   Q30 */

#endif



)

{

    /* NOTE: this function is implemented with the assumption that the exponent/Q-factor of input signal will not change. */
@@ -289,15 +295,30 @@ void TDREND_firfilt_fx( 
    Word32 *p_filter_fx;                                                      // exp(filter_e)

    Word16 i, j;

    Word32 tmp_fx;

#ifdef FIX_BASOP_2469_OBJ_EDIT_TD_REND_GAIN

    Word32 step_fx /* Q29 */, gain_tmp_fx /* Q29 */, gain_delta_fx /* Q29 */;

#else

    Word32 step_fx /* Q31 */, gain_tmp_fx /* Q31 */, gain_delta_fx /* Q30 */;

#endif

    Word16 tmp_e;

    Word64 tmp64_fx;

    Word16 shift = sub( filter_e, 32 );

#ifdef FIX_BASOP_2469_OBJ_EDIT_TD_REND_GAIN

    gain_delta_fx = L_sub( Gain_fx, prevGain_fx ); // Q29

#else

    gain_delta_fx = L_sub( Gain_fx, prevGain_fx ); // Q30

#endif

    step_fx = L_deposit_h( BASOP_Util_Divide3232_Scale( gain_delta_fx, subframe_length, &tmp_e ) ); // exp(tmp_e)

#ifdef FIX_BASOP_2469_OBJ_EDIT_TD_REND_GAIN

    tmp_e = sub( tmp_e, Q31 );

    step_fx = L_shl_sat( step_fx, tmp_e ); // Q29

    gain_tmp_fx = prevGain_fx;             // Q29

    move32();

#else

    tmp_e = sub( tmp_e, Q30 );

    step_fx = L_shl_sat( step_fx, tmp_e );     // Q31

    gain_tmp_fx = L_shl_sat( prevGain_fx, 1 ); // Q31

#endif



    /* Handle memory */

    p_signal_fx = buffer_fx + sub( filterlength, 1 );                                                                                          // Qx
@@ -325,8 +346,13 @@ void TDREND_firfilt_fx( 
        tmp_fx = W_shl_sat_l( tmp64_fx, shift ); // Qx



        /* Apply linear gain interpolation in case of abrupt gain changes */

#ifdef FIX_BASOP_2469_OBJ_EDIT_TD_REND_GAIN

        gain_tmp_fx = L_add_sat( gain_tmp_fx, step_fx );             /* Saturating values which just exceeds 4, Q29*/

        signal_fx[i] = L_shl( Mpy_32_32( tmp_fx, gain_tmp_fx ), 2 ); // Qx

#else

        gain_tmp_fx = L_add_sat( gain_tmp_fx, step_fx ); /* Saturating values which just exceeds 1, Q31*/

        signal_fx[i] = Mpy_32_32( tmp_fx, gain_tmp_fx ); // Qx

#endif

        move32();

        v_add_fx( filter_fx, filter_delta_fx, filter_fx, filterlength ); // exp(filter_e)

    }
@@ -349,8 +375,13 @@ void TDREND_firfilt_fx( 
        tmp_fx = W_shl_sat_l( tmp64_fx, shift ); // Qx



        /* Apply linear gain interpolation in case of abrupt gain changes */

#ifdef FIX_BASOP_2469_OBJ_EDIT_TD_REND_GAIN

        gain_tmp_fx = L_add_sat( gain_tmp_fx, step_fx );             /* Saturating values which just exceeds 4, Q29*/

        signal_fx[i] = L_shl( Mpy_32_32( tmp_fx, gain_tmp_fx ), 2 ); // Qx

#else

        gain_tmp_fx = L_add_sat( gain_tmp_fx, step_fx ); /* Saturating values which just exceeds 1, Q31*/

        signal_fx[i] = Mpy_32_32( tmp_fx, gain_tmp_fx ); // Qx

#endif

        move32();

    }

lib_rend/ivas_objectRenderer_sources_fx.c

+46 −3
Original line number Diff line number Diff line
@@ -139,7 +139,11 @@ ivas_error TDREND_MIX_SRC_SetDir_fx( 
ivas_error TDREND_MIX_SRC_SetGain(

    BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle   */

    const Word16 SrcInd,                               /* i  : Source index         */

#ifdef FIX_BASOP_2469_OBJ_EDIT_TD_REND_GAIN

    const Word32 Gain /* i  : Gain             Q29 */

#else

    const Word32 Gain /* i  : Gain                 */

#endif

)

{

    TDREND_SRC_SPATIAL_SetGain( hBinRendererTd->Sources[SrcInd], Gain );
@@ -270,12 +274,17 @@ static void TDREND_SRC_REND_Init_fx( 
    /* SrcGain  */

    FOR( nC = 0; nC < SPAT_BIN_MAX_INPUT_CHANNELS; nC++ )

    {

#ifdef FIX_BASOP_2469_OBJ_EDIT_TD_REND_GAIN

        SrcRend_p->SrcGain_p_fx[nC] = ONE_IN_Q29; /* Q29 */

        move32();

#else

        SrcRend_p->SrcGainMin_p_fx[nC] = 0; /* Q15 */

        move16();

        SrcRend_p->SrcGain_p_fx[nC] = ONE_IN_Q14; // Q14

        move16();

        SrcRend_p->SrcGainMax_p_fx[nC] = 32767; // TODO: make it 2, this is one in Q15, i thinki, need to change Q for that

        move16();

#endif

    }

    SrcRend_p->SrcGainUpdated = FALSE;

    move16();
@@ -312,7 +321,11 @@ void TDREND_SRC_REND_UpdateFiltersFromSpatialParams_fx( 
    Word16 *intp_count,                                /* o  : Interpolation count                        Q0 */

    Word16 *filterlength,                              /* o  : Length of filters                          Q0 */

    Word16 *itd,                                       /* o  : ITD value                                  Q0 */

#ifdef FIX_BASOP_2469_OBJ_EDIT_TD_REND_GAIN

    Word32 *Gain, /* o  : Gain value                                 Q29 */

#else

    Word32 *Gain, /* o  : Gain value                                 Q30 */

#endif

    TDREND_SRC_t *Src_p /* i/o: Source pointer                            */

)

{
@@ -403,7 +416,16 @@ void TDREND_SRC_REND_UpdateFiltersFromSpatialParams_fx( 
        }



        /* Update total gains */

#ifdef FIX_BASOP_2469_OBJ_EDIT_TD_REND_GAIN

        {

            Word32 tmp1, tmp2;

            tmp1 = L_shl( Mpy_32_16( extract_h( *SrcRend_p->SrcGain_p_fx ), extract_l( *SrcRend_p->SrcGain_p_fx ), *SrcRend_p->DirGain_p_fx ), 1 ); /* Q29 */

            tmp2 = L_shl( Mpy_32_16( extract_h( hBinRendererTd->Gain_fx ), extract_l( hBinRendererTd->Gain_fx ), *SrcRend_p->DistGain_p_fx ), 1 );  /* Q29 */

            *Gain = L_shl( Mpy_32_32( tmp1, tmp2 ), 2 );                                                                                            /* Q29 */

        }

#else

        *Gain = L_shl( Mpy_32_32( L_shl( L_mult( *SrcRend_p->SrcGain_p_fx, *SrcRend_p->DirGain_p_fx ), 1 ), L_shl( L_mult( *SrcRend_p->DistGain_p_fx, hBinRendererTd->Gain_fx ), 1 ) ), 1 ); // Q30

#endif

        move32();



        /* Delta for interpolation, in case the angular step exceeds MAX_ANGULAR_STEP=0.01f */
@@ -453,7 +475,11 @@ void TDREND_SRC_REND_UpdateFiltersFromSpatialParams_fx( 
    {

        *itd = 0; // Q0

        move16();

#ifdef FIX_BASOP_2469_OBJ_EDIT_TD_REND_GAIN

        *Gain = ONE_IN_Q29; /* Q29 */

#else

        *Gain = ONE_IN_Q30; // Q30

#endif

        move32();

        set32_fx( hrf_left, 0, *filterlength );

        set32_fx( hrf_right, 0, *filterlength );
@@ -692,11 +718,21 @@ static void TDREND_SRC_SPATIAL_SetDistAtten( 
 --------------------------------------------------------------------*/



static void TDREND_SRC_SPATIAL_SetGain(

#ifdef FIX_BASOP_2469_OBJ_EDIT_TD_REND_GAIN

    const TDREND_SRC_t *Src_p, /* i  : Source                        */

    const Word32 Gain          /* i  : Gain                      Q29 */

#else

    const TDREND_SRC_t *Src_p, /* i  : Directional attenuation specification */

    const Word32 Gain          /* i  : Front-pointing vector                 */

#endif

)

{

#ifdef FIX_BASOP_2469_OBJ_EDIT_TD_REND_GAIN

    Src_p->SrcRend_p->SrcGain_p_fx[0] = Gain; /* Q29 */

    move32();

#else

    Src_p->SrcRend_p->SrcGain_p_fx[0] = shl_sat( extract_h( Gain ), Q1 ); // TODO: Check incoming Q-value and fix this

#endif



    return;

}
@@ -978,10 +1014,17 @@ void TDREND_SRC_Init_fx( 
    move32();

    Src_p->elev_prev_fx = 0; // Q22

    move32();

#ifdef FIX_BASOP_2469_OBJ_EDIT_TD_REND_GAIN

    Src_p->Gain_fx = ONE_IN_Q29; // Q29

    move32();

    Src_p->prevGain_fx = ONE_IN_Q29; // Q29

    move32();

#else

    Src_p->Gain_fx = ONE_IN_Q30; // Q30

    move32();

    Src_p->prevGain_fx = ONE_IN_Q30; // Q30

    move32();

#endif



    return;

}