Commit 5babfdc8 authored by thomas dettbarn's avatar thomas dettbarn Committed by Sandesh Venkatesh
Browse files

macro names.

parent 0f749376

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ 
//#define HARM_SCE_INIT

#define DIV32_OPT_NEWTON                               /* FhG: faster 32 by 32 bit division */ 

#define	MERGE_REQUEST_1378_SPEEDUP_ivas_mc_param_enc_fx_NONBE /* FhG: reduce WMOPS of Cy calculation in ivas_param_mc_param_est_enc_fx() by using 64 Bit addition. Obsoletes IMPROVE_HIGH_COMPLEXITY_PARAM_MC_PRM_EST_NONBE. */

#define MERGE_REQUEST_1472_SPEEDUIP_ivas_mc_param_enc_fx_NONBE /* FhG: reduce WMOPS of dmx calculation in ivas_param_mc_param_est_enc_fx() by using 64 Bit addition. Requires MERGE_REQUEST_1378_SPEEDUP_ivas_mc_param_enc_fx_NONBE. */

#define MERGE_REQUEST_1472_SPEEDUP_ivas_mc_param_enc_fx_NONBE /* FhG: reduce WMOPS of dmx calculation in ivas_param_mc_param_est_enc_fx() by using 64 Bit addition. Requires MERGE_REQUEST_1378_SPEEDUP_ivas_mc_param_enc_fx_NONBE. */

#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*/

lib_enc/ivas_mc_param_enc_fx.c

+29 −31
Original line number Diff line number Diff line
@@ -29,7 +29,16 @@ 
   the United Nations Convention on Contracts on the International Sales of Goods.



*******************************************************************************************************/

#define CONVERT64( x_64, y_fx, y_e )               \



// helper macros to convert the 64 bitt accumulators into the 48 bit float format

#define CONVERT_CY( x_64, y_fx, y_e )               \

    {                                              \

        Word16 norm;                               \

        norm = W_norm( x_64 );                     \

        y_fx = W_extract_h( W_shl( x_64, norm ) ); \

        y_e = sub( sub( 62, gb ), norm );          \

    }

