Commit c4cbdc85 authored by bayers's avatar bayers
Browse files

object editing api, fix problem with EVS and JBM, clang-format

parent 407125cd

lib_dec/ivas_init_dec.c

+1 −2
Original line number Diff line number Diff line
@@ -2147,8 +2147,7 @@ ivas_error ivas_init_decoder( 
           st_ivas->renderer_type == RENDERER_OSBA_LS ||

           st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV ||

           st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM ||

           st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM

           ) )

           st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM ) )

    {

        if ( ( error = ivas_ism_renderer_open( st_ivas ) ) != IVAS_ERR_OK )

        {

lib_dec/ivas_ism_renderer.c

+0 −1
Original line number Diff line number Diff line
@@ -596,4 +596,3 @@ void ivas_omasa_separate_object_render_jbm( 


    return;

}

lib_dec/lib_dec.c

+6 −0
Original line number Diff line number Diff line
@@ -937,10 +937,16 @@ ivas_error IVAS_DEC_FeedFrame_Serial( 
#ifdef OBJ_EDITING_API

    /* decode TCs, do TSM and feed to renderer */

    /* setup */

    /* special case for EVS and JBM needed here */

    if ( !( hIvasDec->st_ivas->hDecoderConfig->Opt_tsm && !hIvasDec->hasBeenFedFirstGoodFrame && hIvasDec->mode == IVAS_DEC_MODE_EVS ) )

    {

        uint16_t l_ts, nTimeScalerOutSamples;

        uint8_t nTransportChannels, nOutChannels;

        int16_t nResidualSamples, nSamplesTcsScaled, nOutSamplesElse;



        l_ts = 0;

        nTransportChannels = 0;



#ifdef SPLIT_REND_WITH_HEAD_ROT

        if ( ( error = IVAS_DEC_Setup( hIvasDec, &l_ts, &nTransportChannels, &nOutChannels, &hIvasDec->nSamplesFlushed, hIvasDec->pcmType, hIvasDec->flushbuffer ) ) != IVAS_ERR_OK )

#else

lib_dec/ivas_objectRenderer_internal.c

+4 −4

File changed.

Contains only whitespace changes.