Commit 83ea9476 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_1822

parent 0353fa7b

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -82,7 +82,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_1822



#define FIX_ISSUE_1764                       /* NTT: update renorm and use abs */

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

lib_rend/ivas_dirac_output_synthesis_dec_fx.c

+0 −6
Original line number Diff line number Diff line
@@ -1002,17 +1002,11 @@ void ivas_dirac_dec_output_synthesis_process_slot_fx( 
                            move16();

                        }

                    }

#ifdef FIX_1822

                    diff = L_sub( h_dirac_output_synthesis_params->diffuse_compensation_factor_fx, ONE_IN_Q27 /*1 Q27*/ );

                    diff = L_shl( diff, 2 ); // Q29

#endif

                    FOR( ; k < num_freq_bands; k++ )

                    {

#ifdef FIX_1822

                        sqr_inp = Madd_32_32( One_in_qdiff, diffuseness[k], diff ); // Q = q_diffuseness - 1

#else

                        sqr_inp = Madd_32_32( One_in_qdiff, diffuseness[k], L_sub( h_dirac_output_synthesis_params->diffuse_compensation_factor_decorr_fx, ONE_IN_Q29 /*1 Q29*/ ) ); // Q = q_diffuseness - 1

#endif

                        sqr_exp = sq_e;

                        move16();

                        sqr = Sqrt32( sqr_inp, &sqr_exp ); /*Q(31-sqr_exp)*/