Commit bda232cf authored by vaclav's avatar vaclav
Browse files

accept FIX_853_ARRAY_SIZE_MISMATCH

parent d2300d4f

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -151,7 +151,6 @@ 
/*#define SPLIT_REND_WITH_HEAD_ROT  */                  /* Dlb,FhG: Split Rendering contributions 21 and 35 */



#define FIX_820_DOUBLE_PREC_MACROS                      /* VA: issue 820: Double precision arithmetic in IVAS_CALCULATE_ABS() */

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

#define FIX_814_DOUBLE_PREC_IN_REVERB                   /* Philips: Issue 814: Replace double precision arithmetic in reverb */

#define FIX_866_MOVE_VBAP                               /* Nokia: Issue 866: Move VBAP to lib_rend */

lib_rend/ivas_prot_rend.h

+0 −18
Original line number Diff line number Diff line
@@ -1691,7 +1691,6 @@ 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       */
@@ -1707,23 +1706,6 @@ void computeReferencePower_ana( 
    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       */

    float Cldfb_ImagBuffer[DIRAC_MAX_ANA_CHANS][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[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 *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            */