Commit a6dd08ff authored by emerit's avatar emerit
Browse files

Merge branch 'main' into hrtf_improvements_basop_2

parents 6d68e463 3e7c6ebc

lib_rend/ivas_mcmasa_ana_fx.c

+3 −3
Original line number Diff line number Diff line
@@ -60,13 +60,12 @@ 
/* Structure for covariance matrix */

typedef struct

{

    float xr[MCMASA_MAX_ANA_CHANS][MCMASA_MAX_ANA_CHANS];

    float xi[MCMASA_MAX_ANA_CHANS][MCMASA_MAX_ANA_CHANS];

    Word32 xr_fx[MCMASA_MAX_ANA_CHANS][MCMASA_MAX_ANA_CHANS];

    Word32 xi_fx[MCMASA_MAX_ANA_CHANS][MCMASA_MAX_ANA_CHANS];

    Word16 xr_e[MCMASA_MAX_ANA_CHANS][MCMASA_MAX_ANA_CHANS]; /*Stores exponent for xr_fx*/

    Word16 xi_e[MCMASA_MAX_ANA_CHANS][MCMASA_MAX_ANA_CHANS]; /*Stores exponent for xi_fx*/

} CovarianceMatrix;



void ivas_mcmasa_param_est_ana_fx(

    MCMASA_ANA_HANDLE hMcMasa,                                                         /* i  : McMASA analyzer structure           */

    Word32 data_fx[][L_FRAME48k],                                                      /* i  : Audio frame in MC-format            */
@@ -80,7 +79,6 @@ void ivas_mcmasa_param_est_ana_fx( 
    const Word16 nchan_inp    /* i  : Number of input channels            */

);





static void computeVerticalDiffuseness_fx(

    Word32 **buffer_intensity,   /* i  : Intensity vectors           */

    const Word32 *buffer_energy, /* i  : Energy                      */
@@ -88,6 +86,7 @@ static void computeVerticalDiffuseness_fx( 
    Word32 *diffuseness,         /* o  : Estimated diffuseness   Q31 */

    Word16 *buffer_intensity_q,

    Word16 *buffer_energy_q );



static void compute_cov_mtx_fx(

    Word32 sr[MCMASA_MAX_ANA_CHANS][CLDFB_NO_CHANNELS_MAX], /* i  : Input matrix, real, s[ch][freq]                         */

    Word32 si[MCMASA_MAX_ANA_CHANS][CLDFB_NO_CHANNELS_MAX], /* i  : Input matrix, imag, s[ch][freq]                         */
@@ -96,6 +95,7 @@ static void compute_cov_mtx_fx( 
    CovarianceMatrix *COVls,                                /* o  : Output matrix, contains upper part of cov mtx           */

    Word16 inp_exp                                          /* i  : Stores exponent for sr and si                           */

);



static void computeEvenLayout_fx(

    const Word32 *ls_azimuth, /* i: Q22 */

    Word32 *ls_azimuth_even,  /* o: Q22 */