Commit c5365c9a authored by Jouni Paulus's avatar Jouni Paulus
Browse files

Merge branch... 

Merge branch '888-mismatch-of-expected-and-provided-function-argument-size-in-mcmasa-enc' into 'main'

Match function prototype with the variables used in the call (McMASA)

See merge request !1197
parents d03813af 5b21c519

lib_com/ivas_prot.h

+5 −0
Original line number Diff line number Diff line
@@ -5521,8 +5521,13 @@ void lls_interp_n( 


void computeReferencePower_enc(

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

#ifdef FIX_888_INTERFACE_UNIFICATION

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

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

#else

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

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

#endif

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

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -153,6 +153,7 @@ 
#define FIX_879_USAN_ERROR_IN_MASA_DECODING             /* FhG: Issue 879 : avoid arithmetic with NULL pointer in the DirAC decoder to fix USAN error */

#define FIX_740_MASA_PREREND_VALIDITY_CHECK             /* Nokia: issue 740: fix incorrect validity check in lib_rend to allow use of MASA prerenderer */

#define FIX_865_MOVE_TD_DECORR                          /* VA: issue 865: Move ivas_td_decorr.c from lib_com to lib_rend */

#define FIX_888_INTERFACE_UNIFICATION                   /* Nokia: issue #888: fix mismatch in 2D array size */

#define FIX_889_MASA_FILE_WRITER_OPEN                   /* Nokia: issue #889: mismatch in function definition and use */

#define FIX_890_ARRAY_SIZE                              /* Nokia: issue #890: mismatch in 2D array size declaration and use */

lib_enc/ivas_dirac_enc.c

+14 −9
Original line number Diff line number Diff line
@@ -531,8 +531,13 @@ static int16_t ivas_dirac_get_mono_flag( 


void computeReferencePower_enc(

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

#ifdef FIX_888_INTERFACE_UNIFICATION

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

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

#else

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

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

#endif

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

lib_enc/ivas_mcmasa_enc.c

+9 −0
Original line number Diff line number Diff line
@@ -69,7 +69,11 @@ static void ivas_mcmasa_dmx( MCMASA_ENC_HANDLE hMcMasa, float *data_f[], const i 


static void compute_cov_mtx( float sr[MCMASA_MAX_ANA_CHANS][DIRAC_NO_FB_BANDS_MAX], float si[MCMASA_MAX_ANA_CHANS][DIRAC_NO_FB_BANDS_MAX], const int16_t freq, const int16_t N, CovarianceMatrix *COVls );



#ifdef FIX_888_INTERFACE_UNIFICATION

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

#else

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

#endif



static void computeVerticalDiffuseness( float **buffer_intensity, const float *buffer_energy, const int16_t averaging_length, const int16_t num_freq_bands, float *diffuseness );
@@ -1459,8 +1463,13 @@ static void compute_cov_mtx( 


static void computeIntensityVector_enc(

    const int16_t *band_grouping,

#ifdef FIX_888_INTERFACE_UNIFICATION

    float Cldfb_RealBuffer[FOA_CHANNELS][DIRAC_NO_FB_BANDS_MAX],

    float Cldfb_ImagBuffer[FOA_CHANNELS][DIRAC_NO_FB_BANDS_MAX],

#else

    float Cldfb_RealBuffer[DIRAC_MAX_ANA_CHANS][DIRAC_NO_FB_BANDS_MAX],

    float Cldfb_ImagBuffer[DIRAC_MAX_ANA_CHANS][DIRAC_NO_FB_BANDS_MAX],

#endif

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

    const int16_t num_frequency_bands,

    float intensity_real[DIRAC_NUM_DIMS][MASA_FREQUENCY_BANDS] )