Commit b6ed2b2c authored by reutelhuber's avatar reutelhuber
Browse files

remove duplicated structure from ivas_stat_dec.h

parent b9d3e0e4
Loading
Loading
Loading
Loading
Loading

lib_dec/ivas_stat_dec.h

100644 → 100755
+0 −34
Original line number Diff line number Diff line
@@ -465,40 +465,6 @@ typedef struct dirac_output_synthesis_cov_state_structure

} DIRAC_OUTPUT_SYNTHESIS_COV_STATE;

#ifdef OSBA_DISC_OBJ_MCT
/* Data structure for MASA_ISM rendering */
typedef struct ivas_masa_ism_data_structure
{
#if 0
    int16_t azimuth_ism[MAX_NUM_OBJECTS][MAX_PARAM_SPATIAL_SUBFRAMES + DELAY_MASA_PARAM_DEC_SFR];
    int16_t elevation_ism[MAX_NUM_OBJECTS][MAX_PARAM_SPATIAL_SUBFRAMES + DELAY_MASA_PARAM_DEC_SFR];
    float energy_ratio_ism[MAX_NUM_OBJECTS][MAX_PARAM_SPATIAL_SUBFRAMES + DELAY_MASA_PARAM_DEC_SFR][CLDFB_NO_CHANNELS_MAX];

    int16_t azimuth_ism_edited[MAX_NUM_OBJECTS];
    int16_t elevation_ism_edited[MAX_NUM_OBJECTS];
    uint8_t ism_is_edited[MAX_NUM_OBJECTS];

    int16_t idx_separated_ism;
    int16_t azimuth_separated_ism[MAX_PARAM_SPATIAL_SUBFRAMES + DELAY_MASA_PARAM_DEC_SFR];
    int16_t elevation_separated_ism[MAX_PARAM_SPATIAL_SUBFRAMES + DELAY_MASA_PARAM_DEC_SFR];

    float q_azimuth_old[MAX_NUM_OBJECTS];
    float q_elevation_old[MAX_NUM_OBJECTS];

    float ismPreprocMatrix[2][2][CLDFB_NO_CHANNELS_MAX];
    uint8_t objectsMoved;
    float eneMoveIIR[2][CLDFB_NO_CHANNELS_MAX];
    float enePreserveIIR[2][CLDFB_NO_CHANNELS_MAX];
    float preprocEneTarget[CLDFB_NO_CHANNELS_MAX];
    float preprocEneRealized[CLDFB_NO_CHANNELS_MAX];
#endif

    float **delayBuffer;
    int16_t delayBuffer_size;
    int16_t delayBuffer_nchan;

} MASA_ISM_DATA, *MASA_ISM_DATA_HANDLE;
#endif

/*----------------------------------------------------------------------------------*
 * ParamMC structures