Commit 0bc24dea authored by fotopoulou's avatar fotopoulou
Browse files

fix compiler errors

parent e9467735

lib_com/ivas_mc_param_com.c

+7 −7
Original line number Diff line number Diff line
@@ -330,7 +330,7 @@ void ivas_param_mc_default_icc_map( 
}



#ifdef MC_BITRATE_SWITCHING

int16_t ivas_param_mc_get_num_param_bands(

static int16_t ivas_param_mc_get_num_param_bands(

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

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

)

lib_dec/ivas_mc_param_dec.c

+0 −8
Original line number Diff line number Diff line
@@ -494,14 +494,10 @@ ivas_error ivas_param_mc_dec_reconfig( 
    uint16_t config_index;

    MC_LS_SETUP mc_ls_setup;

    float frequency_axis[CLDFB_NO_CHANNELS_MAX];

    AUDIO_CONFIG output_config;

    int32_t output_Fs, ivas_total_brate;

    ivas_error error;

    int16_t nchan_transport_old;

    int16_t num_param_bands_old;

    const PARAM_MC_ILD_MAPPING *ild_mapping_conf_old;

    const PARAM_MC_ICC_MAPPING *icc_mapping_conf_old;

    const float *ild_factors_old;

    PARAM_MC_PARAMETER_BAND_MAPPING parameter_band_mapping;

    int16_t band_grouping_old[20 + 1];
@@ -518,7 +514,6 @@ ivas_error ivas_param_mc_dec_reconfig( 
     *-----------------------------------------------------------------*/



    output_Fs = st_ivas->hDecoderConfig->output_Fs;

    output_config = st_ivas->hDecoderConfig->output_config;

    ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate;



    hTransportSetup = st_ivas->hTransSetup;
@@ -583,9 +578,6 @@ ivas_error ivas_param_mc_dec_reconfig( 
        }

    }



    ild_mapping_conf_old = hParamMC->hMetadataPMC->ild_mapping_conf;

    icc_mapping_conf_old = hParamMC->hMetadataPMC->icc_mapping_conf;

    ild_factors_old = hParamMC->hMetadataPMC->ild_factors;

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



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

lib_dec/ivas_mct_dec.c

+3 −3
Original line number Diff line number Diff line
@@ -601,7 +601,7 @@ ivas_error ivas_mc_dec_config( 
    AUDIO_CONFIG signaled_config;

    MC_MODE last_mc_mode;

    ivas_error error;

    MC_MODE mc_mode;



    error = IVAS_ERR_OK;



    /* store last frame MC mode */
@@ -646,7 +646,7 @@ ivas_error ivas_mc_dec_reconfig( 
{

    int16_t nchan_transport_old, nSCE_old, nCPE_old, sba_dirac_stereo_flag_old;

    int16_t numCldfbAnalyses_old, numCldfbAnalyses, numCldfbSyntheses, numCldfbSyntheses_old, i;

    int16_t renderer_type_old;

    RENDERER_TYPE renderer_type_old;

    ivas_error error;

    MC_MODE mc_mode;

    error = IVAS_ERR_OK;
@@ -951,7 +951,7 @@ ivas_error ivas_mc_dec_reconfig( 
                ivas_dirac_dec_close_binaural_data( &st_ivas->hDiracDecBin );

            }

            /* init necessary new renderers */

            if ( st_ivas->hBinRenderer == NULL && st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM )

            if ( st_ivas->hBinRenderer == NULL && ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM ) )

            {

                if ( ( error = ivas_binRenderer_open( st_ivas ) ) != IVAS_ERR_OK )

                {