Commit 729dd2f0 authored by vaclav's avatar vaclav
Browse files

Merge branch '1355_basop_PortFlpMR1286' into 'main-pc' 

Port float MR1286 to BASOP

See merge request !1239
parents 35d258e0 eb9a3e0a

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -191,6 +191,7 @@ 
#define FIX_CRASH_LONG_BRIR                /* Orange : port 1202 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_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -290,7 +290,9 @@ void transf_cdbk_enc_fx( 
        x_tran[i] = shl_o( x_norm[i], Q_AVQ_OUT_DEC, &Overflow );

        move16();

    }

#ifndef FIX_938_GCC_12_WARNINGS

    set16_fx( x_tran + Nsv * WIDTH_BAND, 0, sub( L_SUBFR, i_mult2( WIDTH_BAND, Nsv ) ) );

#endif



    test();

    test();
@@ -643,7 +645,9 @@ void transf_cdbk_enc_ivas_fx( 
        x_tran[i] = shl_o( x_norm[i], Q_AVQ_OUT_DEC, &Overflow );

        move16();

    }

#ifndef FIX_938_GCC_12_WARNINGS

    set16_fx( x_tran + Nsv * WIDTH_BAND, 0, sub( L_SUBFR, i_mult2( WIDTH_BAND, Nsv ) ) );

#endif



    test();

    test();