Commit 1c1937ca authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch 'msan_fix' into 'main'

MSAN fix

See merge request !405
parents 7ab7588f c50fc494
Loading
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -495,8 +495,10 @@ void L_lerp_fx( Word32 *f, Word32 *f_out, Word16 bufferNewSize, Word16 bufferOld
        *q -= guard_bits;
        FOR( Word16 ind = 0; ind < bufferNewSize; ind++ )
        f[ind] = L_shr( f[ind], guard_bits );
#ifndef MSAN_FIX
        FOR( Word16 ind = 0; ind < bufferNewSize; ind++ )
        f_out[ind] = L_shr( f_out[ind], guard_bits );
#endif
    }

    IF( 128 * bufferNewSize > bufferOldSize * 507 )
+3 −0
Original line number Diff line number Diff line
@@ -181,6 +181,9 @@ void initFdCngDec_ivas_fx(
    st->CNG_mode = -1;
    move16();
    Copy( st->lsp_old_fx, st->lspCNG_fx, M );
#ifdef MSAN_FIX
    hFdCngDec->hFdCngCom->sid_frame_counter = 0;
#endif
    return;
}

+1 −1
Original line number Diff line number Diff line
@@ -952,7 +952,7 @@ static void stereo_dft_generate_comfort_noise_fx(
            ptr0 = shb_shape;
            ptr1 = ptr0 + 2;
            ptr2 = ptr1 + 1;
            set16_fx( e_norm_temp, q_shb_shape, st->L_frame );
            set16_fx( e_norm_temp, q_shb_shape, L_FRAME16k );

            FOR( i = 0; i < L_FRAME16k / 2 - 1; i++ )
            {