Commit 8027a531 authored by Jouni Paulus's avatar Jouni Paulus
Browse files

aligned declaration and definition of two OMASA analysis functions used in the... 

aligned declaration and definition of two OMASA analysis functions used in the renderer. switch: FIX_853_ARRAY_SIZE_MISMATCH
parent 6055cbe3

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ 
#define FIX_818_DOUBLE_PREC_KERNEL_SW                   /* FhG: Issue 818: Avoid double precision in kernel switching */

#define FIX_822_REFACTOR_BIN_REVERB_OPEN                /* Nokia: Addresses first step of issue 822 by refactoring ivas_binaural_reverb_open */

#define FIX_847_OUTPUT_PCM_BUFFER                       /* VA: issue 847: Allocate decoder output PCM buffer dynamically */

#define FIX_853_ARRAY_SIZE_MISMATCH                     /* Nokia: Issue #853: Mismatch of declaration and definition of computeIntensityVector_ana and computeReferencePower_ana */



/* #################### End BE switches ################################## */

lib_rend/ivas_prot_rend.h

+18 −0
Original line number Diff line number Diff line
@@ -1652,6 +1652,23 @@ void ivas_omasa_ana_close( 
    OMASA_ANA_HANDLE *hOMasa                                    /* i/o: analysis OMASA handle                   */

);



#ifdef FIX_853_ARRAY_SIZE_MISMATCH

void computeIntensityVector_ana(

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

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

    const int16_t num_frequency_bands,                           /* i  : Number of frequency bands       */

    float intensity_real[DIRAC_NUM_DIMS][MASA_FREQUENCY_BANDS]   /* o  : Intensity vector                */

);



void computeReferencePower_ana(

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

    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 num_freq_bands                                 /* i  : Number of frequency bands       */

);

#else

void computeIntensityVector_ana(

    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       */
@@ -1667,6 +1684,7 @@ void computeReferencePower_ana( 
    float *reference_power,                                             /* o  : Estimated power                 */

    const int16_t num_freq_bands                                        /* i  : Number of frequency bands       */

);

#endif



void ivas_create_masa_out_meta(

    MASA_DECODER_EXT_OUT_META_HANDLE extOutMeta,                                   /* i/o: MASA metadata handle            */