Commit 79e9a090 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_519_JBM_ACCESS_NULL_TC_BUFFER

parent 20deaa6f

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -147,7 +147,6 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */



#define FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG         /* Phi: issue 196 - refactoring renderer output configuration */

#define FIX_519_JBM_ACCESS_NULL_TC_BUFFER               /* FhG: fix issue 519, accessing a yet uninitialized TC Buffer in frame 0*/

#ifdef IND_LIST_DYN

#define FIX_545_ASSERT                                  /* VA: fix issue 545, replace assert() with warning message when hitting memory limit in the buffer of indices */

#endif

lib_dec/lib_dec.c

+0 −8
Original line number Diff line number Diff line
@@ -965,15 +965,11 @@ ivas_error IVAS_DEC_GetBufferedNumberOfSamples( 
    {

        return IVAS_ERR_UNEXPECTED_NULL_POINTER;

    }

#ifdef FIX_519_JBM_ACCESS_NULL_TC_BUFFER

    /* check if the TC buffer already exists, otherweise nothing is buffered anyway */

    if ( hIvasDec->st_ivas->hTcBuffer != NULL )

    {

#endif

        *nSamplesBuffered = hIvasDec->st_ivas->hTcBuffer->n_samples_buffered - hIvasDec->st_ivas->hTcBuffer->n_samples_rendered;

#ifdef FIX_519_JBM_ACCESS_NULL_TC_BUFFER

    }

#endif



    return error;

}
@@ -1864,11 +1860,7 @@ ivas_error IVAS_DEC_VoIP_GetSamples( 
            {

                int16_t nSamplesBuffered;

                nSamplesBuffered = 0;

#ifdef FIX_519_JBM_ACCESS_NULL_TC_BUFFER

                if ( hIvasDec->hasDecodedFirstGoodFrame )

#else

                if ( hIvasDec->hasBeenFedFirstGoodFrame )

#endif

                {

                    IVAS_DEC_GetBufferedNumberOfSamples( hIvasDec, &nSamplesBuffered );

                }