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

activate HARMONIZE_2567_init_modes and fix conditions

parent 0ed47e21

lib_enc/core_enc_init_fx.c

+13 −1
Original line number Diff line number Diff line
@@ -2344,6 +2344,12 @@ static void init_modes_ivas_fx( 
        FOR( n = 0; n < FRAME_SIZE_NB; n++ )

        {

#ifdef HARMONIZE_2567_init_modes

            Word16 bits_frame_tmp, bits_frame_core_tmp;

            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 ) )
@@ -2356,7 +2362,13 @@ static void init_modes_ivas_fx( 
                move16();

                BREAK;

            }

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

            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();