Commit d5210093 authored by bayers's avatar bayers
Browse files

fix Linux compile errors

parent df367c9d

lib_dec/ivas_ism_param_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -1282,22 +1282,18 @@ void ivas_param_ism_dec_prepare_renderer( 
    int16_t ch, nchan_transport, nchan_out, nchan_out_woLFE, i;

    int16_t slot_idx, bin_idx;

    int32_t ivas_total_brate;

    int16_t output_frame;

    float ref_power[CLDFB_NO_CHANNELS_MAX];

    float cx_diag[CLDFB_NO_CHANNELS_MAX][PARAM_ISM_MAX_DMX];

    /* Direct Response/EFAP Gains */

    float direct_response[MAX_NUM_OBJECTS][PARAM_ISM_MAX_CHAN];

    PARAM_ISM_DEC_HANDLE hParamIsmDec;

    SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom;

    int16_t fade_len;



    /* Initialization */

    hParamIsmDec = st_ivas->hParamIsmDec;

    assert( hParamIsmDec );

    hSpatParamRendCom = st_ivas->hSpatParamRendCom;

    assert( hSpatParamRendCom );

    output_frame = nCldfbSlots * hSpatParamRendCom->num_freq_bands;

    fade_len = output_frame / 2;



    nchan_transport = st_ivas->nchan_transport;

    ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate;

lib_dec/ivas_objectRenderer_internal.c

+0 −2
Original line number Diff line number Diff line
@@ -178,8 +178,6 @@ ivas_error ivas_td_binaural_renderer_sf( 
            {

                ISM_METADATA_FRAME ismMetaData[MAX_NUM_OBJECTS];

                ISM_METADATA_HANDLE hIsmMetaData[MAX_NUM_OBJECTS];

                int16_t s_idx;

                s_idx = 0;

                for ( nS = 0; nS < nchan_ism; nS++ )

                {

                    ismMetaData[nS].azimuth = st_ivas->hIsmRendererData->edited_azimuth[nS];

lib_dec/lib_dec.c

+7 −3
Original line number Diff line number Diff line
@@ -1078,17 +1078,21 @@ ivas_error IVAS_DEC_GetSamples( 
{

    ivas_error error;

    int16_t nSamplesToRender;

    uint16_t nSamplesRendered, nSamplesRendered_loop, l_ts;

    uint8_t nTransportChannels, nOutChannels;

    uint16_t nSamplesRendered, nSamplesRendered_loop;

    uint8_t nOutChannels;

#ifndef OBJ_EDITING_INTERFACE

    uint8_t nTransportChannels;

    int16_t nOutSamplesElse;

    uint16_t nTimeScalerOutSamples;

    uint16_t nTimeScalerOutSamples. l_ts;

#endif

    nSamplesRendered = 0;

    nOutChannels = 0;

    nSamplesRendered_loop = 0;

#ifndef OBJ_EDITING_INTERFACE

    l_ts = 0;

    nTransportChannels = 0;

#endif





    if ( hIvasDec == NULL || hIvasDec->st_ivas == NULL )

    {