Commit e6fde30d authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

consolidate FIX_MSAN_ASAN_FMSW_HP20 into FIX_1585_ASAN_FORMAT_SW_ALT

parent 9a10acdb

lib_com/options.h

+1 −2
Original line number Diff line number Diff line
@@ -164,8 +164,7 @@ 
#define FIX_FLOAT_1539_G192_FORMAT_SWITCH               /* Nokia: reintroduce format switching for g192 bitstreams */

#define FIX_2095_REMOVE_UNUSED_ISAR_TABLES              /* Dolby: remove unused ISAR */

#define FIX_FLOAT_1582_STEREO_DFT_QUANTIZE_ITD          /* FhG: float issue 1582: Remove unncessary statement from stereo_dft_quantize_itd() */

#define FIX_1585_ASAN_FORMAT_SW_ALT                     /* VA: float issue 1585: alternative fix memory leaks with format switching */

#define FIX_MSAN_ASAN_FMSW_HP20                         /* FhG: float issue 1593: fix msan/asan error with format switching memory changes */

#define FIX_1585_ASAN_FORMAT_SW_ALT                     /* VA,FhG: float issues 1585,1593: alternative fix memory leaks with format switching */



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

lib_dec/ivas_init_dec.c

+1 −7
Original line number Diff line number Diff line
@@ -2327,12 +2327,6 @@ ivas_error ivas_init_decoder( 
        set_f( st_ivas->mem_hp20_out[i], 0.0f, L_HP20_MEM );

    }



#if defined( FIX_1585_ASAN_FORMAT_SW_ALT ) && !defined( FIX_MSAN_ASAN_FMSW_HP20 )

    for ( ; i < MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS; i++ )

    {

        st_ivas->mem_hp20_out[i] = NULL;

    }

#endif



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

     * Allocate and initialize rendering handles
@@ -2905,7 +2899,7 @@ void ivas_initialize_handles_dec( 
    for ( i = 0; i < MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS; i++ )

    {

        st_ivas->p_output_f[i] = NULL;

#if defined( FIX_1585_ASAN_FORMAT_SW_ALT ) && defined( FIX_MSAN_ASAN_FMSW_HP20 )

#ifdef FIX_1585_ASAN_FORMAT_SW_ALT

        st_ivas->mem_hp20_out[i] = NULL;

#endif

    }