Commit fd52744e authored by Fabian Bauer's avatar Fabian Bauer
Browse files

use basop comparators for enums - undo unnecessary changes in inactive code -... 

use basop comparators for enums - undo unnecessary changes in inactive code - comment harmonization macro
parent 11daea25

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ 
#define FIX_2479_HARM_PITCH_GAIN                        /* FhG: basop issue 2479: Harmonize tcx_ltp_pitch_search_*(), tcx_ltp_find_gain_*fx() */

#define HARMONIZE_2481_EXTEND_SHRINK                    /* FhG: basop issue 2481: Harmonize extend_frm_*fx() and shrink_frm_*fx() */

#define FIX_FLOAT_ISSUE_1546_DEAD_CODE                  /* FhG: remove dead code reported in the issue*/

#define HARMONIZE_2494_FdCng_decodeSID_fx

#define HARMONIZE_2494_FdCng_decodeSID_fx               /* FhG: harmonize FdCng_decodeSID_fx with _ivas_ version */



/* #################### End BE switches ################################## */

lib_dec/fd_cng_dec_fx.c

+8 −5
Original line number Diff line number Diff line
@@ -2285,7 +2285,7 @@ void FdCng_decodeSID_fx( Decoder_State *corest ) 


    Word32 gain_q_offset = GAIN_Q_OFFSET_IVAS_FX_Q0;



    if ( corest->element_mode == EVS_MONO )

    if ( EQ_16( corest->element_mode, EVS_MONO ) )

    {

        gain_q_offset = GAIN_Q_OFFSET_EVS_FX_Q0; /*60 Q0*/

        move32();
@@ -2313,7 +2313,7 @@ void FdCng_decodeSID_fx( Decoder_State *corest ) 


    /* MSVQ decoder */



    IF( corest->element_mode != EVS_MONO )

    IF( NE_16( corest->element_mode, EVS_MONO ) )

    {

        create_IDCT_N_Matrix_fx( invTrfMatrix_fx, FDCNG_VQ_MAX_LEN, FDCNG_VQ_DCT_MAXTRUNC, FDCNG_VQ_MAX_LEN * FDCNG_VQ_DCT_MAXTRUNC );

        msvq_dec_fx( ivas_cdk_37bits_fx, NULL, NULL, stages_37bits, N, maxN_37bits, indices, 1, invTrfMatrix_fx, v, NULL, 7 );
@@ -2419,7 +2419,7 @@ void FdCng_decodeSID_fx( Decoder_State *corest ) 
    }



    scalebands( sidNoiseEst, hFdCngCom->part, hFdCngCom->npart, hFdCngCom->midband, hFdCngCom->nFFTpart, sub( hFdCngCom->stopBand, hFdCngCom->startBand ), hFdCngCom->cngNoiseLevel, 1 );

    IF( corest->element_mode == EVS_MONO )

    IF( EQ_16( corest->element_mode, EVS_MONO ) )

    {

        hFdCngCom->cngNoiseLevelExp = hFdCngCom->sidNoiseEstExp;

        move16();
@@ -4523,9 +4523,10 @@ void FdCng_decodeSID_ivas_fx( 
    Word32 v[32];

    Word16 indices[32];

    HANDLE_FD_CNG_COM hFdCngCom;

    Word16 tmp16;

    Word32 *invTrfMatrix_fx;

    Word32 tmpRAM_fx[FDCNG_VQ_MAX_LEN][FDCNG_VQ_DCT_MAXTRUNC];

    Word32 *invTrfMatrix_fx = (Word32 *) tmpRAM_fx; /*Q31*/

    Word16 tmp16;



    IF( st->element_mode == EVS_MONO )

    {

        tmp16 = GAIN_Q_OFFSET_EVS_FX_Q0;
@@ -4540,6 +4541,7 @@ void FdCng_decodeSID_ivas_fx( 
    const Word16 gain_q_offset = tmp16; /* Q0 */

    move16();



    invTrfMatrix_fx = (Word32 *) tmpRAM_fx; /*Q31*/



    hFdCngCom = ( st->hFdCngDec )->hFdCngCom;
@@ -4562,6 +4564,7 @@ void FdCng_decodeSID_ivas_fx( 
    index = get_next_indice_fx( st, 7 );



    /* MSVQ decoder */



    IF( st->element_mode != EVS_MONO )

    {

        create_IDCT_N_Matrix_fx( invTrfMatrix_fx, FDCNG_VQ_MAX_LEN, FDCNG_VQ_DCT_MAXTRUNC, FDCNG_VQ_MAX_LEN * FDCNG_VQ_DCT_MAXTRUNC );