Commit 9f3787a5 authored by Jouni Paulus's avatar Jouni Paulus
Browse files

Merge branch... 

Merge branch '853-mismatch-of-declaration-and-definition-of-computeintensityvector_ana-and' into 'main'

Resolve "Mismatch of declaration and definition of computeIntensityVector_ana and computeReferencePower_ana"

See merge request !1157
parents e24274bb a0ee52d3

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -154,6 +154,7 @@ 
#define FIX_785_REMOVE_DEAD_CODE                        /* VA: issue 785: remove dead code */

#define FIX_852_FIX_HANDLE_DEREF                        /* VA: issue 852: Fix missing handle dereferencing of hIsmMetadaData in ivas_ism_metadata_close() */

#define FIX_520_REMOVE_MEMMOVE_JBM                      /* VA: issue 520: Remove memmove() from JBM code */

#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
@@ -1638,6 +1638,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       */
@@ -1653,6 +1670,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            */