Commit ead89d58 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_1486_INIT_OUTPUT_POINTERS

parent 74331d14

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ 
#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_1904_HARM_GSC_ENC                           /* VA: #1904 Harmonization of EVS and IVAS GSC code */

#define FIX_1478_UNINIT_ON_BFI                          /* VA: Fix issue 1478 where a vector is partly un-initialized during bfi */

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

#define FIX_1494_SET_SPLITBFI_UNUSED                    /* Dolby: Fix issue 1494, remove unused function setting BFI flag in ISAR renderer */

#define FIX_1479_MSAN_SPAR_UNINITIALIZED_VALUE          /* Dolby: Fix for issue 1479, MSAN error due to uninitialized value in SPAR */

#define HARM_LSF_ENC                                    /* VA: basop issue 2301: Remove duplicated code in LSF quantizer */

lib_dec/ivas_jbm_dec_fx.c

+0 −17
Original line number Diff line number Diff line
@@ -2553,9 +2553,7 @@ ivas_error ivas_jbm_dec_flush_renderer_fx( 
    DECODER_TC_BUFFER_HANDLE hTcBuffer;

    Word32 *p_output_fx[MAX_LS_CHANNELS + MAX_NUM_OBJECTS];

    Word16 nchan_in, nchan_out;

#ifdef FIX_1486_INIT_OUTPUT_POINTERS

    Word16 ch_idx;

#endif





    IF( !st_ivas->hDecoderConfig->Opt_tsm )
@@ -2563,12 +2561,10 @@ ivas_error ivas_jbm_dec_flush_renderer_fx( 
        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_fx[ch_idx] = st_ivas->p_output_fx[ch_idx];

    }

#endif



    *nSamplesRendered = 0;

    move16();
@@ -2595,9 +2591,6 @@ ivas_error ivas_jbm_dec_flush_renderer_fx( 


    IF( n_slots_still_available )

    {

#ifndef FIX_1486_INIT_OUTPUT_POINTERS

        Word16 ch_idx;

#endif



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

        FOR( ch_idx = 0; ch_idx < s_max( hTcBuffer->nchan_transport_rend, hTcBuffer->nchan_buffer_full ); ch_idx++ )
@@ -2627,12 +2620,6 @@ ivas_error ivas_jbm_dec_flush_renderer_fx( 
        move16();

        move16();



#ifndef FIX_1486_INIT_OUTPUT_POINTERS

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

        {

            p_output_fx[ch_idx] = st_ivas->p_output_fx[ch_idx];

        }

#endif



        test();

        IF( EQ_16( st_ivas->ivas_format, ISM_FORMAT ) )
@@ -2883,11 +2870,7 @@ ivas_error ivas_jbm_dec_flush_renderer_fx( 
        IF( NE_16( st_ivas->ivas_format, MONO_FORMAT ) )

        {

#ifndef DISABLE_LIMITER

#ifndef FIX_1486_INIT_OUTPUT_POINTERS

            Word16 ch_idx, exp = 11;

#else

            Word16 exp = 11;

#endif

            move16();

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

            {