Commit 7f6cdce8 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Fix DIRAC_MAX_ANA_CHANS to FOA_CHANNELS within OMASA.

parent beea05b2

lib_enc/ivas_omasa_enc.c

+9 −9
Original line number Diff line number Diff line
@@ -56,9 +56,9 @@ static void ivas_omasa_energy_and_ratio_est( OMASA_ENC_HANDLE hOMasa, MASA_ENCOD 


static void ivas_omasa_dmx( float data_in_f[][L_FRAME48k], float data_out_f[][L_FRAME48k], const int16_t input_frame, const int16_t nchan_transport, const int16_t nchan_ism, ISM_METADATA_HANDLE hIsmMeta[], float prev_gains[][MASA_MAX_TRANSPORT_CHANNELS], const float interpolator[L_FRAME48k] );



static void computeIntensityVector_enc( const int16_t *band_grouping, float Cldfb_RealBuffer[DIRAC_MAX_ANA_CHANS][CLDFB_NO_CHANNELS_MAX], float Cldfb_ImagBuffer[DIRAC_MAX_ANA_CHANS][CLDFB_NO_CHANNELS_MAX], const int16_t num_frequency_bands, float intensity_real[DIRAC_NUM_DIMS][MASA_FREQUENCY_BANDS] );

static void computeIntensityVector_enc( const int16_t *band_grouping, float Cldfb_RealBuffer[FOA_CHANNELS][CLDFB_NO_CHANNELS_MAX], float Cldfb_ImagBuffer[FOA_CHANNELS][CLDFB_NO_CHANNELS_MAX], const int16_t num_frequency_bands, float intensity_real[DIRAC_NUM_DIMS][MASA_FREQUENCY_BANDS] );



static void computeReferencePower_omasa( const int16_t *band_grouping, float Cldfb_RealBuffer[DIRAC_MAX_ANA_CHANS][CLDFB_NO_CHANNELS_MAX], float Cldfb_ImagBuffer[DIRAC_MAX_ANA_CHANS][CLDFB_NO_CHANNELS_MAX], float *reference_power, const int16_t enc_param_start_band, const int16_t num_freq_bands );

static void computeReferencePower_omasa( const int16_t *band_grouping, float Cldfb_RealBuffer[FOA_CHANNELS][CLDFB_NO_CHANNELS_MAX], float Cldfb_ImagBuffer[FOA_CHANNELS][CLDFB_NO_CHANNELS_MAX], float *reference_power, const int16_t enc_param_start_band, const int16_t num_freq_bands );





/*--------------------------------------------------------------------------*
@@ -753,8 +753,8 @@ static void ivas_omasa_param_est_enc( 
    int16_t l_ts;

    float Chnl_RealBuffer[MCMASA_MAX_ANA_CHANS][CLDFB_NO_CHANNELS_MAX];

    float Chnl_ImagBuffer[MCMASA_MAX_ANA_CHANS][CLDFB_NO_CHANNELS_MAX];

    float Foa_RealBuffer[DIRAC_MAX_ANA_CHANS][CLDFB_NO_CHANNELS_MAX];

    float Foa_ImagBuffer[DIRAC_MAX_ANA_CHANS][CLDFB_NO_CHANNELS_MAX];

    float Foa_RealBuffer[FOA_CHANNELS][CLDFB_NO_CHANNELS_MAX];

    float Foa_ImagBuffer[FOA_CHANNELS][CLDFB_NO_CHANNELS_MAX];

    float intensity_real[DIRAC_NUM_DIMS][MASA_FREQUENCY_BANDS];

    float direction_vector[DIRAC_NUM_DIMS][MASA_FREQUENCY_BANDS];

    float diffuseness_vector[MASA_FREQUENCY_BANDS];
@@ -1057,8 +1057,8 @@ static void ivas_omasa_dmx( 


static void computeIntensityVector_enc(

    const int16_t *band_grouping,

    float Cldfb_RealBuffer[DIRAC_MAX_ANA_CHANS][CLDFB_NO_CHANNELS_MAX],

    float Cldfb_ImagBuffer[DIRAC_MAX_ANA_CHANS][CLDFB_NO_CHANNELS_MAX],

    float Cldfb_RealBuffer[FOA_CHANNELS][CLDFB_NO_CHANNELS_MAX],

    float Cldfb_ImagBuffer[FOA_CHANNELS][CLDFB_NO_CHANNELS_MAX],

    const int16_t num_frequency_bands,

    float intensity_real[DIRAC_NUM_DIMS][MASA_FREQUENCY_BANDS] )

{
@@ -1095,8 +1095,8 @@ static void computeIntensityVector_enc( 


static void computeReferencePower_omasa(

    const int16_t *band_grouping,                                       /* i  : Band grouping for estimation    */

    float Cldfb_RealBuffer[DIRAC_MAX_ANA_CHANS][CLDFB_NO_CHANNELS_MAX], /* i  : Real part of input signal       */

    float Cldfb_ImagBuffer[DIRAC_MAX_ANA_CHANS][CLDFB_NO_CHANNELS_MAX], /* i  : Imag part of input signal       */

    float Cldfb_RealBuffer[FOA_CHANNELS][CLDFB_NO_CHANNELS_MAX], /* i  : Real part of input signal       */

    float Cldfb_ImagBuffer[FOA_CHANNELS][CLDFB_NO_CHANNELS_MAX], /* i  : Imag part of input signal       */

    float *reference_power,                                             /* o  : Estimated power                 */

    const int16_t enc_param_start_band,                                 /* i  : first band to process           */

    const int16_t num_freq_bands                                        /* i  : Number of frequency bands       */
@@ -1111,7 +1111,7 @@ static void computeReferencePower_omasa( 
        brange[1] = band_grouping[i + enc_param_start_band + 1];

        reference_power[i] = 0;



        for ( ch_idx = 0; ch_idx < DIRAC_MAX_ANA_CHANS; ch_idx++ )

        for ( ch_idx = 0; ch_idx < FOA_CHANNELS; ch_idx++ )

        {

            /* abs()^2 */

            for ( j = brange[0]; j < brange[1]; j++ )