Commit c3f0ba21 authored by Fabian Bauer's avatar Fabian Bauer
Browse files

Merge branch 'main' into 1072-complexity-high-complexity-overhead-for-osba-decoding

parents 88785287 9508caea

.gitlab-ci.yml

+406 −76

File changed.

Preview size limit exceeded, changes collapsed.

.gitlab/issue_templates/float-update-porting.md

+0 −2
Original line number Diff line number Diff line
@@ -2,7 +2,5 @@ 


<!--- Remember to add issue and MR links to the status page in wiki here https://forge.3gpp.org/rep/sa4/audio/ivas-basop/-/wikis/IVAS-PC-MR-conversion-status -->

- Original merge request in float repo:

- Branch for float ref update:

- Branch for BASOP update:



/label ~Type:FloatUpdatePorting ~Status::ToDo

.gitlab/merge_request_templates/float-update-porting.md

+1 −1
Original line number Diff line number Diff line 


- Link to issue in BASOP repo:

- Link to original issue in float repo:

- Link to original MR in float repo:

- Requested reviewers:



/label Type:FloatUpdatePorting

lib_com/options.h

+4 −0
Original line number Diff line number Diff line
@@ -168,4 +168,8 @@ 
#define FIX_1072_SPEEDUP_gainpanning            /* FhG: Minor WMOPS tuning, nonbe */

#define FIX_1072_SPEEDUP_COMPUTEDIFUSENESS      /* FhG: Minor WMOPS tuning, nonbe */

#define FIX_1320_LOWRATE_ACELP

#define FIX_1297_OVERFLOW                       /* VA: fixes issue with overflows in pre-processing */

#define FIX_1298                                /* VA: fix possible assert in gaus_enc */

#define FIX_1300_ICA_SHIFT_QUANT_IMPROV         /* VA: Fix to 1300 to improve precision of the lag quantizer */

#define FIX_1301_CORRECT_TD_CNST                /* VA: Fix 1301, correct wrong constant in TD stereo */

#endif

lib_dec/acelp_core_dec_ivas_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -749,7 +749,7 @@ ivas_error acelp_core_dec_ivas_fx( 
            {

                Rescale_exc( st->hMusicPF->dct_post_old_exc_fx, exc_fx, bwe_exc_fx, st->hGSCDec->last_exc_dct_in_fx, st->L_frame,

#ifdef FIX_ISSUE_1291

                             shr( imult1616( st->L_frame, HIBND_ACB_L_FAC_Q1 ), 1 ), 0, &( st->Q_exc ), st->Q_subfr, NULL, 0, INACTIVE );

                             L_FRAME32k, 0, &( st->Q_exc ), st->Q_subfr, NULL, 0, INACTIVE );

#else

                             imult1616( st->L_frame, HIBND_ACB_L_FAC ), 0, &( st->Q_exc ), st->Q_subfr, NULL, 0, INACTIVE );

#endif
@@ -803,7 +803,7 @@ ivas_error acelp_core_dec_ivas_fx( 
            Copy( syn1_fx + st->L_frame - L_SYN_MEM_CLAS_ESTIM, st->mem_syn_clas_estim_fx, L_SYN_MEM_CLAS_ESTIM );



            /* save and delay synthesis to be used by SWB BWE */

            Copy_Scale_sig( syn1_fx, temp_buf_fx, st->L_frame, sub( -1, st->Q_syn ) ); // Q_syn

            Copy_Scale_sig( syn1_fx, temp_buf_fx, st->L_frame, sub( -1, st->Q_syn ) ); // Q_syn -> Q(-1)

            IF( st->hBWE_FD != NULL )

            {

#ifdef FIX_ISSUE_1290