Commit 72c92110 authored by bayers's avatar bayers
Browse files

rename define

parent bf1a29d1

lib_com/options.h

+3 −1
Original line number Diff line number Diff line
@@ -147,6 +147,8 @@ 


/* ################## Start DEVELOPMENT switches ######################### */



#define OBJ_EDITING_INTERFACE



/* ################### Start BE switches ################################# */

/* only BE switches wrt selection floating point code */
@@ -161,7 +163,7 @@ 




#define FIX_976_USAN_PVQ_ENC_DEC_EVS_CR                      /* Ericsson:  premature cast to unsigned detected by USAN corrected  */

#define FIX_XXX_API_FEEDFRAME_GETSAMPLES





/* #################### End BE switches ################################## */

lib_dec/lib_dec.c

+8 −8
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ struct IVAS_DEC 
    int16_t prev_ft_speech;     /* RXDTX handler: previous frametype flag for  G.192 format AMRWB SID_FIRST detection */

    int16_t CNG;                /* RXDTX handler: CNG=1, nonCNG=0 */



#ifdef FIX_XXX_API_FEEDFRAME_GETSAMPLES

#ifdef OBJ_EDITING_INTERFACE

    uint16_t nSamplesFlushed;

    int16_t *flushbuffer;

#endif
@@ -177,7 +177,7 @@ ivas_error IVAS_DEC_Open( 
    hIvasDec->hasDecodedFirstGoodFrame = false;

    hIvasDec->isInitialized = false;

    hIvasDec->updateOrientation = false;

#ifdef FIX_XXX_API_FEEDFRAME_GETSAMPLES

#ifdef OBJ_EDITING_INTERFACE

    hIvasDec->flushbuffer = NULL;

    hIvasDec->nSamplesFlushed = 0;

#endif
@@ -322,7 +322,7 @@ void IVAS_DEC_Close( 
    {

        free( ( *phIvasDec )->apaExecBuffer );

    }

#ifdef FIX_XXX_API_FEEDFRAME_GETSAMPLES

#ifdef OBJ_EDITING_INTERFACE

    if ( ( *phIvasDec )->flushbuffer != NULL )

    {

        free( ( *phIvasDec )->flushbuffer );
@@ -492,7 +492,7 @@ ivas_error IVAS_DEC_Configure( 
    hIvasDec->tsm_max_scaling = 0;

    hIvasDec->tsm_quality = 1.0f;



#ifdef FIX_XXX_API_FEEDFRAME_GETSAMPLES

#ifdef OBJ_EDITING_INTERFACE

    /* init flush buffer if necessary (only needed for binaural)*/

    if ( tsmEnabled && ( outputConfig == IVAS_AUDIO_CONFIG_BINAURAL || outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM || outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR || outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )

    {
@@ -753,7 +753,7 @@ ivas_error IVAS_DEC_EnableVoIP( 
        return IVAS_ERR_FAILED_ALLOC;

    }



#ifdef FIX_XXX_API_FEEDFRAME_GETSAMPLES

#ifdef OBJ_EDITING_INTERFACE

    /* init flush buffer if necessary (only needed for binaural)*/

    if ( hIvasDec->flushbuffer == NULL && ( hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL || hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM || hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR || hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )

    {
@@ -854,7 +854,7 @@ ivas_error IVAS_DEC_FeedFrame_Serial( 
    hIvasDec->nSamplesRendered = 0;

    hIvasDec->nSamplesAvailableNext = hIvasDec->nSamplesFrame;



#ifdef FIX_XXX_API_FEEDFRAME_GETSAMPLES

#ifdef OBJ_EDITING_INTERFACE

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

    /* setup */

    {
@@ -1015,7 +1015,7 @@ ivas_error IVAS_DEC_GetSamples( 
    }

    else

    {

#ifndef FIX_XXX_API_FEEDFRAME_GETSAMPLES

#ifndef OBJ_EDITING_INTERFACE

        /* check if we need to run the setup function */

        if ( !hIvasDec->isInitialized || hIvasDec->hasBeenFedFrame )

        {
@@ -1037,7 +1037,7 @@ ivas_error IVAS_DEC_GetSamples( 
#endif

        {

            /* check if we need to run the setup function, tc decoding and feeding the renderer */

#ifndef FIX_XXX_API_FEEDFRAME_GETSAMPLES

#ifndef OBJ_EDITING_INTERFACE

            if ( !hIvasDec->isInitialized || hIvasDec->hasBeenFedFrame )

            {

                int16_t nResidualSamples, nSamplesTcsScaled;