Commit 97bf1a96 authored by vaclav's avatar vaclav
Browse files

Merge branch '1355_ref_PortFlpMR1286' into 'float-pc' 

Port float MR1286 to BASOP FLP ref

See merge request !1240
parents e80bc1d7 f038dede

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -205,6 +205,7 @@ 
#define FIX_CRASH_LONG_BRIR                             /* Orange : Fix crash when long BRIR is set */

#define NONBE_FIX_943_RECONFIG_IGF_AFTER_SETTING_BW           /* FhG: issue 943: fix crash in BW switchin from WB in MDCT-Stereo core encoder */

#define FIX_911_REMOVE_CREND_DUPLICATION                /* VA: issue 911: resolve duplication of CRend binaural external renderer function */

#define FIX_938_GCC_12_WARNINGS                         /* VA: issue #938: remove set_f(.,.,0) call in which length is always 0 to remove GCC 12.0 warning */



/* #################### End BASOP porting switches ############################ */

lib_enc/enc_higher_acelp.c

+2 −1
Original line number Diff line number Diff line
@@ -241,8 +241,9 @@ void transf_cdbk_enc( 
    {

        x_tran[i] = (float) ( x_norm[i] );

    }



#ifndef FIX_938_GCC_12_WARNINGS

    set_f( x_tran + Nsv * WIDTH_BAND, 0.0f, L_SUBFR - WIDTH_BAND * Nsv );

#endif



    if ( st->coder_type != INACTIVE && st->core_brate >= MIN_BRATE_AVQ_EXC && st->core_brate <= MAX_BRATE_AVQ_EXC_TD && !harm_flag_acelp )

    {