Commit 2907566d authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_1486_INIT_OUTPUT_POINTERS

parent 0afaaf6c

lib_com/options.h

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

#define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR      /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */

#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */

#define FIX_1486_INIT_OUTPUT_POINTERS                   /* FhG: always initialize pointers in renderer flush */

#define FIX_1449_RENDERER_FRAME_SIZE_UNCLEAR_IN_ISAR    /* Dolby: Fix for issue 1449: renderer frame size unclear in ISAR */

#define FIX_1827_REMOVE_UNUSED_PSNOISEGEN_ISAR          /* Dolby: remove unused noise generator from ISAR */

#define FIX_1495_INCORRECT_FREAD_CALL                   /* Eri: Switched size and number of elements in fread call. */

lib_dec/ivas_jbm_dec.c

+0 −14
Original line number Diff line number Diff line
@@ -1417,9 +1417,7 @@ ivas_error ivas_jbm_dec_flush_renderer( 
    int16_t n_samples_still_available;

    int16_t n_slots_still_available;

    int16_t n_samples_to_render;

#ifdef FIX_1486_INIT_OUTPUT_POINTERS

    int16_t ch_idx;

#endif

    int16_t n_samples_granularity;

    DECODER_TC_BUFFER_HANDLE hTcBuffer;

    float *p_output[MAX_LS_CHANNELS + MAX_NUM_OBJECTS];
@@ -1429,12 +1427,10 @@ ivas_error ivas_jbm_dec_flush_renderer( 
        return IVAS_ERR_OK;

    }



#ifdef FIX_1486_INIT_OUTPUT_POINTERS

    for ( ch_idx = 0; ch_idx < MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS; ch_idx++ )

    {

        p_output[ch_idx] = st_ivas->p_output_f[ch_idx];

    }

#endif



    *nSamplesRendered = 0;

    hTcBuffer = st_ivas->hTcBuffer;
@@ -1453,10 +1449,6 @@ ivas_error ivas_jbm_dec_flush_renderer( 


    if ( n_slots_still_available )

    {

#ifndef FIX_1486_INIT_OUTPUT_POINTERS

        int16_t ch_idx;



#endif

        /* render available full slots (with new lower granularity) */

        for ( ch_idx = 0; ch_idx < max( hTcBuffer->nchan_transport_rend, hTcBuffer->nchan_buffer_full ); ch_idx++ )

        {
@@ -1476,12 +1468,6 @@ ivas_error ivas_jbm_dec_flush_renderer( 
        hTcBuffer->n_samples_flushed = n_samples_to_render;

        hTcBuffer->n_samples_rendered = 0;



#ifndef FIX_1486_INIT_OUTPUT_POINTERS

        for ( ch_idx = 0; ch_idx < MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS; ch_idx++ )

        {

            p_output[ch_idx] = st_ivas->p_output_f[ch_idx];

        }

#endif



        if ( st_ivas->ivas_format == ISM_FORMAT )

        {