Commit 35d3db79 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch... 

Merge branch '2187_ref_fix_non_be_between_optimization_levels_in_dft_stereo_for_apple_clang' into 'ivas-float-update'

port MR 2318 and 2323 from float

See merge request !2511
parents 9813762d 88be0680

lib_com/edct.c

+24 −0
Original line number Diff line number Diff line
@@ -275,8 +275,14 @@ void edxt( 
            {

                for ( k = Nm1 >> 1; k > 0; k-- )

                {

#ifdef NONBE_FIX_NONBE_BETWEEN_OPTIMIZATION_LEVELS_2

                    volatile float angle_tmp = scale * k;

                    const float wRe = cosf( angle_tmp );

                    const float wIm = sinf( angle_tmp );

#else

                    const float wRe = cosf( scale * k );

                    const float wIm = sinf( scale * k );

#endif



                    y[k] /*pt 1*/ = wRe * re[k] + wIm * im[k];

                    y[length - k] = wIm * re[k] - wRe * im[k];
@@ -287,8 +293,14 @@ void edxt( 
            {

                for ( k = Nm1 >> 1; k > 0; k-- )

                {

#ifdef NONBE_FIX_NONBE_BETWEEN_OPTIMIZATION_LEVELS_2

                    volatile float angle_tmp = scale * k;

                    const float wRe = cosf( angle_tmp );

                    const float wIm = sinf( angle_tmp );

#else

                    const float wRe = cosf( scale * k );

                    const float wIm = sinf( scale * k );

#endif



                    y[Nm1 - k] = wRe * re[k] + wIm * im[k];

                    y[k - 1] = wIm * re[k] - wRe * im[k];
@@ -304,8 +316,14 @@ void edxt( 
            {

                for ( k = Nm1 >> 1; k > 0; k-- )

                {

#ifdef NONBE_FIX_NONBE_BETWEEN_OPTIMIZATION_LEVELS_2

                    volatile float angle_tmp = scale * k;

                    const float wRe = cosf( angle_tmp ) * 0.5f;

                    const float wIm = sinf( angle_tmp ) * 0.5f;

#else

                    const float wRe = cosf( scale * k ) * 0.5f;

                    const float wIm = sinf( scale * k ) * 0.5f;

#endif



                    re[k] = wRe * x[k] + wIm * x[length - k];

                    im[k] = wRe * x[length - k] - wIm * x[k];
@@ -316,8 +334,14 @@ void edxt( 
            {

                for ( k = Nm1 >> 1; k > 0; k-- )

                {

#ifdef NONBE_FIX_NONBE_BETWEEN_OPTIMIZATION_LEVELS_2

                    volatile float angle_tmp = scale * k;

                    const float wRe = cosf( angle_tmp ) * 0.5f;

                    const float wIm = sinf( angle_tmp ) * 0.5f;

#else

                    const float wRe = cosf( scale * k ) * 0.5f;

                    const float wIm = sinf( scale * k ) * 0.5f;

#endif



                    re[k] = wRe * x[Nm1 - k] + wIm * x[k - 1];

                    im[k] = wRe * x[k - 1] - wIm * x[Nm1 - k];

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -198,6 +198,8 @@ 
#define NONBE_MDCT_ST_DTX_FIX_SUBOPT_SPATIAL_CNG       /* FhG: Fix MDCT-Stereo comfort noise for certain noise types */

#define NONBE_1344_REND_MASA_LOW_FS                     /* Nokia: Issue 1344: Fix sanitizer errors when using IVAS_rend to render MASA with lower sampling rates */

#define NONBE_1412_AVOID_ROUNDING_AZ_ELEV              /* FhG:  Avoid rounding when passing azimuth and elevation to efap_determine_gains() */

#define NONBE_FIX_NONBE_BETWEEN_OPTIMIZATION_LEVELS    /* FhG: fix non-BE in DFT stereo encoder between optimization levels */

#define NONBE_FIX_NONBE_BETWEEN_OPTIMIZATION_LEVELS_2  /* FhG: fix even more non-BEnesses */



// object-editing feature porting

#define FIX_HRTF_LOAD_API                               // solves API conflicts between HRTF and object-editing features

lib_dec/ivas_stereo_dft_dec.c

+16 −0
Original line number Diff line number Diff line
@@ -1384,8 +1384,16 @@ void stereo_dft_dec( 


                    if ( pgIpd[0] != 0.f )

                    {

#ifdef NONBE_FIX_NONBE_BETWEEN_OPTIMIZATION_LEVELS_2

                        volatile float pgIpd_tmp;



                        pgIpd_tmp = pgIpd[0];

                        c0 = cosf( pgIpd_tmp );

                        s0 = sinf( pgIpd_tmp );

#else

                        c0 = cosf( pgIpd[0] );

                        s0 = sinf( pgIpd[0] );

#endif

                        for ( i = hStereoDft->band_limits[b]; i < hStereoDft->band_limits[b + 1]; i++ )

                        {

                            /*rotate L*/
@@ -1566,8 +1574,16 @@ void stereo_dft_dec( 
                    /* Active Upmix */

                    if ( pgIpd[0] != 0.f )

                    {

#ifdef NONBE_FIX_NONBE_BETWEEN_OPTIMIZATION_LEVELS_2

                        volatile float pgIpd_tmp;



                        pgIpd_tmp = pgIpd[0];

                        c0 = cosf( pgIpd_tmp );

                        s0 = sinf( pgIpd_tmp );

#else

                        c0 = cosf( pgIpd[0] );

                        s0 = sinf( pgIpd[0] );

#endif

                        for ( i = hStereoDft->band_limits[b]; i < hStereoDft->band_limits[b + 1]; i++ )

                        {

                            /*rotate L*/

lib_dec/ivas_stereo_dft_plc.c

+9 −0
Original line number Diff line number Diff line
@@ -251,6 +251,9 @@ void stereo_dft_res_subst_spec( 
    /* Apply phase adjustment of identified peaks, including Np=1 peak neighbors on each side */

    for ( i = *num_plocs - 1; i >= 0; i-- )

    {

#ifdef NONBE_FIX_NONBE_BETWEEN_OPTIMIZATION_LEVELS_2

        volatile float corr_phase_tmp;

#endif

        if ( k == 0 )

        {

            /* For 1st subframe, apply reversed time ECU to get correct analysis window */
@@ -268,8 +271,14 @@ void stereo_dft_res_subst_spec( 
            conj_sign = 1.0f;

        }



#ifdef NONBE_FIX_NONBE_BETWEEN_OPTIMIZATION_LEVELS_2

        corr_phase_tmp = corr_phase;

        cos_F = cosf( corr_phase_tmp );

        sin_F = sinf( corr_phase_tmp );

#else

        cos_F = cosf( corr_phase );

        sin_F = sinf( corr_phase );

#endif



        idx = max( 0, plocs[i] - Np ); /* Iterate over plocs[i]-1:plocs[i]+1, considering the edges of the spectrum */

        while ( ( idx < plocs[i] + Np + 1 ) && ( idx < L_res ) )

lib_enc/ivas_stereo_dft_enc.c

+20 −0
Original line number Diff line number Diff line
@@ -1318,12 +1318,24 @@ void stereo_dft_enc_process( 


        if ( hStereoDft->hItd->deltaItd[k_offset] != 0 && hStereoDft->hConfig->dmx_active )

        {

#ifdef NONBE_FIX_NONBE_BETWEEN_OPTIMIZATION_LEVELS

            /* Note: this variable is used as an in-between step when passing the angle to the trig functions.

             *       this keeps the compilter from applying optimizations at higher optimizaton levels which can break bit-exactness */

            volatile float alpha_tmp;

#endif

            /*time shift channels*/

            alpha = -2.0f * EVS_PI * hStereoDft->hItd->deltaItd[k_offset] / hStereoDft->NFFT;

            c = 1.f; /*cos(0)*/

            s = 0.f; /*sin(0)*/

#ifdef NONBE_FIX_NONBE_BETWEEN_OPTIMIZATION_LEVELS



            alpha_tmp = alpha;

            c1 = cosf( alpha_tmp );

            s1 = sinf( alpha_tmp );

#else

            c1 = cosf( alpha );

            s1 = sinf( alpha );

#endif



            if ( alpha >= 0 )

            {
@@ -1443,8 +1455,16 @@ void stereo_dft_enc_process( 


            if ( pgIpd[0] != 0.f )

            {

#ifdef NONBE_FIX_NONBE_BETWEEN_OPTIMIZATION_LEVELS_2

                volatile float pgIpd_tmp;



                pgIpd_tmp = pgIpd[0];

                c = cosf( pgIpd_tmp );

                s = sinf( pgIpd_tmp );

#else

                c = cosf( pgIpd[0] );

                s = sinf( pgIpd[0] );

#endif

                for ( i = hStereoDft->band_limits_dmx[b]; i < hStereoDft->band_limits_dmx[b + 1]; i++ )

                {

                    /*rotate L*/