Commit 1eea99dc authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge remote-tracking branch 'origin/main' into... 

Merge remote-tracking branch 'origin/main' into 317-stack-buffer-overflow-in-mdct-stereo-plc-if-ch0-has-td-plc-and-ch1-has-fd-plc-with-prior-tcx10
parents 90ccd97c 4620ca45

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -162,6 +162,7 @@ 
#define SET_TNS_FLAG_IN_EVERY_FRAME                     /* FhG: issue 288 - mismatch between encoder and decoder wrt TNS usage in unified stereo  with frameloss */

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

#define FIX_299_ISM_BWS                                 /* VA: issue 299 - fix Band-width switching issues in ISM format */

#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

+5 −1
Original line number Diff line number Diff line
@@ -659,7 +659,11 @@ ivas_error ivas_compute_core_buffers( 
     * Perform fixed preemphasis (16kHz signal) through 1 - g*z^-1

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



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

    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];

    }