Commit 61e9983f authored by bayers's avatar bayers
Browse files

fix #901, remove dead ParamMC code and tables, change a few more defines, fix compiler warnings

parent f1dbbe20

lib_com/ivas_cnst.h

+4 −0
Original line number Diff line number Diff line
@@ -1392,7 +1392,11 @@ typedef enum 
#define PARAM_MC_ICC_ERROR_BIAS_FAC              (1.15f)                    /* factor for favouring past ICC maps in the adaptive ICC map decision */

#define PARAM_MC_TRANSIENT_BAND_STEP             2                          /* Number of parameter bands combined in case of a transient frame*/

#define PARAM_MC_MAX_DECORR_CLDFB_BANDS         20                          /* Maximum number of CLDFB bands with decorrelation */

#ifdef FIX_901_PARAMMC_DEAD_CODE

#define PARAM_MC_MAX_TRANSPORT_CHANS             3                          /* Number of down mix channels */

#else

#define PARAM_MC_MAX_TRANSPORT_CHANS             4                          /* Number of down mix channels */

#endif

#define PARAM_MC_MAX_ILD_REF_CHANNELS            2                          /* Maximum number of reference channels for a coded ILD */

#ifdef FIX_901_PARAMMC_DEAD_CODE

#define PARAM_MC_NUM_CONFIGS                    14                          /* Number of available Parametric MC configurations */

lib_com/ivas_mc_param_com.c

