Commit 57beaa1c authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch... 

Merge branch '1578-follow-up-from-resolve-complexity-overhead-stereo-to-stereo-32kbps-fb-float-vs-basop-bitexact' into 'main'

Resolve "Follow-up from "Resolve "Complexity Overhead Stereo to Stereo - 32kbps FB FLOAT vs BASOP" - Bitexact Changes""

Closes #1578

See merge request !1574
parents 2a941977 0a01fe3d

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -91,7 +91,6 @@ 
#define FIX_1439_SPEEDUP_Copy_Scale_sig_16_32_no_sat            /*FhG: reduces WMOPS - bit-exact*/

#define FIX_1439_SPEEDUP_stereo_icBWE_dec_fx                    /*FhG: reduces WMOPS - bit-exact*/

#define FIX_1439_SPEEDUP_ivas_swb_tbe_dec_fx                    /*FhG: reduces WMOPS - bit-exact*/

#define FIX_1439_SPEEDUP_synthesise_fb_high_band_fx             /*FhG: reduces WMOPS - bit-exact*/

#define FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic              /*FhG: reduces maintenance complexity & reduces WMOPS & prepares STAGE2 patch*/

#define FIX_1439_SPEEDUP_SIMPLIFY_elliptic_bpf_48k_generic_STAGE2       /*FhG: reduces WMOPS*/

#define FIX_1481_HARDCODE_DIV                          /* FhG: hardcode division results in stereo_dmx_evs_init_encoder_fx() */

lib_com/swb_tbe_com_fx.c

+0 −45
Original line number Diff line number Diff line
@@ -7023,50 +7023,6 @@ void synthesise_fb_high_band_fx( 
    tmp3 = add( sub( Qout, add( sub( 1, exp ), exp_tmp ) ), 16 ); /*Qout - (1 -exp +exp_tmp) + 16 */

    FOR( i = 0; i < L_FRAME48k; i++ )

    {

#ifdef FIX_1439_SPEEDUP_synthesise_fb_high_band_fx

        L_tmp = Mult_32_16( ratio2, tmp[i] ); /* Q(16-exp+exp_tmp-15 = 1-exp+exp_tmp) */

        Word32 L_tmp32 = L_add( 0, 0 );

        Word16 tmp16 = add( 0, 0 );



        // if (L_tmp < 0)

        if ( L_tmp < 0 )

        {

            L_tmp32 = L_negate( L_tmp );

        }

        if ( L_tmp < 0 )

        {

            L_tmp32 = L_shl_sat( L_tmp32, tmp3 );

        }

        if ( L_tmp < 0 )

        {

            tmp16 = extract_h( L_tmp32 );

        }

        if ( L_tmp < 0 )

        {

            tmp16 = negate( tmp16 );

        }



        // if (L_tmp == 0)

        if ( L_tmp == 0 )

        {

            tmp16 = 0;

            move16();

        }



        // if (L_tmp > 0)

        if ( L_tmp > 0 )

        {

            L_tmp32 = L_shl_sat( L_tmp, tmp3 );

        }

        if ( L_tmp > 0 )

        {

            tmp16 = extract_h( L_tmp32 );

        }



        output[i] = tmp16;

        move16();



#else

        L_tmp = Mult_32_16( ratio2, tmp[i] ); /* Q(16-exp+exp_tmp-15 = 1-exp+exp_tmp) */

        IF( L_tmp < 0 )

        {
@@ -7078,7 +7034,6 @@ void synthesise_fb_high_band_fx( 
            output[i] = extract_h( L_shl_sat( L_tmp, tmp3 ) ); /*Qout*/

            move16();

        }

#endif

    }

    return;

}