Commit d13a9d56 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

fix compile errors

parent 82d05b52
Loading
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -3258,7 +3258,6 @@ static ivas_error decodeVoIP(

#ifdef OBJ_EDITING_API
    bool parameterAvailableForEditing = false;
    uint16_t nSamplesRendered = 0;
#endif

    vec_pos_update = 0;
+8 −4
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ struct IVAS_DEC

#ifdef FIX_HRTF_LOAD
    uint16_t nSamplesFlushed;
    int16_t flushbuffer[20 * 960 / 4]; // temp. hack
    int16_t *flushbuffer; // temp. hack
    IVAS_DEC_PCM_TYPE pcmType;
    bool hasBeenPreparedRendering;
#endif
@@ -929,7 +929,7 @@ ivas_error IVAS_DEC_FeedFrame_Serial(
    if ( hIvasDec->hasBeenFedFirstGoodFrame )
    {
        uint16_t l_ts, nTimeScalerOutSamples;
        uint8_t nTransportChannels, nOutChannels;
        uint8_t nTransportChannels;
        int16_t nResidualSamples, nSamplesTcsScaled, nOutSamplesElse;

        if ( isSplitRend )
@@ -940,7 +940,11 @@ ivas_error IVAS_DEC_FeedFrame_Serial(
            }
        }

        if ( ( error = IVAS_DEC_Setup( hIvasDec, &l_ts, &nTransportChannels, &nOutChannels, &hIvasDec->nSamplesFlushed, hIvasDec->pcmType, hIvasDec->flushbuffer ) ) != IVAS_ERR_OK )
        if ( ( error = IVAS_DEC_Setup( hIvasDec, &l_ts, &nTransportChannels
#ifndef OBJ_EDITING_API
            ,&nOutChannels, &hIvasDec->nSamplesFlushed, hIvasDec->pcmType, hIvasDec->flushbuffer
#endif
         ) ) != IVAS_ERR_OK )
        {
            return error;
        }
@@ -3641,7 +3645,7 @@ ivas_error IVAS_DEC_VoIP_GetSamples(
    uint16_t *nSamplesRendered /* o  : number of samples rendered                                              */
#ifdef OBJ_EDITING_API
    ,
    bool *parameterAvailableForEditing
    bool *parametersAvailableForEditing
#endif
#else
#ifdef SUPPORT_JBM_TRACEFILE