Commit 81d71c16 authored by reutelhuber's avatar reutelhuber
Browse files

move and rename switch to account for potential non-BE

parent 66b08db9

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,6 @@ 
/*#define SPLIT_REND_WITH_HEAD_ROT  */                  /* Dlb,FhG: Split Rendering contributions 21 and 35 */



#define FIX_643_PCA_OPTION                              /* VA: issue 643: rename PCA bypass command-line option */

#define FIX_811_DFT_DOUBLE_TO_FLOAT                     /* FhG: issue 811: change double precision functions to float in DFT Stereo */



/* #################### End BE switches ################################## */
@@ -166,6 +165,7 @@ 
#define NONBE_FIX_871_ACELP_CRASH_IN_OSBA                     /* FhG: isse 871: crash in ACELP core encoder with OSBA */

#define NONBE_FIX_225_MASA_EXT_REND                           /* Nokia: Resolve #225: Complete MASA external renderer implementation */

#define NONBE_FIX_897_USAN_WITH_MASA_RENDERING                /* Nokia: issue #897: USAN null pointer in MASA external renderer to Ambisonics */

#define NONBE_FIX_811_DFT_DOUBLE_TO_FLOAT                     /* FhG: issue 811: change double precision functions to float in DFT Stereo */



/* ##################### End NON-BE switches ########################### */

lib_dec/ivas_stereo_dft_dec.c

100644 → 100755
+2 −2
Original line number Diff line number Diff line
@@ -135,14 +135,14 @@ static void stereo_dft_dequantize_res_gains_f( 


        /* compensate for the offset and extract/remove sign of first index */

        sign = ind1[i] < 15 ? -1 : 1;

#ifdef FIX_811_DFT_DOUBLE_TO_FLOAT

#ifdef NONBE_FIX_811_DFT_DOUBLE_TO_FLOAT

        i1 = (int16_t) floorf( ind1[i] < 15 ? 15 - ind1[i] : ind1[i] - 15 );

#else

        i1 = (int16_t) floor( ind1[i] < 15 ? 15 - ind1[i] : ind1[i] - 15 );

#endif

        fi = ( ind1[i] < 15 ? 15 - ind1[i] : ind1[i] - 15 ) - i1;



#ifdef FIX_811_DFT_DOUBLE_TO_FLOAT

#ifdef NONBE_FIX_811_DFT_DOUBLE_TO_FLOAT

        j1 = (int16_t) floorf( ind2[i] );

#else

        j1 = (int16_t) floor( ind2[i] );

lib_enc/ivas_stereo_dft_enc.c

100644 → 100755
+3 −3
Original line number Diff line number Diff line
@@ -2695,7 +2695,7 @@ static void stereo_dft_enc_compute_prm( 
            {

                hStereoDft->dot_prod_real_smooth[b2] = 0.5f * hStereoDft->dot_prod_real_smooth[b2] + 0.5f * dot_prod_real2;

                hStereoDft->dot_prod_img_smooth[b2] = 0.5f * hStereoDft->dot_prod_img_smooth[b2] + 0.5f * dot_prod_img2;

#ifdef FIX_811_DFT_DOUBLE_TO_FLOAT

#ifdef NONBE_FIX_811_DFT_DOUBLE_TO_FLOAT

                pIpd[b2] = (float) atan2f( hStereoDft->dot_prod_img_smooth[b2], hStereoDft->dot_prod_real_smooth[b2] );

#else

                pIpd[b2] = (float) atan2( hStereoDft->dot_prod_img_smooth[b2], hStereoDft->dot_prod_real_smooth[b2] );
@@ -2829,7 +2829,7 @@ static void stereo_dft_enc_compute_prm( 
                {

                    conversion_factor = 2.f / 3;

                }

#ifdef FIX_811_DFT_DOUBLE_TO_FLOAT

#ifdef NONBE_FIX_811_DFT_DOUBLE_TO_FLOAT

                dItd32 = (int16_t) floorf( conversion_factor * hStereoDft->hItd->deltaItd[k_offset] + 0.5f );

#else

                dItd32 = (int16_t) floor( conversion_factor * hStereoDft->hItd->deltaItd[k_offset] + 0.5f );
@@ -2869,7 +2869,7 @@ static void stereo_dft_enc_compute_prm( 
            hStereoDft->sum_dot_prod_real = ( 1.f - hStereoDft->sfm ) * hStereoDft->sum_dot_prod_real + hStereoDft->sfm * sum_dot_prod_real;

            hStereoDft->sum_dot_prod_img = ( 1.f - hStereoDft->sfm ) * hStereoDft->sum_dot_prod_img + hStereoDft->sfm * sum_dot_prod_img;



#ifdef FIX_811_DFT_DOUBLE_TO_FLOAT

#ifdef NONBE_FIX_811_DFT_DOUBLE_TO_FLOAT

            pgIpd[0] = (float) atan2f( hStereoDft->sum_dot_prod_img, hStereoDft->sum_dot_prod_real );

#else

            pgIpd[0] = (float) atan2( hStereoDft->sum_dot_prod_img, hStereoDft->sum_dot_prod_real );

lib_enc/ivas_stereo_dft_enc_itd.c

100644 → 100755
+1 −1
Original line number Diff line number Diff line
@@ -1368,7 +1368,7 @@ void stereo_dft_enc_compute_itd( 


        if ( hItd->deltaItd[k_offset - 1] != 0 && itd_max_flip == 0 )

        {

#ifdef FIX_811_DFT_DOUBLE_TO_FLOAT

#ifdef NONBE_FIX_811_DFT_DOUBLE_TO_FLOAT

            int16_t tmp_itd = (int16_t) floorf( ( ( hItd->prev_itd ) * ( (float) input_frame / 640 ) ) + 0.5f );

#else

            int16_t tmp_itd = (int16_t) floor( ( ( hItd->prev_itd ) * ( (float) input_frame / 640 ) ) + 0.5f );

lib_enc/ivas_stereo_dft_td_itd.c

100644 → 100755
+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ static void stereo_td_get_td_itd( 
    {

        assert( ( input_Fs % 16000 ) == 0 && "sampling frequency should be divisible by 16000" );

        d = (int16_t) ( input_Fs / 16000 );

#ifdef FIX_811_DFT_DOUBLE_TO_FLOAT

#ifdef NONBE_FIX_811_DFT_DOUBLE_TO_FLOAT

        *td_itd_32 = 2 * (int16_t) floorf( itd / d + 0.5f );

#else

        *td_itd_32 = 2 * (int16_t) floor( itd / d + 0.5f );