+6 −2
Original line number Diff line number Diff line
@@ -87,12 +87,16 @@ uint16_t ivas_param_mc_get_configuration_index( 


void ivas_param_mc_metadata_open(

    const MC_LS_SETUP mc_ls_setup, /* i  : MC ls setup                                         */

#ifndef FIX_901_PARAMMC_DEAD_CODE

    const int16_t lfe_index, /* i  : channel index of LFE                                */

#endif

    const int32_t ivas_total_brate,            /* i  : IVAS total bitrate                                  */

    HANDLE_IVAS_PARAM_MC_METADATA hMetadataPMC /* o  : handle for the Parametric MC parameter coding state */

)

{

#ifndef FIX_901_PARAMMC_DEAD_CODE

    int16_t i;

#endif

    uint16_t config_index;

    int16_t nchan_setup;

lib_com/ivas_prot.h

+3 −2
Original line number Diff line number Diff line
@@ -3805,7 +3805,9 @@ void ivas_mc_paramupmix_dec_render( 


void ivas_param_mc_metadata_open(

    const MC_LS_SETUP mc_ls_setup,                              /* i  : MC ls setup                                         */

	#ifndef FIX_901_PARAMMC_DEAD_CODE

    const int16_t lfe_index,                                    /* i  : channel index of LFE                                */

	#endif

    const int32_t ivas_total_brate,                             /* i  : IVAS total bitrate                                  */

    HANDLE_IVAS_PARAM_MC_METADATA hMetadataPMC                  /* o  : handle for the Parametric MC parameter coding state */

);
@@ -3818,7 +3820,6 @@ void ivas_param_mc_set_coded_bands( 
void ivas_param_mc_metadata_close(

    HANDLE_IVAS_PARAM_MC_METADATA hMetadataPMC                  /* i/o: handle for the Parametric MC parameter coding state */

);

#endif



void ivas_param_mc_create_full_icc_mapping(

    const int16_t n_channels,                                   /* i  : number of channels with LFE for the internal setup  */
@@ -3826,7 +3827,7 @@ void ivas_param_mc_create_full_icc_mapping( 
    int16_t *icc_map[2],                                        /* o  : map of all possible ICCs                            */

    int16_t *icc_map_size_full                                  /* o  : number of all possible ICCs                         */

);



#endif

/*! r: number of IVAS transport channels */

int16_t ivas_param_mc_getNumTransportChannels(

    const int32_t ivas_total_bitrate,                           /* i  : IVAS total bitrate                                  */

lib_dec/ivas_mc_param_dec.c

+12 −2
Original line number Diff line number Diff line
@@ -228,7 +228,11 @@ ivas_error ivas_param_mc_dec_open( 


    hParamMC->num_freq_bands = (int16_t) ( output_Fs * INV_CLDFB_BANDWIDTH + 0.5f );

    hParamMC->max_band_energy_compensation = hParamMC->num_freq_bands;

#ifndef FIX_901_PARAMMC_DEAD_CODE

    ivas_param_mc_metadata_open( mc_ls_setup, hTransportSetup.index_lfe[0], ivas_total_brate, hParamMC->hMetadataPMC );

#else

    ivas_param_mc_metadata_open( mc_ls_setup, ivas_total_brate, hParamMC->hMetadataPMC );

#endif



    /* init arrays for quantized parameters */

    if ( ( hParamMC->icc_q = (float *) malloc( hParamMC->hMetadataPMC->num_parameter_bands * hParamMC->hMetadataPMC->icc_mapping_conf->icc_map_size_lfe * sizeof( float ) ) ) == NULL )
@@ -642,8 +646,11 @@ ivas_error ivas_param_mc_dec_reconfig( 
#endif



    mvs2s( hParamMC->band_grouping, band_grouping_old, hParamMC->hMetadataPMC->num_parameter_bands + 1 );



#ifndef FIX_901_PARAMMC_DEAD_CODE

    ivas_param_mc_metadata_open( mc_ls_setup, hTransportSetup.index_lfe[0], ivas_total_brate, hParamMC->hMetadataPMC );

#else

    ivas_param_mc_metadata_open( mc_ls_setup, ivas_total_brate, hParamMC->hMetadataPMC );

#endif



    /* Band Grouping */

    if ( hParamMC->hMetadataPMC->num_parameter_bands == 20 )
@@ -1218,7 +1225,10 @@ void ivas_param_mc_dec_read_BS( 
    int16_t num_lfe_bands;

    int16_t num_param_bands;

    int16_t metadata_bit_pos;

    int16_t i, j, k, l;

    int16_t i, j, k;

#ifndef FIX_901_PARAMMC_DEAD_CODE

    int16_t l;

#endif

    int16_t icc_map_size;

    int16_t icc_map_size_wo_lfe;

    int16_t ild_map_size;

lib_enc/ivas_mc_param_enc.c

+16 −3
Original line number Diff line number Diff line
@@ -88,7 +88,10 @@ ivas_error ivas_param_mc_enc_open( 
    Encoder_Struct *st_ivas /* i/o: IVAS encoder handle          */

)

{

    int16_t i, k, l;

    int16_t i;

#ifndef FIX_901_PARAMMC_DEAD_CODE

    int16_t k, l;

#endif

    IVAS_FB_CFG *fb_cfg;

    PARAM_MC_ENC_HANDLE hParamMC;

    uint16_t config_index;
@@ -154,8 +157,11 @@ ivas_error ivas_param_mc_enc_open( 
    }



    /* open/init parameter coding */

#ifndef FIX_901_PARAMMC_DEAD_CODE

    ivas_param_mc_metadata_open( mc_input_setup, hParamMC->lfe_index, ivas_total_brate, &hParamMC->hMetadataPMC );



#else

    ivas_param_mc_metadata_open( mc_input_setup, ivas_total_brate, &hParamMC->hMetadataPMC );

#endif

#ifndef FIX_901_PARAMMC_DEAD_CODE

    /* init icc index states */

    for ( i = 0; i < PARAM_MC_PARAMETER_FRAMES; i++ )
@@ -239,7 +245,10 @@ ivas_error ivas_param_mc_enc_reconfig( 
    Encoder_Struct *st_ivas /* i/o: IVAS encoder handle          */

)

{

    int16_t i, k, l;

    int16_t i;

#ifndef FIX_901_PARAMMC_DEAD_CODE

    int16_t k, l;

#endif

    PARAM_MC_ENC_HANDLE hParamMC;

    uint16_t config_index;

    MC_LS_SETUP mc_input_setup;
@@ -300,7 +309,11 @@ ivas_error ivas_param_mc_enc_reconfig( 
#endif



    /* open/init parameter coding */

#ifndef FIX_901_PARAMMC_DEAD_CODE

    ivas_param_mc_metadata_open( mc_input_setup, hParamMC->lfe_index, ivas_total_brate, &hParamMC->hMetadataPMC );

#else

    ivas_param_mc_metadata_open( mc_input_setup, ivas_total_brate, &hParamMC->hMetadataPMC );

#endif



#ifndef FIX_901_PARAMMC_DEAD_CODE

    /* init icc index states */