Commit 874f9560 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_888_INTERFACE_UNIFICATION

parent 91089394

lib_com/ivas_prot.h

+0 −5
Original line number Diff line number Diff line
@@ -5494,13 +5494,8 @@ 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

+0 −1
Original line number Diff line number Diff line
@@ -150,7 +150,6 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

/*#define SPLIT_REND_WITH_HEAD_ROT  */                  /* Dlb,FhG: Split Rendering contributions 21 and 35 */



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

#define BE_FIX_887_GCC_WARNING_ARRAY_SIZE               /* VoiceAge: Issue 887: change array size definition to avoid warning with gcc 11.4.0 */

lib_enc/ivas_dirac_enc.c

+0 −5
Original line number Diff line number Diff line
@@ -531,13 +531,8 @@ 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

+0 −9
Original line number Diff line number Diff line
@@ -69,11 +69,7 @@ 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 );
@@ -1463,13 +1459,8 @@ 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] )