Commit 3e1ce076 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch '3gpp_issue_1763_fix' into 'main' 

[allow regression] Fix for 3GPP issue 1763: Rate switching MASA with LTV signal has a couple of...

See merge request !1867
parents 6389a5cb 7461e405

lib_com/modif_fs_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -1759,8 +1759,8 @@ void interpolate_3_over_1_allpass_fx32( 
    {

        mem_temp = out[i]; // Qx

        move32();

        out[i] = L_sub_sat( Mpy_32_16_1( L_add_sat( mem[12], mem[11] ), 18768 ), Mpy_32_16_1( L_add_sat( mem_temp, mem[10] ), 2424 ) ); // Qx

        // 0.572769 in Q15 -> 18768, 0.074005 in Q15 -> 2424

        out[i] = L_sub_sat( Mpy_32_16_1( L_add_sat( mem[12], mem[11] ), 18768 ), Mpy_32_16_1( L_add_sat( mem_temp, mem[10] ), 2425 ) ); // Qx

        // 0.572769 in Q15 -> 18768, 0.074005 in Q15 -> 2425

        move32();

        mem[10] = mem[11]; // Qx

        move32();

lib_dec/swb_tbe_dec_fx.c

+5 −3
Original line number Diff line number Diff line
@@ -613,6 +613,7 @@ void ivas_wb_tbe_dec_fx( 
    Word16 error[L_FRAME16k];

    Word16 synth_frac[L_FRAME16k];

    Word16 upsampled_synth[L_FRAME48k];

    Word32 tmp_synL[L_FRAME48k], upsampled_synth_32fx[L_FRAME48k];

    Word32 prev_pow, curr_pow, curr_frame_pow;

    Word16 curr_frame_pow_exp;

    Word16 temp, scale, n;
@@ -1181,9 +1182,10 @@ void ivas_wb_tbe_dec_fx( 
        }

        ELSE IF( EQ_32( st_fx->output_Fs, 48000 ) )

        {

            Scale_sig( hBWE_TD->mem_resamp_HB_fx, INTERP_3_1_MEM_LEN, sub( Qx, hBWE_TD->prev_Qx ) );

            ivas_interpolate_3_over_1_allpass_fx( synth, L_FRAME16k, upsampled_synth, hBWE_TD->mem_resamp_HB_fx );

            Copy( upsampled_synth, synth, L_FRAME48k );

            Copy_Scale_sig_16_32_no_sat( synth, tmp_synL, L_FRAME48k, sub( Q11, Qx ) );

            interpolate_3_over_1_allpass_fx32( tmp_synL, L_FRAME16k, upsampled_synth_32fx, hBWE_TD->mem_resamp_HB_fx_32 );

            Copy_Scale_sig_32_16( hBWE_TD->mem_resamp_HB_fx_32, hBWE_TD->mem_resamp_HB_fx, INTERP_3_1_MEM_LEN, sub( Qx, Q11 ) );

            Copy_Scale_sig_32_16( upsampled_synth_32fx, synth, L_FRAME48k, sub( Qx, Q11 ) );

        }

    }

    ELSE