Commit 232b0cde authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'main' into knj/test-ci-setup

parents 48a69934 31a2fd7b

lib_com/cldfb_fx.c

+31 −12
Original line number Diff line number Diff line
@@ -519,6 +519,7 @@ void cldfbAnalysis_ts_fx( 
        }

        fft_cldfb_fx( rBuffer_fx, M2 );



#ifndef FIX_1733_CLDFB_BUG

        /* post modulation of DST IV */

        FOR( k = 0; k < M2; k++ )

        {
@@ -533,6 +534,7 @@ void cldfbAnalysis_ts_fx( 
            move32();

            move32();

        }

#endif

        *q_cldfb = sub( *q_cldfb, 2 );

        move16();
@@ -553,6 +555,23 @@ void cldfbAnalysis_ts_fx( 
            move32();

        }



#ifdef FIX_1733_CLDFB_BUG

        /* post modulation of DST IV */

        FOR( k = 0; k < M2; k++ )

        {

            /*cplxMult(&realBuffer[M1-1-(2*k)],&realBuffer[2*k],rBuffer[2*k],rBuffer[2*k+1],rot_vctr_re[k],rot_vctr_im[k]);*/

#ifdef OPT_AVOID_STATE_BUF_RESCALE

            realBuffer_fx[( ( M1 - 1 ) - ( k * 2 ) )] = Msub_32_32( Mpy_32_32( rBuffer_fx[2 * k], rot_vctr_re_fx[k] ), rBuffer_fx[2 * k + 1], rot_vctr_im_fx[k] ); // q - 5

            realBuffer_fx[2 * k] = Madd_32_32( Mpy_32_32( rBuffer_fx[2 * k], rot_vctr_im_fx[k] ), rBuffer_fx[2 * k + 1], rot_vctr_re_fx[k] );                      // q - 5

#else                                                                                                                                                              /* OPT_AVOID_STATE_BUF_RESCALE */

            realBuffer_fx[( ( M1 - 1 ) - ( k * 2 ) )] = L_sub( Mpy_32_32( rBuffer_fx[2 * k], rot_vctr_re_fx[k] ), Mpy_32_32( rBuffer_fx[2 * k + 1], rot_vctr_im_fx[k] ) ); // q - 5

            realBuffer_fx[2 * k] = L_add( Mpy_32_32( rBuffer_fx[2 * k], rot_vctr_im_fx[k] ), Mpy_32_32( rBuffer_fx[2 * k + 1], rot_vctr_re_fx[k] ) );                      // q - 5

#endif                                                                                                                                                             /* OPT_AVOID_STATE_BUF_RESCALE */

            move32();

            move32();

        }



#endif

        /* post modulation of DCT IV */

        FOR( k = 0; k < M2; k++ )

        {

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -106,4 +106,6 @@ 


#define FIX_1713_EXP                            /* VA: proposed correction to exp in ic-BWE*/



#define FIX_1733_CLDFB_BUG



#endif