Commit d96a6fc2 authored by vaclav's avatar vaclav
Browse files

fix compilation warnings

parent 728022f6

lib_dec/ivas_ism_metadata_dec.c

+2 −3
Original line number Diff line number Diff line
@@ -663,7 +663,7 @@ ivas_error ivas_ism_metadata_dec( 
    {

        ism_metadata_smooth( hIsmMeta, ism_total_brate, nchan_ism );

    }

    hISMDTX.ism_dtx_hangover_cnt = min( ( hISMDTX.ism_dtx_hangover_cnt )++, IVAS_ISM_DTX_HO_MAX );

    hISMDTX.ism_dtx_hangover_cnt = min( hISMDTX.ism_dtx_hangover_cnt++, IVAS_ISM_DTX_HO_MAX );

#endif



    /*----------------------------------------------------------------*
@@ -1039,7 +1039,7 @@ void ivas_ism_metadata_sid_dec( 
    int16_t nb_bits_metadata[]      /* o  : number of metadata bits     */

)

{

    int16_t i, ch, nb_bits_start, last_bit_pos;

    int16_t i, ch, last_bit_pos;

    float q_step, q_step_border;

    int16_t idx, idx_azimuth, idx_elevation;

    int16_t nBits_azimuth, nBits_elevation, nBits_coh, nBits_sce_id;
@@ -1060,7 +1060,6 @@ void ivas_ism_metadata_sid_dec( 
    /* initialization */

    st0 = hSCE[0]->hCoreCoder[0];



    nb_bits_start = 0;

    last_bit_pos = (int16_t) ( ( ism_total_brate / FRAMES_PER_SEC ) - 1 - SID_FORMAT_NBITS );

    bstr_orig = st0->bit_stream;

    next_bit_pos_orig = st0->next_bit_pos;

lib_dec/ivas_ism_param_dec.c

+5 −2
Original line number Diff line number Diff line
@@ -422,7 +422,9 @@ ivas_error ivas_param_ism_dec_open( 
    IVAS_OUTPUT_SETUP hOutSetup;

    AUDIO_CONFIG output_config;

    int32_t output_Fs;

#ifndef NCHAN_ISM_PARAMETER

    int16_t nchan_out;

#endif

    ivas_error error;



    error = IVAS_ERR_OK;
@@ -451,11 +453,12 @@ ivas_error ivas_param_ism_dec_open( 


    output_Fs = st_ivas->hDecoderConfig->output_Fs;

    output_config = st_ivas->hDecoderConfig->output_config;

    nchan_out = st_ivas->hDecoderConfig->nchan_out;



#ifdef NCHAN_ISM_PARAMETER



    ivas_param_ism_config( hDirAC->hParamIsm, st_ivas->nchan_ism );

#else

    nchan_out = st_ivas->hDecoderConfig->nchan_out;



    if ( output_config == AUDIO_CONFIG_EXTERNAL )

    {

        hDirAC->hParamIsm->num_obj = nchan_out;