Commit d9299cc9 authored by multrus's avatar multrus
Browse files

align conditions to float

parent 9b74bd10

lib_enc/cod_tcx_fx.c

+0 −25
Original line number Diff line number Diff line
@@ -548,20 +548,7 @@ void ShapeSpectrum_ivas_fx( 
    test();

    test();

    test();

#ifdef HARMONIZE_2597_ShapeSpectrum

    Word32 condition;

    IF( EQ_16( st->element_mode, EVS_MONO ) )

    {

        condition = ( EQ_32( total_brate, ACELP_9k60 ) && EQ_16( st->bwidth, SWB ) ) || ( EQ_32( total_brate, ACELP_13k20 ) && EQ_16( st->bwidth, SWB ) );

    }

    ELSE

    {

        condition = ( LE_32( total_brate, ACELP_13k20 ) || ( LE_32( st->element_brate, IVAS_16k4 ) && EQ_16( st->element_mode, IVAS_CPE_DFT ) ) ) && EQ_16( st->bwidth, SWB );

    }

    IF( condition )

#else

    IF( ( LE_32( total_brate, ACELP_13k20 ) || ( LE_32( st->element_brate, IVAS_16k4 ) && EQ_16( st->element_mode, IVAS_CPE_DFT ) ) ) && EQ_16( st->bwidth, SWB ) )

#endif

    {

        max_low_pre = 0;

        move32();
@@ -639,19 +626,7 @@ void ShapeSpectrum_ivas_fx( 
    test();

    test();

    test();

#ifdef HARMONIZE_2597_ShapeSpectrum

    IF( EQ_16( st->element_mode, EVS_MONO ) )

    {

        condition = ( EQ_32( st->total_brate, ACELP_9k60 ) && EQ_16( st->bwidth, SWB ) ) || ( EQ_32( st->total_brate, ACELP_13k20 ) && EQ_16( st->bwidth, SWB ) );

    }

    ELSE

    {

        condition = ( LE_32( total_brate, ACELP_13k20 ) || ( LE_32( st->element_brate, IVAS_16k4 ) && EQ_16( st->element_mode, IVAS_CPE_DFT ) ) ) && EQ_16( st->bwidth, SWB );

    }

    IF( condition )

#else

    IF( ( LE_32( total_brate, ACELP_13k20 ) || ( LE_32( st->element_brate, IVAS_16k4 ) && EQ_16( st->element_mode, IVAS_CPE_DFT ) ) ) && EQ_16( st->bwidth, SWB ) )

#endif

    {

        Word16 sf_width;

        Word16 dist_low, dist_high;