Commit 8d1305d2 authored by multrus's avatar multrus
Browse files

fix usage of element_mode

parent 42e5b6a9

lib_enc/fd_cng_enc_fx.c

+9 −9
Original line number Diff line number Diff line
@@ -1974,7 +1974,7 @@ void FdCng_encodeSID_fx( 
    e_fx = L_deposit_l( 0 );



#ifdef FIX_2489_HARMONIZE_FdCng_encodeSID_IVASHP

    IF( element_mode == 0 )

    IF( EQ_16( element_mode, EVS_MONO ) )

#endif

    {

        Word16 normShiftN = BASOP_util_norm_s_bands2shift( N );
@@ -2019,7 +2019,7 @@ void FdCng_encodeSID_fx( 
    gain_fx = 0;

    move32();

#ifdef FIX_2489_HARMONIZE_FdCng_encodeSID_IVASHP

    IF( element_mode == 0 )

    IF( EQ_16( element_mode, EVS_MONO ) )

#endif

    {

        Word16 normFacGain = getNormReciprocalWord16( N_GAIN_MAX - N_GAIN_MIN );
@@ -2051,7 +2051,7 @@ void FdCng_encodeSID_fx( 
#endif



    /*MSVQ*/

    IF( element_mode == 0 )

    IF( EQ_16( element_mode, EVS_MONO ) )

    {

        Word16 v16[32];

        FOR( i = 0; i < N; i++ )
@@ -2110,7 +2110,7 @@ void FdCng_encodeSID_fx( 
    gain_fx = 0;

    move32();

#ifdef FIX_2489_HARMONIZE_FdCng_encodeSID_IVASHP

    IF( element_mode == 0 )

    IF( EQ_16( element_mode, EVS_MONO ) )

#endif

    {

        Word16 normShiftN = BASOP_util_norm_s_bands2shift( N );
@@ -2138,13 +2138,13 @@ void FdCng_encodeSID_fx( 


    /* Apply bitrate-dependant scale */

    apply_scale( &gain_fx, hFdCngCom->CngBandwidth, hFdCngCom->CngBitrate,

                 ( element_mode == 0 ) ? ( scaleTableMono ) : ( scaleTableStereo ),

                 ( element_mode == 0 ) ? ( SIZE_SCALE_TABLE_MONO ) : ( SIZE_SCALE_TABLE_STEREO ) );

                 EQ_16( element_mode, EVS_MONO ) ? ( scaleTableMono ) : ( scaleTableStereo ),

                 EQ_16( element_mode, EVS_MONO ) ? ( SIZE_SCALE_TABLE_MONO ) : ( SIZE_SCALE_TABLE_STEREO ) );





    /* Quantize gain */

#ifdef FIX_2489_HARMONIZE_FdCng_encodeSID_IVASHP

    IF( element_mode == 0 )

    IF( EQ_16( element_mode, EVS_MONO ) )

#endif

    {

        /*Q14.23 format */
@@ -2174,7 +2174,7 @@ void FdCng_encodeSID_fx( 


    /* Apply gain and undo log */

#ifdef FIX_2489_HARMONIZE_FdCng_encodeSID_IVASHP

    IF( element_mode == 0 )

    IF( EQ_16( element_mode, EVS_MONO ) )

#endif

    {

        Word32 E_ExpLd64;
@@ -2272,7 +2272,7 @@ void FdCng_encodeSID_fx( 
        Word16 IDX = IND_ACELP_16KHZ;

        move16();

        push_indice( hBstr, IND_SID_TYPE, 1, 1 );

        if ( element_mode > 0 )

        if ( GT_16( element_mode, EVS_MONO ) )

        {

            IDX = IND_BWIDTH;

            move16();