Commit 5ba20af7 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

enable OBJ_EDITING_INTERFACE and fix EVS non-bitexactness

parent 9b6716ea

apps/decoder.c

+0 −1
Original line number Diff line number Diff line
@@ -1112,7 +1112,6 @@ static bool parseCmdlIVAS_dec( 
#ifdef OBJ_EDITING_EXAMPLE

    arg->objEditEnabled = false;

#endif

#





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

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ 


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



/*#define OBJ_EDITING_INTERFACE*/                      /* Interface for object editing */

#define OBJ_EDITING_INTERFACE                          /* Interface for object editing */

#ifdef OBJ_EDITING_INTERFACE

#define OBJ_EDITING_API                                /* object editing changes related to the API */

#define OBJ_EDITING_EXAMPLE                            /* obj editing example code in decoder.c */

lib_dec/ivas_jbm_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -792,7 +792,7 @@ void ivas_jbm_dec_feed_tc_to_renderer( 
    float *p_data_f[MAX_CLDFB_DIGEST_CHANNELS];

    int16_t n, n_render_timeslots;



    push_wmops( "ivas_jbm_dec_feed_tc_to_rendererer" );

    push_wmops( "ivas_jbm_dec_feed_tc_to_renderer" );

    for ( n = 0; n < MAX_CLDFB_DIGEST_CHANNELS; n++ )

    {

        p_data_f[n] = &data_f[n][0];
@@ -3012,7 +3012,7 @@ void ivas_jbm_dec_prepare_renderer( 
{

    int16_t n, n_render_timeslots;



    push_wmops( "ivas_jbm_dec_feed_tc_to_rendererer" );

    push_wmops( "ivas_jbm_dec_prepare_renderer" );



    n_render_timeslots = st_ivas->hTcBuffer->n_samples_available / st_ivas->hTcBuffer->n_samples_granularity;

lib_dec/lib_dec.c

+5 −5
Original line number Diff line number Diff line
@@ -895,7 +895,6 @@ ivas_error IVAS_DEC_FeedFrame_Serial( 
            bfi = 2;

        }

    }



    if ( ( error = read_indices( hIvasDec->st_ivas, serial, num_bits, &hIvasDec->prev_ft_speech, &hIvasDec->CNG, bfi ) ) != IVAS_ERR_OK )

    {

        return error;
@@ -919,8 +918,8 @@ ivas_error IVAS_DEC_FeedFrame_Serial( 


#ifdef OBJ_EDITING_API

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

    /* setup */

    if ( hIvasDec->hasBeenFedFirstGoodFrame )

    if ( ( hIvasDec->st_ivas->hDecoderConfig->Opt_tsm && hIvasDec->hasBeenFedFirstGoodFrame ) ||

         ( !hIvasDec->st_ivas->hDecoderConfig->Opt_tsm && ( !hIvasDec->isInitialized || hIvasDec->hasBeenFedFrame ) ) )

    {

        uint16_t l_ts, nTimeScalerOutSamples;

        uint8_t nTransportChannels, nOutChannels;
@@ -989,6 +988,7 @@ ivas_error IVAS_DEC_FeedFrame_Serial( 
                return IVAS_ERR_UNKNOWN;

            }

        }

        hIvasDec->hasBeenFedFrame = false;

    }

    hIvasDec->hasBeenPreparedRendering = false;
@@ -1388,7 +1388,7 @@ ivas_error IVAS_DEC_SetEditableParameters( 
/*---------------------------------------------------------------------*

 * IVAS_DEC_PrepareRenderer( )

 *

 * Main function to decode to PCM data

 * prepare IVAS JBM renderer

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

ivas_error IVAS_DEC_PrepareRenderer(

    IVAS_DEC_HANDLE hIvasDec )
@@ -1605,7 +1605,7 @@ ivas_error IVAS_DEC_GetSamples( 
#ifdef DEBUGGING

                else

                {

                    assert( 0 & "wrong PCM type for the flush buffer!" );

                    assert( 0 && "wrong PCM type for the flush buffer!" );

                }

#endif

                nSamplesRendered += hIvasDec->nSamplesFlushed;