Commit 9ea054cd authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_CDLFB_BUFFER_SCALING

parent 8738fabd

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ 


#define ISSUE_1836_replace_overflow_libcom                   /* FhG: replace overflow operators by non-overflow-alternatives in lib_com - BE */



#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 */

lib_dec/ivas_dirac_dec_fx.c

+0 −16
Original line number Diff line number Diff line
@@ -3808,32 +3808,16 @@ void ivas_dirac_dec_render_sf_fx( 
                                FOR( l = 0; l < hSpatParamRendCom->num_freq_bands; l++ )

                                {

#ifdef NONBE_FIX_1141_OSBA_ROOM_RENDERING

#ifdef FIX_CDLFB_BUFFER_SCALING

                                    Cldfb_RealBuffer_fx[j][k][l] = Madd_32_32( Cldfb_RealBuffer_fx[j][k][l], g_fx, L_shl( *tc_re_fx, 1 ) );

#else

                                    Cldfb_RealBuffer_fx[j][k][l] = Madd_32_32( Cldfb_RealBuffer_fx[j][k][l], g_fx, *tc_re_fx );

#endif

#else

#ifdef FIX_CDLFB_BUFFER_SCALING

                                Cldfb_RealBuffer_fx[j2][k][l] = Madd_32_32( Cldfb_RealBuffer_fx[j2][k][l], g_fx, L_shl( *tc_re_fx, 1 ) );

#else

                                Cldfb_RealBuffer_fx[j2][k][l] = Madd_32_32( Cldfb_RealBuffer_fx[j2][k][l], g_fx, *tc_re_fx );

#endif

#endif

                                    move32();

                                    tc_re_fx++;

#ifdef NONBE_FIX_1141_OSBA_ROOM_RENDERING

#ifdef FIX_CDLFB_BUFFER_SCALING

                                    Cldfb_ImagBuffer_fx[j][k][l] = Madd_32_32( Cldfb_ImagBuffer_fx[j][k][l], g_fx, L_shl( *tc_im_fx, 1 ) );

#else

                                    Cldfb_ImagBuffer_fx[j][k][l] = Madd_32_32( Cldfb_ImagBuffer_fx[j][k][l], g_fx, *tc_im_fx );

#endif

#else

#ifdef FIX_CDLFB_BUFFER_SCALING

                                Cldfb_ImagBuffer_fx[j2][k][l] = Madd_32_32( Cldfb_ImagBuffer_fx[j2][k][l], g_fx, L_shl( *tc_im_fx, 1 ) );

#else

                                Cldfb_ImagBuffer_fx[j2][k][l] = Madd_32_32( Cldfb_ImagBuffer_fx[j2][k][l], g_fx, *tc_im_fx );

#endif

#endif

                                    move32();

                                    tc_im_fx++;