Commit 7f3d706b authored by vaillancour's avatar vaillancour
Browse files

Fixes for stv8c_dtx_sw_59_244_8kHz.b10.OUT

parent ac39185c

lib_com/window_ola_fx.c

+10 −16
Original line number Diff line number Diff line
@@ -17,9 +17,7 @@ void sinq_fx( 
    Word16 i;

    Word16 tmp1, tmp2;

    Word32 L_tmp, A32,tmp_old,tmp_old_old;

#ifdef BASOP_NOGLOB_DECLARE_LOCAL

    Flag Overflow = 0;

#endif





    x[0]= phi;

    move16(); /*sin(x) approximated by x; Q15 */
@@ -61,8 +59,8 @@ void sinq_fx( 
        L_tmp= L_sub(L_tmp,L_shr(tmp_old_old,1)); /*Q30 */

        tmp_old_old = L_add(tmp_old, 0); /*Q31   */

#ifdef BASOP_NOGLOB

        tmp_old = L_shl_o(L_tmp, 1, &Overflow); /*Q31   */

        x[i] = round_fx_o(tmp_old, &Overflow);  /*Q15 */

        tmp_old = L_shl_sat(L_tmp, 1); /*Q31   */

        x[i] = round_fx_sat(tmp_old);  /*Q15 */

#else

        tmp_old= L_shl(L_tmp,1); /*Q31   */

        x[i]=   round_fx(tmp_old);  /*Q15 */
@@ -113,10 +111,6 @@ void window_ola_fx( 
    Word16 SS2[L_FRAME48k-NS2SA(48000, N_ZERO_MDCT_NS)];

    Word16 wret2[L_FRAME48k-NS2SA(48000, N_ZERO_MDCT_NS)];

    Word16 tmp2;

#ifdef BASOP_NOGLOB_DECLARE_LOCAL

    Flag Overflow = 0;

#endif





    /* Windows loading */

    tcx_get_windows_mode1(  left_mode,  right_mode, win_left, win_right, win_int_left,win_int_right, L);
@@ -330,7 +324,7 @@ void window_ola_fx( 
            FOR (i=0; i < temp; i++)

            {

#ifdef BASOP_NOGLOB

                *p1 = add_o(mult(*p1, *p2), shl(mult(*p4, *p3), 5), &Overflow);/*auOut[i]*SS2[i]+ OldauOut[i+n]*(SS2[L-n-i-1])/(wret2[i]+0.01f);;*/ move16();

                *p1 = add_sat(mult(*p1, *p2), shl_sat(mult(*p4, *p3), 5));/*auOut[i]*SS2[i]+ OldauOut[i+n]*(SS2[L-n-i-1])/(wret2[i]+0.01f);;*/ move16();

#else

                *p1 =add( mult(*p1,*p2),shl(mult(*p4,*p3),5));/*auOut[i]*SS2[i]+ OldauOut[i+n]*(SS2[L-n-i-1])/(wret2[i]+0.01f);;*/ move16();

#endif
@@ -360,9 +354,9 @@ void window_ola_fx( 
            FOR (i = 0; i < temp_len; i+=2)

            {

#ifdef BASOP_NOGLOB

                *p1++=round_fx_o(L_add_o(L_shl_o(Mult_32_16(*pa++,*p3),1, &Overflow),L_deposit_h(*p4++), &Overflow), &Overflow);  /* (( Qin + Q15 -15)+1  + ( Qin - 15 + 16))-1 */

                *p1++=round_fx_sat(L_add_sat(L_shl_sat(Mult_32_16(*pa++,*p3),1),L_deposit_h(*p4++)));  /* (( Qin + Q15 -15)+1  + ( Qin - 15 + 16))-1 */

                p3-=decimate;

                *p1++=round_fx_o(L_add_o(L_shl_o(Mult_32_16(*pa++,*p5--),1, &Overflow),L_deposit_h(*p4++), &Overflow), &Overflow);  /* (( Qin + Q15 -15)+1  + ( Qin - 15 + 16))-1 */

                *p1++=round_fx_sat(L_add_sat(L_shl_sat(Mult_32_16(*pa++,*p5--),1),L_deposit_h(*p4++)));  /* (( Qin + Q15 -15)+1  + ( Qin - 15 + 16))-1 */

#else

                *p1++=round_fx(L_add(L_shl(Mult_32_16(*pa++,*p3),1),L_deposit_h(*p4++)));  /* (( Qin + Q15 -15)+1  + ( Qin - 15 + 16))-1 */

                p3-=decimate;
@@ -380,8 +374,8 @@ void window_ola_fx( 
            FOR (i = 0; i < temp_len; i+=2)

            {

#ifdef BASOP_NOGLOB

                *p1++=round_fx_o(L_sub_o(L_deposit_h(*p4++), L_shl_o(Mult_32_16(*pa--,*p5--),1, &Overflow), &Overflow), &Overflow);  /* (( Qin + Q15 -15)+1  + ( Qin - 15 + 16))-1 */

                *p1++=round_fx_o(L_sub_o(L_deposit_h(*p4++), L_shl_o(Mult_32_16(*pa--,*p3),1, &Overflow), &Overflow), &Overflow);  /* (( Qin + Q15 -15)+1  + ( Qin - 15 + 16))-1 */

                *p1++=round_fx_sat(L_sub_sat(L_deposit_h(*p4++), L_shl_sat(Mult_32_16(*pa--,*p5--),1)));  /* (( Qin + Q15 -15)+1  + ( Qin - 15 + 16))-1 */

                *p1++=round_fx_sat(L_sub_sat(L_deposit_h(*p4++), L_shl_sat(Mult_32_16(*pa--,*p3),1)));  /* (( Qin + Q15 -15)+1  + ( Qin - 15 + 16))-1 */

#else

                *p1++=round_fx(L_sub(L_deposit_h(*p4++), L_shl(Mult_32_16(*pa--,*p5--),1) ));  /* (( Qin + Q15 -15)+1  + ( Qin - 15 + 16))-1 */

                *p1++=round_fx(L_sub(L_deposit_h(*p4++), L_shl(Mult_32_16(*pa--,*p3),1) ));  /* (( Qin + Q15 -15)+1  + ( Qin - 15 + 16))-1 */
@@ -444,7 +438,7 @@ void window_ola_fx( 
            FOR (i = 0; i < temp_len; i++)

            {

#ifdef BASOP_NOGLOB

                *p1++ = round_fx_o(L_add_o(L_shl(Mult_32_16(*pa++, *p3), 1), L_deposit_h(*p4++), &Overflow), &Overflow);  /* (( Qin + Q15 -15)+1  + ( Qin - 15 + 16))-1 */

                *p1++ = round_fx_sat(L_add_sat(L_shl(Mult_32_16(*pa++, *p3), 1), L_deposit_h(*p4++)));  /* (( Qin + Q15 -15)+1  + ( Qin - 15 + 16))-1 */

#else

                *p1++=round_fx(L_add(L_shl(Mult_32_16(*pa++,*p3),1),L_deposit_h(*p4++)));  /* (( Qin + Q15 -15)+1  + ( Qin - 15 + 16))-1 */

#endif
@@ -459,7 +453,7 @@ void window_ola_fx( 
            FOR (i = 0; i < temp_len; i++)

            {

#ifdef BASOP_NOGLOB

                *p1++=round_fx_o(L_sub_o(L_deposit_h(*p4++), L_shl_o(Mult_32_16(*pa--,*p3),1, &Overflow), &Overflow), &Overflow);  /* (( Qin + Q15 -15)+1  + ( Qin - 15 + 16))-1 */

                *p1++=round_fx_sat(L_sub_sat(L_deposit_h(*p4++), L_shl_sat(Mult_32_16(*pa--,*p3),1)));  /* (( Qin + Q15 -15)+1  + ( Qin - 15 + 16))-1 */

#else

                *p1++=round_fx(L_sub(L_deposit_h(*p4++), L_shl(Mult_32_16(*pa--,*p3),1) ));  /* (( Qin + Q15 -15)+1  + ( Qin - 15 + 16))-1 */

#endif