Commit 565dfd53 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

Merge branch... 

Merge branch '1826-improve-wmops-performance-of-householderreduction_fx-in-ivas_svd_dec_fx-c' of ssh://forge.3gpp.org:29419/sa4/audio/ivas-basop into 1826-improve-wmops-performance-of-householderreduction_fx-in-ivas_svd_dec_fx-c
parents 4dd47a03 83a9031f

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ 
#define FIX_ISSUE_1817_REPLACE_CARRY_OVERFLOW  /* FhG: bit-exact, replace carry and overflow operations by 64-bit operations, MR 1931 */

#define FIX_1844_MISSING_FREE                                /* FhG: add missing free in ivas_binRenderer_convModuleClose_fx() */



#define	MERGE_REQUEST_1926_SPEEDUP_ivas_svd_dec_fx_NONBE /* FhG: reduce WMOPS of HouseHolderReduction() in ivas_svd_dec.c() by removing redundant mathematics and using 64 bit additions.*/

/* #################### Start BASOP porting switches ############################ */



#define FIX_1372_ISAR_POST_REND

lib_dec/ivas_mc_param_dec_fx.c

+14 −0
Original line number Diff line number Diff line
@@ -1799,8 +1799,22 @@ void ivas_param_mc_dec_digest_tc_fx( 
        test();

        IF( hParamMC->hMetadataPMC->bAttackPresent && ( EQ_32( hParamMC->synthesis_conf, PARAM_MC_SYNTH_LS_CONV_COV ) || EQ_32( hParamMC->synthesis_conf, PARAM_MC_SYNTH_MONO_STEREO ) ) )

        {

#ifdef MERGE_REQUEST_1926_SPEEDUP_ivas_svd_dec_fx_NONBE

            Word16 len = imult1616( nchan_transport, nchan_transport );

            Word16 sc = s_min( getScaleFactor32( cx_fx, len ), getScaleFactor32( cx_next_band_fx, len ) );

            IF( EQ_16( sc, 0 ) )

            {

                Scale_sig32( cx_fx, len, -Q1 );           // add one bit head room

                Scale_sig32( cx_next_band_fx, len, -Q1 ); // add one bit head room

                cx_e = add( cx_e, Q1 );

                cx_next_band_e = add( cx_e, Q1 );

            }

            v_add_fx( cx_fx, cx_next_band_fx, cx_fx, len );

            Copy32( cx_fx, cx_next_band_fx, len );

#else

            v_add_fx( cx_fx, cx_next_band_fx, cx_fx, imult1616( nchan_transport, nchan_transport ) );

            Copy32( cx_fx, cx_next_band_fx, imult1616( nchan_transport, nchan_transport ) );

#endif

        }



        FOR( is_next_band = 0; is_next_band < 2; is_next_band++ )

lib_dec/ivas_svd_dec_fx.c

+172 −183

File changed.

Preview size limit exceeded, changes collapsed.