Commit f02f257d authored by vaclav's avatar vaclav
Browse files

fix 'variable set but not used' compilation warnings

parent fed0cff0
Loading
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -67,9 +67,11 @@ static ivas_error ivas_ism_bitrate_switching_dec(
    int16_t tc_nchan_allocate_new;
    int16_t tc_granularity_new;
    int16_t nchan_out_buff, nchan_out_buff_old;
#ifndef FIX_HRTF_LOAD_JBM
    AUDIO_CONFIG intern_config_old;
    IVAS_OUTPUT_SETUP hIntSetupOld;
    RENDERER_TYPE renderer_type_old;
#endif

    error = IVAS_ERR_OK;
    nCPE_old = st_ivas->nCPE;
@@ -107,12 +109,14 @@ static ivas_error ivas_ism_bitrate_switching_dec(
        return error;
    }

#ifndef FIX_HRTF_LOAD_JBM
    /* save old IntSetup, might be needed for JBM flushing...*/
    intern_config_old = st_ivas->intern_config;
    hIntSetupOld = st_ivas->hIntSetup;
    tc_granularity_new = 1;
    renderer_type_old = st_ivas->renderer_type;

#endif
    /*-----------------------------------------------------------------*
     * Initialize the needed renderer struct and destroy the unnecessary renderer struct
     *-----------------------------------------------------------------*/
@@ -368,7 +372,7 @@ static ivas_error ivas_ism_bitrate_switching_dec(
        }
    }

    return error;
    return IVAS_ERR_OK;
}


+4 −0
Original line number Diff line number Diff line
@@ -752,8 +752,10 @@ static ivas_error ivas_mc_dec_reconfig(
    int16_t tc_nchan_tc_new;
    int16_t tc_nchan_allocate_new;
    int16_t tc_granularity_new;
#ifndef FIX_HRTF_LOAD_JBM
    AUDIO_CONFIG intern_config_old;
    IVAS_OUTPUT_SETUP hIntSetupOld;
#endif
    int16_t nchan_out_buff_old, nchan_out_buff;

    error = IVAS_ERR_OK;
@@ -784,11 +786,13 @@ static ivas_error ivas_mc_dec_reconfig(
    }
    st_ivas->sba_dirac_stereo_flag = ivas_get_sba_dirac_stereo_flag( st_ivas );

#ifndef FIX_HRTF_LOAD_JBM
    /* save old IntSetup, might be needed for JBM flushing...*/
    intern_config_old = st_ivas->intern_config;
    hIntSetupOld = st_ivas->hIntSetup;
    tc_granularity_new = 1;

#endif
    /* renderer might have changed, reselect */
    renderer_type_old = st_ivas->renderer_type;
    ivas_renderer_select( st_ivas );