Commit a021682a authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_309_PREMPH_MEM_SCE

parent 6759ab5b

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -150,7 +150,6 @@ 


#define FIX_197_CREND_INTERFACE 

#define FIX_FOR_TEST                                    /* allows tests to pass using old TD binary file, to be removed after merge*/

#define FIX_309_PREMPH_MEM_SCE                          /* FhG: issue 309 - fix overwriting of mem_preemph_enc in ivas preprocessing for SCE and tcxonly modes*/



#define FIX_317                                         /* FhG: issue 317 - address sanitizer error in MDCT-Stereo PLC */

lib_enc/ivas_core_pre_proc.c

+0 −2
Original line number Diff line number Diff line
@@ -660,9 +660,7 @@ ivas_error ivas_compute_core_buffers( 
     *-----------------------------------------------------------------*/



    if (

#ifdef FIX_309_PREMPH_MEM_SCE

        st->tcxonly == 0 &&

#endif

        !( ( element_mode == IVAS_CPE_TD && st->idchan == 1 ) || element_mode == IVAS_CPE_MDCT ) )

    {

        st->mem_preemph_enc = new_inp_16k[L_frame_tmp - 1];