Commit 8fc8a35f authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

Merge branch '1935-duplicate-define-nonbe_svd_optimization-in-options-h' into 'main' 

Resolve "duplicate define (NONBE_SVD_OPTIMIZATION) in options.h"

Closes #1935

See merge request !2121
parents 32e10900 10024eb4

lib_com/options.h

+1 −2
Original line number Diff line number Diff line
@@ -80,7 +80,6 @@ 
#define FIX_1917_DIRAC_RENDER_PTR_INCR                       /* FhG: fix wrong pointer increment in ivas_dirac_dec_render_sf_fx() for object rendering */

#define FIX_CDLFB_BUFFER_SCALING                             /* FhG: fix wrong buffer scaling in ivas_dirac_dec_render_sf_fx() for object rendering */

#define FIX_ISSUE_1817_REPLACE_CARRY_OVERFLOW                /* FhG: bit-exact, replace carry and overflow operations by 64-bit operations, MR 1931 */

#define	NONBE_SVD_OPTIMIZATION                               /* FhG: reduce WMOPS of HouseHolderReduction() in ivas_svd_dec.c() by removing redundant mathematics and using 64 bit additions */

#define FIX_1766_TCX2ACELP_BWE_ISSUE                         /* VA : Fix rare BWE issue when switching from TCX to ACELP */

#define FIX_1781_SPECTRAL_GAPS                               /* FhG: Change internal calculation of tcx_noise_factor_ivas_fx() to 32-bit*/

#define FIX_ISSUE_1811_EXCEEDING_W_SHIFTS                    /* FhG: limit exceeding 64bit shifts */
@@ -131,7 +130,7 @@ 
#define NONBE_FIX_1141_OSBA_ROOM_RENDERING              /* FhG: Fix for issue 1141: render objects in OSBA decoder with room effect  */

#define NONBE_1360_LFE_DELAY                            /* Dlb: LFE delay alignment when rendering in CLDFB domain*/

#define NONBE_1229_FIX_ISM1_DPID                        /* Eri: issue 1229: fix bug causing ISM 1 to use default -dpid instead of the specified one */

#define NONBE_SVD_OPTIMIZATION 

#define NONBE_SVD_OPTIMIZATION                          /* FhG: issue 1367 */

#define FIX_1209_SID_SIGNALING                          /* VA: issue 1209: remove dead code in IVAS SID signaling */

#define NONBE_FIX_1176_OSBA_REVERB_JBM_ASAN_ERROR       /* Ericsson: Issue 1176, fix in TDREND_firfilt for subframes shorter than the filter length */

#define NONBE_1131_ACELP_OOB                            /* VA: issue 1131: fix division-by-zero in acelp gain decoding caused by wrong length of buffer update when switching from HQ core to ACELP core */

lib_dec/ivas_svd_dec_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -1055,7 +1055,7 @@ static void biDiagonalReductionLeft_fx( 
                {

                    temp = W_add( temp, L_shr( Mpy_32_32( singularVectors[jCh][currChannel], singularVectors[jCh][iCh] ), sub( max_e, add( singularVectors_e[jCh][currChannel], singularVectors_e[jCh][iCh] ) ) ) );

                }

                Word16 nrm = W_norm( temp );

                nrm = W_norm( temp );

                nrm = sub( nrm, 32 );

                norm_x = W_shl_sat_l( temp, nrm );

                norm_x_e = sub( max_e, nrm );