#define CONVERT_DMX( x_64, y_fx, y_e )               \

    {                                              \

        Word16 norm;                               \

        norm = W_norm( x_64 );                     \
@@ -655,7 +664,7 @@ static void ivas_param_mc_param_est_enc_fx( 
    Word32 *p_slot_frame_f_real_fx[MAX_CICP_CHANNELS];                     /* Output of the MDFT FB - real part */

    Word32 *p_slot_frame_f_imag_fx[MAX_CICP_CHANNELS];                     /* Output of the MDFT FB - imag part */



#ifdef MERGE_REQUEST_1472_SPEEDUIP_ivas_mc_param_enc_fx_NONBE

#ifdef MERGE_REQUEST_1472_SPEEDUP_ivas_mc_param_enc_fx_NONBE

    Word64 dmx_real_64[PARAM_MC_MAX_TRANSPORT_CHANS];

    Word64 dmx_imag_64[PARAM_MC_MAX_TRANSPORT_CHANS];

#else
@@ -751,7 +760,7 @@ static void ivas_param_mc_param_est_enc_fx( 


#if defined( IMPROVE_HIGH_COMPLEXITY_PARAM_MC_PRM_EST_BE ) || defined( IMPROVE_HIGH_COMPLEXITY_PARAM_MC_PRM_EST_NONBE )

    Word16 gb = find_guarded_bits_fx( l_ts );

#ifndef MERGE_REQUEST_1472_SPEEDUIP_ivas_mc_param_enc_fx_NONBE

#ifndef MERGE_REQUEST_1472_SPEEDUP_ivas_mc_param_enc_fx_NONBE

    Word16 add20gb = add( 20, gb );

#endif
@@ -788,7 +797,7 @@ static void ivas_param_mc_param_est_enc_fx( 


                FOR( ch_idx1 = 0; ch_idx1 < nchan_transport; ++ch_idx1 )

                {

#ifdef MERGE_REQUEST_1472_SPEEDUIP_ivas_mc_param_enc_fx_NONBE

#ifdef MERGE_REQUEST_1472_SPEEDUP_ivas_mc_param_enc_fx_NONBE

                    Word64 real_64;

                    Word64 imag_64;
@@ -856,9 +865,9 @@ static void ivas_param_mc_param_est_enc_fx( 
                /* Cx for transport channels */

                FOR( ch_idx1 = 0; ch_idx1 < nchan_transport; ++ch_idx1 )

                {

#ifdef MERGE_REQUEST_1472_SPEEDUIP_ivas_mc_param_enc_fx_NONBE

                    CONVERT64( dmx_real_64[ch_idx1], a_fx, a_e );

                    CONVERT64( dmx_imag_64[ch_idx1], b_fx, b_e );

#ifdef MERGE_REQUEST_1472_SPEEDUP_ivas_mc_param_enc_fx_NONBE

                    CONVERT_DMX( dmx_real_64[ch_idx1], a_fx, a_e );

                    CONVERT_DMX( dmx_imag_64[ch_idx1], b_fx, b_e );

                    move32();

                    move32();

                    move16();
@@ -866,9 +875,9 @@ static void ivas_param_mc_param_est_enc_fx( 
#endif

                    FOR( ch_idx2 = 0; ch_idx2 < nchan_transport; ++ch_idx2 )

                    {

#ifdef MERGE_REQUEST_1472_SPEEDUIP_ivas_mc_param_enc_fx_NONBE

                        CONVERT64( dmx_real_64[ch_idx2], c_fx, c_e );

                        CONVERT64( dmx_imag_64[ch_idx2], d_fx, d_e );

#ifdef MERGE_REQUEST_1472_SPEEDUP_ivas_mc_param_enc_fx_NONBE

                        CONVERT_DMX( dmx_real_64[ch_idx2], c_fx, c_e );

                        CONVERT_DMX( dmx_imag_64[ch_idx2], d_fx, d_e );

                        move32();

                        move32();

                        move16();
@@ -1001,7 +1010,7 @@ static void ivas_param_mc_param_est_enc_fx( 


                FOR( ch_idx1 = 0; ch_idx1 < nchan_transport; ++ch_idx1 )

                {

#ifdef MERGE_REQUEST_1472_SPEEDUIP_ivas_mc_param_enc_fx_NONBE

#ifdef MERGE_REQUEST_1472_SPEEDUP_ivas_mc_param_enc_fx_NONBE

                    Word64 real_64;

                    Word64 imag_64;
@@ -1073,9 +1082,9 @@ static void ivas_param_mc_param_est_enc_fx( 
                /* Cx for transport channels */

                FOR( ch_idx1 = 0; ch_idx1 < nchan_transport; ++ch_idx1 )

                {

#ifdef MERGE_REQUEST_1472_SPEEDUIP_ivas_mc_param_enc_fx_NONBE

                    CONVERT64( dmx_real_64[ch_idx1], a_fx, a_e );

                    CONVERT64( dmx_imag_64[ch_idx1], b_fx, b_e );

#ifdef MERGE_REQUEST_1472_SPEEDUP_ivas_mc_param_enc_fx_NONBE

                    CONVERT_DMX( dmx_real_64[ch_idx1], a_fx, a_e );

                    CONVERT_DMX( dmx_imag_64[ch_idx1], b_fx, b_e );

                    move32();

                    move32();

                    move16();
@@ -1095,9 +1104,9 @@ static void ivas_param_mc_param_est_enc_fx( 
#endif

                    FOR( ch_idx2 = 0; ch_idx2 < nchan_transport; ++ch_idx2 )

                    {

#ifdef MERGE_REQUEST_1472_SPEEDUIP_ivas_mc_param_enc_fx_NONBE

                        CONVERT64( dmx_real_64[ch_idx2], c_fx, c_e );

                        CONVERT64( dmx_imag_64[ch_idx2], d_fx, d_e );

#ifdef MERGE_REQUEST_1472_SPEEDUP_ivas_mc_param_enc_fx_NONBE

                        CONVERT_DMX( dmx_real_64[ch_idx2], c_fx, c_e );

                        CONVERT_DMX( dmx_imag_64[ch_idx2], d_fx, d_e );

                        move32();

                        move32();

                        move16();
@@ -1310,11 +1319,7 @@ static void ivas_param_mc_param_est_enc_fx( 
                FOR( k = 0; k < nchan_input; ++k )

                {

#ifdef MERGE_REQUEST_1378_SPEEDUP_ivas_mc_param_enc_fx_NONBE

                    Word16 norm;

                    // convert the 64 bit fixpoint back into the 48 bit float format

                    norm = W_norm( Cy_sum_real_64[cur_param_band][k][k] );

                    Nrg_fx[k] = W_extract_h( W_shl( Cy_sum_real_64[cur_param_band][k][k], norm ) );

                    Nrg_e[k] = sub( sub( 62, gb ), norm );

                    CONVERT_CY( Cy_sum_real_64[cur_param_band][k][k], Nrg_fx[k], Nrg_e[k] );

#else

                    Nrg_fx[k] = Cy_sum_fx[cur_param_band][k][k];

                    move32();
@@ -1451,10 +1456,7 @@ static void ivas_param_mc_param_est_enc_fx( 
            {

                FOR( ch_idx2 = 0; ch_idx2 < MAX_CICP_CHANNELS; ch_idx2++ )

                {

                    Word16 norm;

                    norm = W_norm( Cy_sum_real_64[cur_param_band][ch_idx1][ch_idx2] );

                    Cy_sum_fx[cur_param_band][ch_idx1][ch_idx2] = W_extract_h( W_shl( Cy_sum_real_64[cur_param_band][ch_idx1][ch_idx2], norm ) );

                    Cy_sum_e[cur_param_band][ch_idx1][ch_idx2] = sub( sub( 62, gb ), norm );

                    CONVERT_CY( Cy_sum_real_64[cur_param_band][ch_idx1][ch_idx2], Cy_sum_fx[cur_param_band][ch_idx1][ch_idx2], Cy_sum_e[cur_param_band][ch_idx1][ch_idx2] );

                }

            }

        }
@@ -1497,11 +1499,7 @@ static void ivas_param_mc_param_est_enc_fx( 
            FOR( ch_idx2 = ch_idx1; ch_idx2 < nchan_input; ch_idx2++ )

            {

#ifdef MERGE_REQUEST_1378_SPEEDUP_ivas_mc_param_enc_fx_NONBE

                Word16 norm;

                // convert the 64 bit fixpoint back into the 48 bit float format

                norm = W_norm( Cy_sum_imag_64[cur_param_band][ch_idx1][ch_idx2] );

                imag_part_fx = W_extract_h( W_shl( Cy_sum_imag_64[cur_param_band][ch_idx1][ch_idx2], norm ) );

                imag_part_e = sub( sub( 62, gb ), norm );

                CONVERT_CY( Cy_sum_imag_64[cur_param_band][ch_idx1][ch_idx2], imag_part_fx, imag_part_e );

#else

                imag_part_fx = Cy_sum_imag_fx[cur_param_band][ch_idx1][ch_idx2];

                move32();