Commit be980295 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch '3gpp_issue_1415_fix_2' into 'main' 

Fix for 3GPP issue 1415: Cleanup of pre-processor macros

See merge request !1502
parents 338a38b9 6f1ac6e4

lib_com/basop_util.c

+0 −10
Original line number Diff line number Diff line
@@ -1409,15 +1409,6 @@ Word32 BASOP_Util_Divide3232_Scale_newton( Word32 x, Word32 y, Word16 *s ) 
        *s = 0;

        return ( (Word32) 0 );

    }



#if 0

    sign = L_xor( x, y ); /* check (sign < 0) for result negation */



    if ( x < 0 )

    {

        x = L_negate( x );

    }

#else

    IF( EQ_32( y, 0x80000000 ) )

    {

        /* Division by -1.0: same as negation of numerator */
@@ -1429,7 +1420,6 @@ Word32 BASOP_Util_Divide3232_Scale_newton( Word32 x, Word32 y, Word16 *s ) 
    }

    sign = y;

    move32();

#endif

    if ( y < 0 )

    {

        y = L_negate( y );

lib_com/bitstream_fx.c

+1 −3
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ 


int16_t FEC_seed = 12558; /* Seed for random FEC generator */

FILE *FEC_pattern = NULL; /* FEC pattern file (for simulation of FEC) */

#ifndef IVAS_CODE

float FEC_random = 0;     /* FEC rate in percent (for simulation of FEC) */

/*-------------------------------------------------------------------*

 * file_read_FECpattern()
@@ -109,7 +108,6 @@ static int16_t file_read_FECpattern( void ) 
    return bfi;

}

#endif

#endif

/*-------------------------------------------------------------------*

 * pack_bit()

 *

lib_com/cldfb_evs.c

+0 −7
Original line number Diff line number Diff line
@@ -981,10 +981,6 @@ ivas_error openCldfb( 
    const Word16 type,                 /*!< analysis or synthesis */

    const Word16 maxCldfbBands,        /*!< number of cldfb bands */

    const Word16 frameSize             /*!< FrameSize */

#ifdef ADD_IVAS_CLDFB

    ,

    CLDFB_PROTOTYPE prototype /* i  : CLDFB version (1.25ms/5ms delay)  */

#endif

)

{

    HANDLE_CLDFB_FILTER_BANK hs;
@@ -996,9 +992,6 @@ ivas_error openCldfb( 
    }



    hs->type = type;

#ifdef ADD_IVAS_CLDFB

    hs->prototype = prototype;

#endif

    move16();



    IF( type == CLDFB_ANALYSIS )

lib_com/core_com_config.c

+3 −52
Original line number Diff line number Diff line
@@ -246,67 +246,18 @@ Word16 getTcxonly_ivas_fx( 
}



Word16 getTcxonly(

#ifdef IVAS_CODE_SWITCHING

    const Word16 element_mode, /* i  : IVAS element mode                   */

#endif

    const Word32 total_brate /* i  : total bitrate                       */

#ifdef IVAS_CODE_SWITCHING

    ,

    const Word16 MCT_flag,      /* i  : hMCT handle allocated (1) or not (0)*/

    const int16_t is_ism_format /* i  : flag indicating ISM format          */

#endif

)

{



    Word16 tcxonly;

    tcxonly = 0;

    move16();

#ifdef IVAS_CODE_SWITCHING

    SWITCH( element_mode )

    {

        case EVS_MONO:

#endif

    if ( GT_32( total_brate, 32000 ) )

    {

        tcxonly = 1;

        move16();

    }

#ifdef IVAS_CODE_SWITCHING

            break;

        case IVAS_SCE:

            if ( is_ism_format )

            {

                if ( total_brate > MAX_ACELP_BRATE_ISM )

                {

                    tcxonly = 1;

                }

            }

            else

            {

                if ( total_brate > MAX_ACELP_BRATE )

                {

                    tcxonly = 1;

                }

            }

            break;



        case IVAS_CPE_DFT:

        case IVAS_CPE_TD:

            if ( total_brate > MAX_ACELP_BRATE )

            {

                tcxonly = 1;

            }

            break;

        case IVAS_CPE_MDCT:

            if ( total_brate >= ( MCT_flag ? IVAS_32k : IVAS_48k ) )

            {

                tcxonly = 1;

            }

            break;

#endif

#ifdef IVAS_CODE_SWITCHING

    }

#endif

    return tcxonly; /*Q0*/

}

lib_com/hq_conf_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -303,11 +303,7 @@ void hq_configure_evs_fx( 
    *start_norm = 0;

    move16();



#ifndef SOLVED_COMP_ENC_DEC

    IF( EQ_16( length, L_FRAME48k ) ) /*tbv SOLVED_COMP_ENC_DEC*/

#else

    IF( EQ_16( length, L_SPEC48k ) )

#endif

    {

        IF( EQ_16( hqswb_clas, HQ_GEN_FB ) )

        {