Commit 543d2909 authored by vaclav's avatar vaclav Committed by Manuel Jander
Browse files

accept FIX_1119_SPLIT_RENDERING_VOIP

parent cee330d0

apps/decoder.c

+10 −2
Original line number Diff line number Diff line
@@ -1857,8 +1857,12 @@ static ivas_error initOnFirstGoodFrame( 
                    return error;

                }

            }

<<<<<<< HEAD



            if ( !isSplitCoded )

=======

            else

>>>>>>> 554f97d05 (accept FIX_1119_SPLIT_RENDERING_VOIP)

            {

                if ( *pRemainingDelayNumSamples < *numOutSamples )

                {
@@ -3304,6 +3308,7 @@ static ivas_error decodeVoIP( 
            /* Once good frame decoded, catch up */

            if ( decodedGoodFrame )

            {

<<<<<<< HEAD

<<<<<<< HEAD

                if ( ( error = initOnFirstGoodFrame( hIvasDec, arg, numInitialBadFrames, &nOutSamples, &vec_pos_len, delayNumSamples_orig, &delayNumSamples, &delayTimeScale,

                                                     &bsFormat, &afWriter, &masaWriter, ismWriters, &nOutChannels, &numObj, &srRtp, &splitRendWriter ) ) != IVAS_ERR_OK )
@@ -3333,6 +3338,10 @@ static ivas_error decodeVoIP( 
                                                     &srRtp,

                                                     &splitRendWriter ) ) != IVAS_ERR_OK )

>>>>>>> 526949b21 (accept RTPDUMP switches)

=======

                if ( ( error = initOnFirstGoodFrame( hIvasDec, arg, numInitialBadFrames, &nOutSamples, &vec_pos_len, delayNumSamples_orig, &delayNumSamples, &delayTimeScale,

                                                     &bsFormat, &afWriter, &masaWriter, ismWriters, &nOutChannels, &numObj, &srRtp, &splitRendWriter ) ) != IVAS_ERR_OK )

>>>>>>> 554f97d05 (accept FIX_1119_SPLIT_RENDERING_VOIP)

                {

                    goto cleanup;

                }
@@ -3354,8 +3363,7 @@ static ivas_error decodeVoIP( 
                    goto cleanup;

                }

            }



            if ( !isSplitCoded )

            else

            {

                if ( delayNumSamples < nOutSamples )

                {

lib_com/ivas_prot_fx.h

+1 −1
Original line number Diff line number Diff line
@@ -6710,7 +6710,7 @@ void ivas_binaural_hrtf_close_fx( 




/*---------------------------------------------------------------------------------*

 * Multi-pose ring buffer Prototypes

 * Multi-pose ring buffer Prototypes for split-rendering

*-----------------------------------------------------------------------------------*/



ivas_error ivas_CLDFB_RINGBUF_Open(