Commit a7e5e223 authored by ber's avatar ber
Browse files

change macro name from FIX1072_SPEEDUP_formulate2x2MixingMatrix_fx_func1 to... 

change macro name from FIX1072_SPEEDUP_formulate2x2MixingMatrix_fx_func1 to FIX1072_SPEEDUP_combinbedMatrixcalcuklations and corresponding function name from formulate2x2MixingMatrix_fx_func1 to combinedMatrixCalculations
parent d076c485

lib_rend/ivas_dirac_dec_binaural_functions.c

+12 −12
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ 
#include "wmc_auto.h"



# if ( BINAURAL_CHANNELS == 2 )

#define FIX1072_SPEEDUP_formulate2x2MixingMatrix_fx_func1 // 5Mhz - accept Regression

#define FIX1072_SPEEDUP_combinedMatrixCalculations

#endif
@@ -204,7 +204,7 @@ static void matrixTransp2Mul_fx( 
    Word32 outIm[BINAURAL_CHANNELS][BINAURAL_CHANNELS] /*q_out*/,

    Word16 *q_out );



#if defined( FIX_1072_SPEEDUP_matrixMul_fx ) || defined( FIX_1072_SPEEDUP_matrixTransp1Mul_fx ) || defined( FIX_1072_SPEEDUP_matrixTransp2Mul_fx_reducetest ) || defined( FIX1072_SPEEDUP_formulate2x2MixingMatrix_fx_func1 )

#if defined( FIX_1072_SPEEDUP_matrixMul_fx ) || defined( FIX_1072_SPEEDUP_matrixTransp1Mul_fx ) || defined( FIX_1072_SPEEDUP_matrixTransp2Mul_fx_reducetest ) || defined( FIX1072_SPEEDUP_combinedMatrixCalculations )



/* ( (a && b) || (!a && !b) ) = ( ( !a || !b ) && ( a || b )) */

static inline Word32 matrixMul_func1( Word32 cond1, Word32 cond2, Word32 prod )
@@ -230,8 +230,8 @@ static inline Word32 matrixMul_func1( Word32 cond1, Word32 cond2, Word32 prod ) 


#endif



#if defined( FIX1072_SPEEDUP_formulate2x2MixingMatrix_fx_func1 )

