Commit e8972b89 authored by PLAINSI's avatar PLAINSI
Browse files

Cleanup, renaming

parent ce3fe1e2

lib_com/ivas_cnst.h

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ typedef enum 
    RENDERER_BINAURAL_MIXER_CONV,

    RENDERER_BINAURAL_MIXER_CONV_ROOM

#ifdef MC_PARAMUPMIX_MODE

    ,RENDERER_MC_COUPLE

    ,RENDERER_MC_PARAMUPMIX

#endif



} RENDERER_TYPE;

lib_com/ivas_stat_com.h

+0 −43
Original line number Diff line number Diff line
@@ -593,49 +593,6 @@ typedef struct ivas_parametric_mc_metadata_value_coding_info_struct 


} PARAM_MC_PARAMETER_CODING_INFO, *HANDLE_PARAM_MC_PARAMETER_CODING_INFO;



#ifdef MC_PARAMUPMIX_MODE

typedef struct ivas_mc_paramupmix_metadata_struct

{

    int16_t dummyvar;

#if 0

    const PARAM_MC_ILD_MAPPING *ild_mapping_conf;

    const PARAM_MC_ICC_MAPPING *icc_mapping_conf;

    int16_t icc_mapping[PARAM_MC_PARAMETER_FRAMES][PARAM_MC_SZ_ICC_MAP][2];

    int16_t *icc_map_full[2];

    int16_t icc_map_size_full;

    int16_t param_frame_idx;

    int16_t flag_use_adaptive_icc_map;

    const float *ild_factors;

    int16_t coding_band_mapping[PARAM_MC_MAX_PARAMETER_BANDS];

    int16_t nbands_in_param_frame[PARAM_MC_PARAMETER_FRAMES];

    int16_t bAttackPresent;

    int16_t attackIndex;

    int16_t nbands_coded;

    int16_t num_parameter_bands;

    int16_t coded_bwidth;

    int16_t last_coded_bwidth;

    int16_t lfe_on;

    PARAM_MC_PARAMETER_CODING_INFO icc_coding;

    PARAM_MC_PARAMETER_CODING_INFO ild_coding;

#endif

} IVAS_MC_PARAMUPMIX_METADATA, *HANDLE_IVAS_MC_PARAMUPMIX_METADATA;



typedef struct ivas_mc_paramupmix_metadata_value_coding_info_struct

{

#if 0

    const uint16_t *cum_freq;

    const uint16_t *sym_freq;

    const uint16_t *cum_freq_delta;

    const uint16_t *sym_freq_delta;

    const float *quantizer;

    int16_t quantizer_size;

#endif

    int16_t uni_bits;



} MC_PARAMUPMIX_PARAMETER_CODING_INFO, *HANDLE_MC_PARAMUPMIX_PARAMETER_CODING_INFO;



#endif



typedef struct ivas_parametric_mc_metadata_struct

{

    const PARAM_MC_ILD_MAPPING *ild_mapping_conf;

lib_dec/ivas_init_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -1998,7 +1998,7 @@ void ivas_init_dec_get_num_cldfb_instances( 
            }

            break;

#ifdef MC_PARAMUPMIX_MODE

        case RENDERER_MC_COUPLE:

        case RENDERER_MC_PARAMUPMIX:

            *numCldfbAnalyses = MC_PARAMUPMIX_MIN_CLDFB;

            *numCldfbSyntheses = MC_PARAMUPMIX_MIN_CLDFB;

            break;

lib_dec/ivas_mct_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -1205,7 +1205,7 @@ static ivas_error ivas_mc_dec_reconfig( 
        {

#ifdef DEBUGGING

#ifdef MC_PARAMUPMIX_MODE

            assert( st_ivas->renderer_type == RENDERER_MC || st_ivas->renderer_type == RENDERER_MC_PARAMMC || st_ivas->renderer_type == RENDERER_MC_COUPLE || st_ivas->renderer_type == RENDERER_DIRAC || st_ivas->renderer_type == RENDERER_DISABLE );

            assert( st_ivas->renderer_type == RENDERER_MC || st_ivas->renderer_type == RENDERER_MC_PARAMMC || st_ivas->renderer_type == RENDERER_MC_PARAMUPMIX || st_ivas->renderer_type == RENDERER_DIRAC || st_ivas->renderer_type == RENDERER_DISABLE );

#else

            assert( st_ivas->renderer_type == RENDERER_MC || st_ivas->renderer_type == RENDERER_MC_PARAMMC || st_ivas->renderer_type == RENDERER_DIRAC || st_ivas->renderer_type == RENDERER_DISABLE );

#endif

lib_dec/ivas_out_setup_conversion.c

+1 −1
Original line number Diff line number Diff line
@@ -327,7 +327,7 @@ ivas_error ivas_ls_setup_conversion_open( 


    outChannels = nchan_out;

#ifdef MC_PARAMUPMIX_MODE

    if ( st_ivas->renderer_type == RENDERER_MC_PARAMMC || st_ivas->renderer_type == RENDERER_MC_COUPLE )

    if ( st_ivas->renderer_type == RENDERER_MC_PARAMMC || st_ivas->renderer_type == RENDERER_MC_PARAMUPMIX )

#else

    if ( st_ivas->renderer_type == RENDERER_MC_PARAMMC )

#endif