Commit 8570e064 authored by bayers's avatar bayers
Browse files

Merge branch '37-contribution-jitter-fhg' of... 

Merge branch '37-contribution-jitter-fhg' of forge.3gpp.org:ivas-codec-pc/ivas-codec into 37-contribution-jitter-fhg
parents 4a48efe9 480a38cf

lib_dec/lib_dec.c

+10 −6
Original line number Diff line number Diff line
@@ -648,12 +648,6 @@ ivas_error IVAS_DEC_EnableVoIP( 
#ifdef VARIABLE_SPEED_DECODING

    if ( hIvasDec->hVoIP->mode == IVAS_DEC_VOIP_MODE_VARIABLE_SPEED )

    {

        if ( pcmdsp_fifo_create( &hIvasDec->hVoIP->hFifoOut ) != 0 ||

             pcmdsp_fifo_init( hIvasDec->hVoIP->hFifoOut, (uint16_t) ( hDecoderConfig->output_Fs * 4 / FRAMES_PER_SEC ) /* 4 frames */, hDecoderConfig->nchan_out, sizeof( int16_t ) ) != 0 )

        {

            return IVAS_ERR_INIT_ERROR;

        }

        /* we instantly need a new frame */

        hIvasDec->hVoIP->needNewFrame = true;

    }

#endif
@@ -3172,6 +3166,16 @@ ivas_error IVAS_DEC_VoIP_reconfigure( IVAS_DEC_HANDLE hIvasDec, const uint16_t n 
                return IVAS_ERR_INIT_ERROR;

            }

        }

#ifdef VARIABLE_SPEED_DECODING

        else if ( hIvasDec->hVoIP->mode == IVAS_DEC_VOIP_MODE_VARIABLE_SPEED )

        {

            if ( pcmdsp_fifo_create( &hIvasDec->hVoIP->hFifoOut ) != 0 ||

                 pcmdsp_fifo_init( hIvasDec->hVoIP->hFifoOut, (uint16_t) ( hDecoderConfig->output_Fs * 4 / FRAMES_PER_SEC ) /* 4 frames */, hDecoderConfig->nchan_out, sizeof( int16_t ) ) != 0 )

            {

                return IVAS_ERR_INIT_ERROR;

            }

        }

#endif

        if ( hIvasDec->mode == IVAS_DEC_MODE_EVS )

        {

            if ( apa_set_evs_compat_mode( hIvasDec->hVoIP->hTimeScaler, true ) != 0 )