Commit 0477b37e authored by Fabian Bauer's avatar Fabian Bauer
Browse files

create variable to be able to have simple modification by setting... 

create variable to be able to have simple modification by setting element_mode=0 to have EVS-calculation even in IVAS-mode
parent fcfcf1de

lib_enc/fd_cng_enc_fx.c

+10 −9
Original line number Diff line number Diff line
@@ -2504,8 +2504,9 @@ void FdCng_encodeSID_fx( 
    Word16 normFacN, normShiftN;

    Word16 normFacGain, normShiftGain;

    Word32 E_ExpLd64;

    Word16 element_mode = element_mode;



    IF( corest->element_mode > 0 )

    IF( element_mode > 0 )

    {

        (void) normFacN;

        (void) normShiftN;
@@ -2525,7 +2526,7 @@ void FdCng_encodeSID_fx( 
    move16();

    E_Exp = hFdCngEnc->msNoiseEst_fx_exp;

    move16();

    IF( corest->element_mode == 0 )

    IF( element_mode == 0 )

    {

        E_ExpLd64 = L_shl( E_Exp, WORD32_BITS - 1 - LD_DATA_SCALE );
@@ -2543,7 +2544,7 @@ void FdCng_encodeSID_fx( 


    /* Convert to LOG */

    e_fx = L_deposit_l( 0 );

    IF( corest->element_mode == 0 )

    IF( element_mode == 0 )

    {

        /* e: Q14.23 format, v_fx: Q9.23 format */

        temp = Mpy_32_32_r( L_shl( 1, sub( 31, E_Exp ) ), 214748 ); /* 1e-4f, Q31-E_Exp */
@@ -2580,7 +2581,7 @@ void FdCng_encodeSID_fx( 


    gain_fx = 0;

    move32();

    IF( corest->element_mode == 0 )

    IF( element_mode == 0 )

    {

        /* gain: Q9.23 format */

        FOR( i = N_GAIN_MIN; i < N_GAIN_MAX; i++ )
@@ -2610,7 +2611,7 @@ void FdCng_encodeSID_fx( 
    }



    /*MSVQ*/

    IF( corest->element_mode == 0 )

    IF( element_mode == 0 )

    {

        Word16 v16[32];

        FOR( i = 0; i < N; i++ )
@@ -2667,7 +2668,7 @@ void FdCng_encodeSID_fx( 
    }



    /* Compute gain */

    IF( corest->element_mode == 0 )

    IF( element_mode == 0 )

    {

        /*Q9.23 format */

        gain_fx = 0;
@@ -2700,7 +2701,7 @@ void FdCng_encodeSID_fx( 




    /* Quantize gain */

    IF( corest->element_mode == 0 )

    IF( element_mode == 0 )

    {

        /*Q14.23 format */

        gain_fx = L_add( gain_fx, L_shr( gain_fx, 1 ) );
@@ -2726,7 +2727,7 @@ void FdCng_encodeSID_fx( 
    }



    /* Apply gain and undo log */

    IF( corest->element_mode == 0 )

    IF( element_mode == 0 )

    {

        /* gain Q14.23 format */

        gain_fx = L_shl( L_deposit_l( index ), WORD32_BITS - 1 - 8 );
@@ -2820,7 +2821,7 @@ void FdCng_encodeSID_fx( 
        Word16 IDX = IND_ACELP_16KHZ;

        move16();

        push_indice( hBstr, IND_SID_TYPE, 1, 1 );

        if ( corest->element_mode > 0 )

        if ( element_mode > 0 )

        {

            IDX = IND_BWIDTH;

            move16();