Commit a99f5e42 authored by thomas dettbarn's avatar thomas dettbarn Committed by Manuel Jander
Browse files

Updated the macro names in the ivas_mc_param_enc_fx.c file.

parent 02fed4fe

lib_enc/ivas_mc_param_enc_fx.c

+15 −17
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 


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



#define MERGE_REQUEST_1378_TO_ISSUE_1462

#include <math.h>

#include <assert.h>

#include "options.h"
@@ -656,7 +655,7 @@ static void ivas_param_mc_param_est_enc_fx( 
    Word16 dmx_imag_e[PARAM_MC_MAX_TRANSPORT_CHANS];  /* Downmix channel - Imag Part */

    Word32 a_fx, b_fx, c_fx, d_fx;                    /* Tmp complex values */

    Word16 a_e, b_e, c_e, d_e;                        /* Tmp complex values */

#ifdef MERGE_REQUEST_1378_TO_ISSUE_1462

#ifdef MERGE_REQUEST_1378_SPEEDUP_ivas_mc_param_enc_fx_NONBE

    Word64 Cy_sum_real_64[PARAM_MC_MAX_PARAMETER_BANDS][MAX_CICP_CHANNELS][MAX_CICP_CHANNELS];

    Word64 Cy_sum_imag_64[PARAM_MC_MAX_PARAM_BAND_ABS_COV_ENC][MAX_CICP_CHANNELS][MAX_CICP_CHANNELS];

#else
@@ -691,7 +690,7 @@ static void ivas_param_mc_param_est_enc_fx( 
    move16();

    band_step = 1;

    move16();

#ifdef MERGE_REQUEST_1378_TO_ISSUE_1462

#ifdef MERGE_REQUEST_1378_SPEEDUP_ivas_mc_param_enc_fx_NONBE

    FOR( cur_param_band = 0; cur_param_band < PARAM_MC_MAX_PARAMETER_BANDS; cur_param_band++ )

    {

        FOR( ch_idx1 = 0; ch_idx1 < MAX_CICP_CHANNELS; ch_idx1++ )
@@ -705,7 +704,7 @@ static void ivas_param_mc_param_est_enc_fx( 
    {

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

        {

#ifdef MERGE_REQUEST_1378_TO_ISSUE_1462

#ifdef MERGE_REQUEST_1378_SPEEDUP_ivas_mc_param_enc_fx_NONBE

            set64_fx( Cy_sum_imag_64[cur_param_band][ch_idx1], 0, MAX_CICP_CHANNELS );

#else

            set32_fx( Cy_sum_fx[cur_param_band][ch_idx1], 0, MAX_CICP_CHANNELS );
@@ -851,7 +850,7 @@ static void ivas_param_mc_param_est_enc_fx( 
                        move32();

                    }

                }

#ifdef MERGE_REQUEST_1378_TO_ISSUE_1462

#ifdef MERGE_REQUEST_1378_SPEEDUP_ivas_mc_param_enc_fx_NONBE

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

                {

                    a_fx = slot_frame_f_real_fx[ch_idx1][cur_cldfb_band];
@@ -1069,7 +1068,7 @@ static void ivas_param_mc_param_est_enc_fx( 
                        move16();

                    }

#endif

#ifdef MERGE_REQUEST_1378_TO_ISSUE_1462

#ifdef MERGE_REQUEST_1378_SPEEDUP_ivas_mc_param_enc_fx_NONBE

                    a_fx = slot_frame_f_real_fx[ch_idx1][cur_cldfb_band];

                    b_fx = slot_frame_f_imag_fx[ch_idx1][cur_cldfb_band];

                    move32();
@@ -1144,7 +1143,11 @@ static void ivas_param_mc_param_est_enc_fx( 
                move32();

                Cy_sum_e[cur_param_band][ch_idx1][hParamMC->lfe_index] = 0;

                move16();

#ifdef MERGE_REQUEST_1378_TO_ISSUE_1462

#ifdef MERGE_REQUEST_1378_SPEEDUP_ivas_mc_param_enc_fx_NONBE

                Cy_sum_real_64[cur_param_band][hParamMC->lfe_index][ch_idx1] = 0;

                move64();

                Cy_sum_real_64[cur_param_band][ch_idx1][hParamMC->lfe_index] = 0;

                move64();

                Cy_sum_imag_64[cur_param_band][hParamMC->lfe_index][ch_idx1] = 0;

                move64();

                Cy_sum_imag_64[cur_param_band][ch_idx1][hParamMC->lfe_index] = 0;
@@ -1305,11 +1308,6 @@ static void ivas_param_mc_param_est_enc_fx( 
                                                                                                Cy_sum_fx[cur_param_band][ch_idx1][ch_idx2], Cy_sum_e[cur_param_band][ch_idx1][ch_idx2],

                                                                                                &Cy_sum_e[cur_param_band - 1][ch_idx1][ch_idx2] );

                    move32();

#ifdef MERGE_REQUEST_1378_TO_ISSUE_1462

                    Cy_sum_imag_64[cur_param_band - 1][ch_idx1][ch_idx2] = W_add( Cy_sum_imag_64[cur_param_band - 1][ch_idx1][ch_idx2], Cy_sum_imag_64[cur_param_band][ch_idx1][ch_idx2] );

                    move64();



#else

                    Cy_sum_imag_fx[cur_param_band - 1][ch_idx1][ch_idx2] = BASOP_Util_Add_Mant32Exp( Cy_sum_imag_fx[cur_param_band - 1][ch_idx1][ch_idx2], Cy_sum_imag_e[cur_param_band - 1][ch_idx1][ch_idx2],

                                                                                                     Cy_sum_imag_fx[cur_param_band][ch_idx1][ch_idx2], Cy_sum_imag_e[cur_param_band][ch_idx1][ch_idx2],

                                                                                                     &Cy_sum_imag_e[cur_param_band - 1][ch_idx1][ch_idx2] );
@@ -1408,12 +1406,8 @@ 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;

                real_part_fx = Cy_sum_fx[cur_param_band][ch_idx1][ch_idx2];

                move32();

                real_part_e = Cy_sum_e[cur_param_band][ch_idx1][ch_idx2];

                move16();

#ifdef MERGE_REQUEST_1378_TO_ISSUE_1462

                // 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 ) );
@@ -1424,6 +1418,10 @@ static void ivas_param_mc_param_est_enc_fx( 
                imag_part_e = Cy_sum_imag_e[cur_param_band][ch_idx1][ch_idx2];

                move16();

#endif

                real_part_fx = Cy_sum_fx[cur_param_band][ch_idx1][ch_idx2];

                move32();

                real_part_e = Cy_sum_e[cur_param_band][ch_idx1][ch_idx2];

                move16();

                real_part_fx = Mpy_32_32( real_part_fx, real_part_fx );

                imag_part_fx = Mpy_32_32( imag_part_fx, imag_part_fx );