Commit 6a83c01b authored by vaclav's avatar vaclav
Browse files

fix merging issue between FIX_197_CREND_INTERFACE into MASA_AND_OBJECTS

parent 086dbba2

lib_rend/ivas_stat_rend.h

+10 −0
Original line number Diff line number Diff line
@@ -241,8 +241,13 @@ typedef struct ivas_dirac_dec_binaural_data_structure 
    float ChEneOut[BINAURAL_CHANNELS][CLDFB_NO_CHANNELS_MAX];

    float ChCrossReOut[CLDFB_NO_CHANNELS_MAX];

    float ChCrossImOut[CLDFB_NO_CHANNELS_MAX];

#ifdef MASA_AND_OBJECTS

    float processMtxRe[BINAURAL_CHANNELS][BINAURAL_CHANNELS + MAX_NUM_OBJECTS][CLDFB_NO_CHANNELS_MAX];

    float processMtxIm[BINAURAL_CHANNELS][BINAURAL_CHANNELS + MAX_NUM_OBJECTS][CLDFB_NO_CHANNELS_MAX];

#else

    float processMtxRe[BINAURAL_CHANNELS][BINAURAL_CHANNELS + 1][CLDFB_NO_CHANNELS_MAX]; /* +1 refers to SeparateChannel */

    float processMtxIm[BINAURAL_CHANNELS][BINAURAL_CHANNELS + 1][CLDFB_NO_CHANNELS_MAX];

#endif

    float processMtxDecRe[BINAURAL_CHANNELS][BINAURAL_CHANNELS][CLDFB_NO_CHANNELS_MAX];

    float processMtxDecIm[BINAURAL_CHANNELS][BINAURAL_CHANNELS][CLDFB_NO_CHANNELS_MAX];

    float diffuseFieldCoherence[CLDFB_NO_CHANNELS_MAX];
@@ -253,8 +258,13 @@ typedef struct ivas_dirac_dec_binaural_data_structure 
    REVERB_STRUCT_HANDLE hReverb;

    uint8_t renderStereoOutputInsteadOfBinaural;

    float frameMeanDiffuseness[CLDFB_NO_CHANNELS_MAX];

#ifdef MASA_AND_OBJECTS

    float processMtxRePrev[BINAURAL_CHANNELS][BINAURAL_CHANNELS + MAX_NUM_OBJECTS][CLDFB_NO_CHANNELS_MAX];

    float processMtxImPrev[BINAURAL_CHANNELS][BINAURAL_CHANNELS + MAX_NUM_OBJECTS][CLDFB_NO_CHANNELS_MAX];

#else

    float processMtxRePrev[BINAURAL_CHANNELS][BINAURAL_CHANNELS + 1][CLDFB_NO_CHANNELS_MAX];

    float processMtxImPrev[BINAURAL_CHANNELS][BINAURAL_CHANNELS + 1][CLDFB_NO_CHANNELS_MAX];

#endif

    float processMtxDecRePrev[BINAURAL_CHANNELS][BINAURAL_CHANNELS][CLDFB_NO_CHANNELS_MAX];

    float processMtxDecImPrev[BINAURAL_CHANNELS][BINAURAL_CHANNELS][CLDFB_NO_CHANNELS_MAX];

    uint16_t useSubframeMode; /* 0 = process in 20 ms frames, 1 = process in 5 ms subframes */