Commit fa4094af authored by bayers's avatar bayers
Browse files

fix for #901, remove dead ParamMC code, fix Linux compiler warnings

parent cd4e1cae

lib_dec/ivas_mc_param_dec.c

+12 −2
Original line number Diff line number Diff line
@@ -114,7 +114,9 @@ ivas_error ivas_param_mc_dec_open( 
{

    int16_t k, nchan_transport;

    PARAM_MC_DEC_HANDLE hParamMC;

#ifndef FIX_901_PARAMMC_DEAD_CODE

    IVAS_OUTPUT_SETUP hTransportSetup;

#endif

    int16_t nchan_out_transport;

    int16_t nchan_out_cov;

    float proto_matrix[MAX_CICP_CHANNELS * PARAM_MC_MAX_TRANSPORT_CHANS];
@@ -146,8 +148,9 @@ ivas_error ivas_param_mc_dec_open( 
    output_Fs = st_ivas->hDecoderConfig->output_Fs;

    output_config = st_ivas->hDecoderConfig->output_config;

    ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate;



#ifndef FIX_901_PARAMMC_DEAD_CODE

    hTransportSetup = st_ivas->hTransSetup;

#endif

    mc_ls_setup = ivas_mc_map_output_config_to_mc_ls_setup( st_ivas->transport_config );

    nchan_out_transport = st_ivas->hTransSetup.nchan_out_woLFE + st_ivas->hTransSetup.num_lfe;

    hParamMC->hoa_encoder = NULL;
@@ -555,7 +558,9 @@ ivas_error ivas_param_mc_dec_reconfig( 
{

    int16_t k, nchan_transport;

    PARAM_MC_DEC_HANDLE hParamMC;

#ifndef FIX_901_PARAMMC_DEAD_CODE

    IVAS_OUTPUT_SETUP hTransportSetup;

#endif

    int16_t nchan_out_transport;

    int16_t nchan_out_cov;

    float proto_matrix[MAX_CICP_CHANNELS * PARAM_MC_MAX_TRANSPORT_CHANS];
@@ -584,8 +589,9 @@ ivas_error ivas_param_mc_dec_reconfig( 


    output_Fs = st_ivas->hDecoderConfig->output_Fs;

    ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate;



#ifndef FIX_901_PARAMMC_DEAD_CODE

    hTransportSetup = st_ivas->hTransSetup;

#endif

    mc_ls_setup = ivas_mc_map_output_config_to_mc_ls_setup( st_ivas->transport_config );

    nchan_out_transport = st_ivas->hTransSetup.nchan_out_woLFE + st_ivas->hTransSetup.num_lfe;
@@ -2724,11 +2730,15 @@ static void ivas_param_mc_dequantize_cov( 
    int16_t l;

    float *Cyp;

    float ap;

#ifndef FIX_901_PARAMMC_DEAD_CODE

    int16_t param_frame_idx;

#endif

    const PARAM_MC_ILD_MAPPING *h_ild_mapping;

    float Cy_state_int[MAX_OUTPUT_CHANNELS * MAX_OUTPUT_CHANNELS];



#ifndef FIX_901_PARAMMC_DEAD_CODE

    param_frame_idx = hParamMC->hMetadataPMC->param_frame_idx;

#endif

    set_zero( Nrqq, MAX_OUTPUT_CHANNELS );

    h_ild_mapping = hParamMC->hMetadataPMC->ild_mapping_conf;