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

Revert " --- revert ALL changes ---" 

This reverts commit b677480f.
parent 1eb52db5

lib_com/options.h

+15 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 


#define SUPPORT_JBM_TRACEFILE                   /* Support for JBM tracefile, which is needed for 3GPP objective/subjective testing, but not relevant for real-world implementations */



/*#define WMOPS*/                                   /* Activate complexity and memory counters */

//#define WMOPS                                   /* Activate complexity and memory counters */

#ifdef WMOPS

/*#define WMOPS_PER_FRAME*/                     /* Output per-frame complexity (writes one float value per frame to the file "wmops_analysis") */

/*#define WMOPS_DETAIL*/                        /* Output detailed complexity printout for every function. Increases runtime overhead */
@@ -78,4 +78,18 @@ 
#define HARM_PUSH_BIT

#define HARM_ENC_INIT

//#define HARM_SCE_INIT



// new speedups

//#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_0                  /*FhG: reduces WMOPS - bit-exact*/

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

//#define FIX_1439_SPEEDUP_synthesise_fb_high_band_fx             // 0.4 WMOPS - BE?



//#define FIX_1439_SPEEDUP_elliptic_bpf_48k_generic_STAGE1       // nonbe    // |

//#define FIX_1439_SPEEDUP_elliptic_bpf_48k_generic_STAGE2       // nonbe    // | > 3.1 WMOPS, pipe testing https://forge.3gpp.org/rep/sa4/audio/ivas-basop/-/pipelines/50562

//#define FIX_1439_SPEEDUP_elliptic_bpf_48k_generic_STAGE3       // nonbe    // |



//-----------------------------------------------------------------------

// OPT_STEREO_32KBPS_V1 switch is inactive - why? (3.2 WMOPS)

#endif

lib_com/swb_tbe_com_fx.c

+273 −5

File changed.

Preview size limit exceeded, changes collapsed.

lib_com/tools_fx.c

+24 −0
Original line number Diff line number Diff line
@@ -794,13 +794,37 @@ void Copy_Scale_sig_16_32_no_sat( 
        }

        return;

    }

#ifdef FIX_1439_SPEEDUP_Copy_Scale_sig_16_32_no_sat

    L_tmp = L_shl_o( 1, exp0 - 1, &Overflow );



    IF( L_tmp >= 0x7FFF )

    {

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

        {

            // y[i] = L_mult0(x[i], L_tmp);

            y[i] = W_extract_l( W_mult_32_16( L_tmp, x[i] ) );

            move32(); /* saturation can occur here */

        }

        return;

    }

    // ELSE

    {

        // Word16 tmp = extract_l( L_tmp );

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

        {

            y[i] = L_mult( x[i], L_tmp );

            move32(); /* saturation can occur here */

        }

    }

#else

    L_tmp = L_shl_o( 1, exp0 - 1, &Overflow );

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

    {

        // y[i] = L_mult0(x[i], L_tmp);

        y[i] = W_extract_l( W_mult_32_16( L_tmp, x[i] ) );

        move32(); /* saturation can occur here */

    }

#endif

}



void Copy_Scale_sig_32_16(

lib_dec/ivas_core_dec_fx.c

+51 −11

File changed.

Preview size limit exceeded, changes collapsed.

lib_dec/ivas_jbm_dec_fx.c

+17 −3

File changed.

Preview size limit exceeded, changes collapsed.