Commit 016048e7 authored by vaillancour's avatar vaillancour
Browse files

Fix for -dtx bw_switch_NB_WB_SWB_FB

parent 89762ba0

lib_com/window_ola_fx.c

+11 −0
Original line number Diff line number Diff line
@@ -359,9 +359,15 @@ void window_ola_fx( 
            temp_len = sub(shr(L,1),n);

            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 */

                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 */

#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;

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

#endif

                /*  paout[i] = ImdctOut[L/2 + i] * win_right[(2*L_FRAME16k-(n16+(i-n)/2))*decimate-1-decay-windecay48]+OldauOut[i];

                paout[i+1] = ImdctOut[L/2 + i +1] * win_int_right[2*L_FRAME16k-(n16+(i-n)/2)-1-windecay16]+OldauOut[i+1];*/

            }
@@ -373,8 +379,13 @@ void window_ola_fx( 
            temp_len =  sub(shr(L,1),n);

            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 */

#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 */

#endif

                p3-=decimate;

                /* paout[L/2 + i ] = -ImdctOut[L - 1 - i] * win_int_right[(3*L_FRAME16k/2-1-i/2)-windecay16]+OldauOut[i+L/2];

                paout[L/2 + i +1] = -ImdctOut[L - 1 - (i+1)] * win_right[(3*L_FRAME16k/2-1-i/2)*decimate+decay-windecay48]+OldauOut[i+L/2+1]; */