Commit d8e4022a authored by multrus's avatar multrus
Browse files

bring init_modes_ivas_fx() inline with float

parent cca26043

lib_enc/core_enc_init_fx.c

+1 −36
Original line number Diff line number Diff line
@@ -2148,41 +2148,6 @@ static void init_modes_ivas_fx( 
    {

        FOR( n = 0; n < FRAME_SIZE_NB; n++ )

        {

#ifdef HARMONIZE_2567_init_functions

            test();

            test();

            test();

            test();

            test();

            test();

            test();

            IF( EQ_16( st->element_mode, EVS_MONO ) && EQ_16( FrameSizeConfig[n].frame_bits, st->bits_frame_nominal ) )

            {

                st->frame_size_index = n;

                move16();

                st->bits_frame = FrameSizeConfig[n].frame_bits;

                move16();

                st->bits_frame_core = FrameSizeConfig[n].frame_net_bits;

                move16();

                BREAK;

            }

            ELSE IF( GT_16( st->element_mode, EVS_MONO ) && ( (

                                                                  ( LT_32( n, FRAME_SIZE_NB - 1 ) ) &&

                                                                  ( LE_32( FrameSizeConfig[n].frame_bits, st->bits_frame_nominal ) && GT_32( FrameSizeConfig[n + 1].frame_bits, st->bits_frame_nominal ) ) ) ||

                                                              ( !( LT_32( n, FRAME_SIZE_NB - 1 ) ) &&

                                                                ( LE_32( FrameSizeConfig[n].frame_bits, st->bits_frame_nominal ) ) )



                                                                  ) )

            {

                st->frame_size_index = n;

                move16();

                st->bits_frame = st->bits_frame_nominal;

                move16();

                st->bits_frame_core = sub( sub( sub( st->bits_frame_nominal, FrameSizeConfig[n].transmission_bits ), FrameSizeConfig[n].bandwidth_bits ), FrameSizeConfig[n].reserved_bits );

                move16();

                BREAK;

            }

#else

            IF( LT_32( n, FRAME_SIZE_NB - 1 ) )

            {

                test();
@@ -2210,8 +2175,8 @@ static void init_modes_ivas_fx( 
                    BREAK;

                }

            }

#endif

        }



#ifdef HARMONIZE_2567_init_functions

        test();

        if ( EQ_16( (Word16) n, FRAME_SIZE_NB ) && ( EQ_16( st->element_mode, EVS_MONO ) ) )