Commit 196fb050 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch 'float_code_disabling_2' into 'main' 

options.h macros clean up along with corresponding code, float code clean up [allow regression]

See merge request !826
parents ecba0c59 97c98da7

lib_com/bitalloc.c

+2 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
#include "basop_proto_func.h"

#include "wmc_auto.h"



#ifndef IVAS_FLOAT_FIXED

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

 * bitalloc()

 *
@@ -530,6 +531,7 @@ int16_t BitAllocF( 


    return shr( tmp, 3 );

}

#endif



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

 * Bit_group()

lib_com/bitallocsum.c

+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
#include "prot.h"

#include "wmc_auto.h"



#ifndef IVAS_FLOAT_FIXED

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

 *  bitallocsum()

 *
@@ -91,3 +92,4 @@ void bitallocsum( 


    return;

}

#endif

lib_com/bits_alloc_fx.c

+0 −29
Original line number Diff line number Diff line
@@ -1064,12 +1064,10 @@ ivas_error config_acelp1( 


            bits = sub( bits, acelp_cfg->mid_lsf_bits );

        }

#if defined LSF_RE_USE_SECONDARY_CHANNEL || defined FIX_798_LSF_SECONDARY_CH_MISSING_CODE

        ELSE IF( EQ_16( tdm_lp_reuse_flag, 1 ) && EQ_16( idchan, 1 ) && NE_16( active_cnt, 1 ) )

        {

            bits = sub( bits, TDM_IC_LSF_PRED_BITS );

        }

#endif

        /* gain Q bit-budget - part 1 */

        test();

        test();
@@ -1789,7 +1787,6 @@ ivas_error config_acelp1( 
            test();

            IF( idchan > 0 && EQ_16( element_mode, IVAS_CPE_TD ) )

            {

#if defined LSF_RE_USE_SECONDARY_CHANNEL || defined FIX_798_LSF_SECONDARY_CH_MISSING_CODE

                IF( !tdm_lp_reuse_flag )

                {

                    acelp_cfg->lsf_bits = add( acelp_cfg->lsf_bits, bits ); /* increase LSF Q bits */
@@ -1824,33 +1821,7 @@ ivas_error config_acelp1( 
                        bits = sub( bits, allocate_unused( core_brate, coder_type, bits, 1, 0, LSFPRM, &acelp_cfg->lsf_bits ) );

                    }

                }

#else

                Word16 nb_prm = 4;



                if ( tdm_low_rate_mode == 1 )

                {

                    nb_prm = 2;

                }



                /* First add remaining bits on gains */

                if ( !( *uc_two_stage_flag ) )

                {

                    bits -= allocate_unused( core_brate, coder_type, bits, nb_prm, 0, GAINSPRM, acelp_cfg->gains_mode );

                }



                /* Then, Increase pitch bit budget */

                if ( tdm_Pitch_reuse_flag == 0 && bits > 0 )

                {

                    bits -= allocate_unused( core_brate, coder_type, bits, nb_prm, 0, PITCHPRM, acelp_cfg->pitch_bits );

                }



                /* Increase mid-lsf bit budget */

                if ( tdm_lp_reuse_flag == 0 && bits > 0 )

                {

                    bits -= allocate_unused( core_brate, coder_type, bits, 1, 0, MID_LSFSPRM, &acelp_cfg->mid_lsf_bits );

                    bits -= allocate_unused( core_brate, coder_type, bits, 1, 0, LSFPRM, &acelp_cfg->lsf_bits );

                }

#endif

#ifdef DEBUGGING

                if ( idchan > 0 && bits > 0 && ( coder_type > UNVOICED || tdm_low_rate_mode == 0 ) )

                {

lib_com/bitstream_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ Word16 rate2EVSmode( 
        *is_amr_wb = 0;

        move16();

    }

    switch ( brate )

    SWITCH( brate )

    {

            /* EVS Primary modes */

        case FRAME_NO_DATA:
@@ -252,7 +252,7 @@ Word16 rate2EVSmode( 
        case HQ_128k:

            return PRIMARY_128000;

        default:

            break;

            BREAK;

    }

    if ( is_amr_wb != NULL )

    {

lib_com/calc_st_com.c

+2 −2
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
#include "wmc_auto.h"





#ifndef IVAS_FLOAT_FIXED

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

 * calc_rc0_h()

 *
@@ -93,7 +94,6 @@ static void calc_rc0_h( 
    return;

}





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

 * calc_st_filt()

 *
@@ -151,7 +151,6 @@ void calc_st_filt( 
    return;

}





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

 * filt_mu()

 *
@@ -305,3 +304,4 @@ void blend_subfr2_flt( 


    return;

}

#endif