static void formulate2x2MixingMatrix_fx_func1(

#if defined( FIX1072_SPEEDUP_combinedMatrixCalculations )

static void combinedMatrixCalculations(

    Word32 Are_fx[BINAURAL_CHANNELS][BINAURAL_CHANNELS], /*q_A*/

    Word32 Aim_fx[BINAURAL_CHANNELS][BINAURAL_CHANNELS], /*q_A*/

    Word16 *q_A,
@@ -463,7 +463,7 @@ static void formulate2x2MixingMatrix_fx_func1( 
    }

    return;

}

#endif /*FIX1072_SPEEDUP_formulate2x2MixingMatrix_fx_func1*/

#endif /*FIX1072_SPEEDUP_combinedMatrixCalculations*/



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

 * ivas_dirac_dec_init_binaural_data()
@@ -2163,7 +2163,7 @@ static void ivas_dirac_dec_binaural_determine_processing_matrices_fx( 
        Word32 prototypeMtx_fx[BINAURAL_CHANNELS][BINAURAL_CHANNELS] = { { ONE_IN_Q31, 107374182 }, { 107374182, ONE_IN_Q31 } };

        move32();

        Word16 q_M, q_Cx, q_res, q_CrEne, q_CrCross, q_Mdec = 0;

#ifndef FIX1072_SPEEDUP_formulate2x2MixingMatrix_fx_func1

#ifndef FIX1072_SPEEDUP_combinedMatrixCalculations

        Word32 tmpMtxRe_fx[BINAURAL_CHANNELS][BINAURAL_CHANNELS], tmpMtxIm_fx[BINAURAL_CHANNELS][BINAURAL_CHANNELS];

        Word16 q_tmp;

#endif
@@ -2294,8 +2294,8 @@ static void ivas_dirac_dec_binaural_determine_processing_matrices_fx( 


        /* Make matrix multiplication M*Cx*M' to determine resulting covariance matrix of processing input with M */



#if defined( FIX1072_SPEEDUP_formulate2x2MixingMatrix_fx_func1 )

        formulate2x2MixingMatrix_fx_func1( Mre_fx, Mim_fx, &q_M, 1 /*scale?*/, CxRe_fx, CxIm_fx, &q_Cx, 1 /*scale*/, Mre_fx, Mim_fx, &q_M, 0 /*scale*/, resultMtxRe_fx, resultMtxIm_fx, &q_res );

#if defined( FIX1072_SPEEDUP_combinedMatrixCalculations )

        combinedMatrixCalculations( Mre_fx, Mim_fx, &q_M, 1 /*scale?*/, CxRe_fx, CxIm_fx, &q_Cx, 1 /*scale*/, Mre_fx, Mim_fx, &q_M, 0 /*scale*/, resultMtxRe_fx, resultMtxIm_fx, &q_res );

#else

        matrixMul_fx( Mre_fx, Mim_fx, &q_M, CxRe_fx, CxIm_fx, &q_Cx, tmpMtxRe_fx, tmpMtxIm_fx, &q_tmp );

        matrixTransp2Mul_fx(
@@ -2305,7 +2305,7 @@ static void ivas_dirac_dec_binaural_determine_processing_matrices_fx( 
            0 /*int Bscale*/,

#endif

            resultMtxRe_fx, resultMtxIm_fx, &q_res );

#endif /*FIX1072_SPEEDUP_formulate2x2MixingMatrix_fx_func1*/

#endif /*FIX1072_SPEEDUP_combinedMatrixCalculations*/



        /* When below the frequency limit where decorrelation is applied, we inject the decorrelated

         * residual (or missing) signal component. The procedure is active when there are not enough independent
@@ -5637,8 +5637,8 @@ static void formulate2x2MixingMatrix_fx( 
    }

    pop_wmops(); //push_wmops( "IDDB_2x2Matrix_Part3.2" );

    push_wmops( "IDDB_2x2Matrix_Part3.3" );

#if defined( FIX1072_SPEEDUP_formulate2x2MixingMatrix_fx_func1 )

    formulate2x2MixingMatrix_fx_func1( KyRe_fx, KyIm_fx, &q_ky, 0 /*scale*/, Pre_fx, Pim_fx, &q_P, 0 /*scale*/, Uxre_fx, Uxim_fx, &q_Ux, 0 /*scale*/, Mre_fx, Mim_fx, q_M );

#if defined( FIX1072_SPEEDUP_combinedMatrixCalculations )

    combinedMatrixCalculations( KyRe_fx, KyIm_fx, &q_ky, 0 /*scale*/, Pre_fx, Pim_fx, &q_P, 0 /*scale*/, Uxre_fx, Uxim_fx, &q_Ux, 0 /*scale*/, Mre_fx, Mim_fx, q_M );

#else

    matrixMul_fx( KyRe_fx, KyIm_fx, &q_ky, Pre_fx, Pim_fx, &q_P, tmpRe_fx, tmpIm_fx, &q_temp );
@@ -5648,7 +5648,7 @@ static void formulate2x2MixingMatrix_fx( 
                         0 /*int Bscale*/,

#endif

                         Mre_fx, Mim_fx, q_M );

#endif /*FIX1072_SPEEDUP_formulate2x2MixingMatrix_fx_func1*/

#endif /*FIX1072_SPEEDUP_combinedMatrixCalculations*/

    pop_wmops(); //push_wmops( "IDDB_2x2Matrix_Part3.3" );

    pop_wmops(); // push_wmops( "IDDB_2x2Matrix_Part3" );

    pop_wmops(); /*IDDB_detProcMat_bigLoop1_2x2Matrix*/