Commit 95ba2f48 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

name the svd-optimizations define consistently

parent 21746fe1

lib_com/options.h

+2 −2
Original line number Diff line number Diff line
@@ -97,7 +97,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.*/

#define	NONBE_SVD_OPTIMIZATION /* 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
@@ -142,7 +142,7 @@ 
#define NONBE_1360_LFE_DELAY                           /* Dlb: LFE delay alignment when rendering in CLDFB domain*/



#define NONBE_1229_FIX_ISM1_DPID                        /* Eri: issue 1229: fix bug causing ISM 1 to use default -dpid instead of the specified one */

#define MERGE_REQUEST_1926_SPEEDUP_ivas_svd_dec_fx_NONBE 

#define NONBE_SVD_OPTIMIZATION 



/* #################### End BASOP porting switches ############################ */

lib_dec/ivas_mc_param_dec_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -1799,7 +1799,7 @@ 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

#ifdef NONBE_SVD_OPTIMIZATION

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

lib_dec/ivas_svd_dec_fx.c

+4 −4
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ static void HouseholderReduction_fx( 
    const Word16 nChannelsC, /* Q0 */

    Word32 *eps_x_fx,        /* exp(eps_x_fx_e) */

    Word16 *eps_x_fx_e );

#ifdef MERGE_REQUEST_1926_SPEEDUP_ivas_svd_dec_fx_NONBE

#ifdef NONBE_SVD_OPTIMIZATION



static void biDiagonalReductionLeft_fx(

    Word32 singularVectors[][MAX_OUTPUT_CHANNELS],  /* exp(singularVectors_e) */
@@ -841,7 +841,7 @@ static void HouseholderReduction_fx( 
    Word16 *eps_x_fx_e )

{

    Word16 nCh;

#ifdef MERGE_REQUEST_1926_SPEEDUP_ivas_svd_dec_fx_NONBE

#ifdef NONBE_SVD_OPTIMIZATION



    Word32 g_left_fx = 0;

    Word16 g_left_e = 0;
@@ -865,7 +865,7 @@ static void HouseholderReduction_fx( 
    Word16 iCh, jCh;

    Word16 singularVectors_Left_fx_e[MAX_OUTPUT_CHANNELS][MAX_OUTPUT_CHANNELS];



#ifdef MERGE_REQUEST_1926_SPEEDUP_ivas_svd_dec_fx_NONBE

#ifdef NONBE_SVD_OPTIMIZATION

    Word16 sc = 0;

    move16();

    sc = getScaleFactor32( singularVectors_Left_fx[0], nChannelsC );
@@ -960,7 +960,7 @@ static void HouseholderReduction_fx( 
    return;

}



#ifdef MERGE_REQUEST_1926_SPEEDUP_ivas_svd_dec_fx_NONBE

#ifdef NONBE_SVD_OPTIMIZATION

/*-------------------------------------------------------------------------

 * biDiagonalReductionLeft()

 *