Commit 69bd8cc4 authored by vaclav's avatar vaclav
Browse files

revert harmonization of DoRTFTn_fx_ivas()

parent e53b91a9

lib_com/fft_fx.c

+2 −10
Original line number Diff line number Diff line
@@ -2736,6 +2736,7 @@ void edct2_fx_ivas( 
        }

    }

}

#endif



void DoRTFTn_fx_ivas(

    Word32 *x,     /* i/o: real part of input and output data Qx      */
@@ -2743,7 +2744,6 @@ void DoRTFTn_fx_ivas( 
    const Word16 n /* i  : size of the FFT up to 1024 Q0*/

)

{



    Word16 i;

    Word32 z[2048];
@@ -2793,7 +2793,7 @@ void DoRTFTn_fx_ivas( 


    return;

}

#endif



#ifndef HQ_ALIGN_DUPLICATED_CODE

void fft3_fx_ivas(

    const Word32 X[], // Qx
@@ -4277,11 +4277,7 @@ void DoFFT_fx( 
            DoRTFT320_fx( re2, im2 );

            BREAK;

        case 256:

#ifdef HARMONIZE_DCT

            DoRTFTn_fx( re2, im2, NULL, 256 );

#else

            DoRTFTn_fx_ivas( re2, im2, 256 );

#endif

            BREAK;

        case 240:

            DoRTFT240( re2, im2 );
@@ -4305,11 +4301,7 @@ void DoFFT_fx( 
            DoRTFT80_fx( re2, im2 );

            BREAK;

        case 64:

#ifdef HARMONIZE_DCT

            DoRTFTn_fx( re2, im2, NULL, 64 );

#else

            DoRTFTn_fx_ivas( re2, im2, 64 );

#endif

            BREAK;

        case 40:

            DoRTFT40_fx( re2, im2 );

lib_com/fft_fx_evs.c

+2 −1
Original line number Diff line number Diff line
@@ -151,6 +151,7 @@ void DoRTFTn_fx( 
#ifdef OPTIMIZE_FFT_STACK

    }

#endif



    return;

}

lib_com/prot_fx.h

+1 −3
Original line number Diff line number Diff line
@@ -4148,13 +4148,11 @@ void rfft_fx( 
    const Word16 isign   /* i  : sign                      */

);



#ifndef HARMONIZE_DCT

void DoRTFTn_fx_ivas(

    Word32 *x,     /* i/o: real part of input and output data       */

    Word32 *y,     /* i/o: imaginary part of input and output data  */

    const Word16 n /* i  : size of the FFT up to 1024 */

);

#endif



Word16 find_guarded_bits_fx( const Word32 n );

lib_rend/ivas_reverb_fft_filter_fx.c

+0 −8
Original line number Diff line number Diff line
@@ -100,11 +100,7 @@ static void fft_wrapper_2ch_fx( 
    Word16 k, mirror_k;

    Word32 left_re_fx, left_im_fx, right_re_fx, right_im_fx;



#ifdef HARMONIZE_DCT

    DoRTFTn_fx( buffer_L_fx, buffer_R_fx, NULL, fft_size );

#else

    DoRTFTn_fx_ivas( buffer_L_fx, buffer_R_fx, fft_size );

#endif



    /* separating left and right channel spectra */

    buffer_L_fx[0] = L_shl( buffer_L_fx[0], 1 ); // Qx + 1
@@ -172,11 +168,7 @@ static void ifft_wrapper_2ch_fx( 
        move32();

    }



#ifdef HARMONIZE_DCT

    DoRTFTn_fx( buffer_L, buffer_R, NULL, fft_size );

#else

    DoRTFTn_fx_ivas( buffer_L, buffer_R, fft_size );

#endif



    return;

}

lib_rend/ivas_reverb_filter_design_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -206,11 +206,7 @@ static void calc_min_phase_fx( 
    /* Convert back and isolate the phase. */

    IF( LE_16( fft_size, 512 ) ) /* for size <= 512 using complex-value FFT (more effecient, but available only up to 512 size) */

    {

#ifdef HARMONIZE_DCT

        DoRTFTn_fx( pFolded_cepstrum_re, pFolded_cepstrum_im, NULL, fft_size );

#else

        DoRTFTn_fx_ivas( pFolded_cepstrum_re, pFolded_cepstrum_im, fft_size );

#endif



        /* Copying the img part into the output */

        FOR( idx = 1; idx < half_fft_size; idx++ )