Commit 4218e340 authored by vaillancour's avatar vaillancour
Browse files

Fixes for 48 stv48n2_sw_72_244_48kHz.*.COD

parent 11407852

lib_com/lerp.c

+7 −7
Original line number Diff line number Diff line
@@ -98,10 +98,6 @@ static void lerp_proc(Word16 *f, Word16 *f_out, Word16 bufferNewSize, Word16 bu 
    Word32 pos, shift;

    Word16 buf[2*L_FRAME_MAX];

    Word16 *ptr;

#ifdef BASOP_NOGLOB_DECLARE_LOCAL

    Flag Overflow = 0;

#endif





    ptr = f_out;

    test();
@@ -139,7 +135,7 @@ static void lerp_proc(Word16 *f, Word16 *f_out, Word16 bufferNewSize, Word16 bu 
        /*buf[0]=f[0]+pos*(f[1]-f[0]);*/

        move16();

#ifdef BASOP_NOGLOB

        *ptr++ = add_o(f[0], msu_r(L_mult(diff, f[1]),diff, f[0]), &Overflow);

        *ptr++ = add_sat(f[0], msu_r(L_mult(diff, f[1]),diff, f[0]));

#else

        *ptr++ = add(f[0], msu_r(L_mult(diff, f[1]),diff, f[0]));

#endif
@@ -152,7 +148,11 @@ static void lerp_proc(Word16 *f, Word16 *f_out, Word16 bufferNewSize, Word16 bu 
        diff = lshr(extract_l(pos), 1);



        move16();

#ifdef BASOP_NOGLOB

        *ptr++ = add_sat(f[idx], msu_r_sat(L_mult(diff, f[idx+1]), diff, f[idx]));

#else

        *ptr++ = add(f[idx], msu_r(L_mult(diff, f[idx+1]), diff, f[idx]));

#endif

    }



    pos = L_add(pos, shift);
@@ -168,7 +168,7 @@ static void lerp_proc(Word16 *f, Word16 *f_out, Word16 bufferNewSize, Word16 bu 
        }

        move16();

#ifdef BASOP_NOGLOB

        *ptr++ = add(f[idx], msu_ro(L_mult(diff, f[idx+1]), diff, f[idx], &Overflow));

        *ptr++ = add_sat(f[idx], msu_r_sat(L_mult(diff, f[idx+1]), diff, f[idx]));

#else 

        *ptr++ = add(f[idx], msu_r(L_mult(diff, f[idx+1]), diff, f[idx]));

#endif
@@ -192,7 +192,7 @@ static void lerp_proc(Word16 *f, Word16 *f_out, Word16 bufferNewSize, Word16 bu 


    move16();

#ifdef BASOP_NOGLOB

    *ptr++ = add_o(f[idx], shl_o(msu_ro(L_mult_o(diff, f[idx+1], &Overflow), diff, f[idx], &Overflow), 1, &Overflow), &Overflow);

    *ptr++ = add_sat(f[idx], shl_sat(msu_r_sat(L_mult(diff, f[idx+1]), diff, f[idx]), 1));

#else

    *ptr++ = add(f[idx], shl(msu_r(L_mult(diff, f[idx+1]), diff, f[idx]), 1));

#endif

lib_dec/swb_bwe_dec_hr_fx.c

+6 −3
Original line number Diff line number Diff line
@@ -600,10 +600,13 @@ Word16 swb_bwe_dec_hr_fx( /* o : Exponent of SHB synthesis */ 
                }



                /* apply noise-fill */

                swb_hr_noise_fill_fx( is_transient, NUM_TRANS_START_FREQ_COEF, NUM_TRANS_END_FREQ_COEF,

                                      round_fx(L_shl(L_tilt_wb, 3)), /* Q(24+3-16) -> Q11 */

#ifdef BASOP_NOGLOB

                swb_hr_noise_fill_fx( is_transient, NUM_TRANS_START_FREQ_COEF, NUM_TRANS_END_FREQ_COEF, round_fx_sat(L_shl_sat(L_tilt_wb, 3)), /* Q(24+3-16) -> Q11 */

                                      pitch, nq, Nsv, &hBWE_FD_HR->bwe_highrate_seed_fx, t_audio+temp, t_audio_exp );



#else

                swb_hr_noise_fill_fx( is_transient, NUM_TRANS_START_FREQ_COEF, NUM_TRANS_END_FREQ_COEF, round_fx(L_shl(L_tilt_wb, 3)), /* Q(24+3-16) -> Q11 */

                                      pitch, nq, Nsv, &hBWE_FD_HR->bwe_highrate_seed_fx, t_audio+temp, t_audio_exp );

#endif

                /* Go from Q't_audio_exp' on 16 Bits to 'Q_32_BITS' on 32 bits */

                temp2 = i_mult2(WIDTH_BAND, Nsv);

                ptr16 = &t_audio[temp];