Commit 04314d4e authored by Manuel Jander's avatar Manuel Jander
Browse files

Correct read of uninitialized memory MSAN error. Correct MSVC warning.

parent 7fa03b00

lib_enc/cng_enc_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 


static void shb_CNG_encod_fx( Encoder_State *st_fx, const Word16 update_fx );

#ifdef NONBE_FIX_ISSUE_2206_SWB_EXPERIMENT

static Word16 shb_DTX_fx( Encoder_State *st_fx, const Word16 *shb_speech_fx, Word16 shb_speech_q, const Word16 *syn_12k8_16k );

static Word16 shb_DTX_fx( Encoder_State *st_fx, const Word16 *shb_speech_fx, const Word16 shb_speech_q, const Word16 *syn_12k8_16k );

#else

static Word16 shb_DTX_fx( Encoder_State *st_fx, const Word16 *shb_speech_fx, const Word16 *syn_12k8_16k );

#endif

lib_enc/swb_bwe_enc_fx.c

+12 −5
Original line number Diff line number Diff line
@@ -345,24 +345,30 @@ void swb_bwe_enc_fx( 
            delay_input_signal_fx( hBWE_FD->old_input_lp_fx, old_input_lp_fx, &old_input_16k_fx[L_INP_MEM], Sample_Delay_LP, L_FRAME16k, &hBWE_FD->prev_Q_input_lp, &Q_slb_speech );

        }

    }

#ifdef NONBE_FIX_ISSUE_2206_SWB_EXPERIMENT

    q_new_input_hp = s_min( Q_shb_speech, hBWE_FD->Q_new_input_hp );



#ifdef NONBE_FIX_ISSUE_2206_SWB_EXPERIMENT

    IF( st_fx->element_mode == IVAS_CPE_DFT )

    {

        q_new_input_hp = s_min( Q_shb_speech, hBWE_TD->old_speech_shb_q );

        /* Adjust values copied above to q_new_input_hp */

        scale_sig( new_input_hp_fx, Sample_Delay_HP, sub( q_new_input_hp, hBWE_TD->old_speech_shb_q ) );

        scale_sig( new_input_hp_fx + Sample_Delay_HP, sub( L_FRAME16k, Sample_Delay_HP ), sub( q_new_input_hp, Q_shb_speech ) );

        Copy_Scale_sig( shb_speech_fx, &new_input_hp_fx[Sample_Delay_HP], sub( L_FRAME16k, Sample_Delay_HP ), sub( q_new_input_hp, Q_shb_speech ) );

    }

    ELSE IF( st_fx->element_mode == EVS_MONO )

    {

        Copy( hBWE_FD->new_input_hp_fx, new_input_hp_fx, Sample_Delay_HP );

        Copy( shb_speech_fx, &new_input_hp_fx[Sample_Delay_HP], L_FRAME16k - Sample_Delay_HP );

    }

    ELSE

    {

        scale_sig( new_input_hp_fx, L_FRAME16k, sub( q_new_input_hp, Q_shb_speech ) );

        Copy_Scale_sig( hBWE_FD->new_input_hp_fx, new_input_hp_fx, Sample_Delay_HP, sub( q_new_input_hp, hBWE_FD->Q_new_input_hp ) );

        Copy_Scale_sig( shb_speech_fx, &new_input_hp_fx[Sample_Delay_HP], L_FRAME16k - Sample_Delay_HP, sub( q_new_input_hp, Q_shb_speech ) );

    }

    Q_shb_speech = q_new_input_hp;

    move16();



#else

    q_new_input_hp = s_min( Q_shb_speech, hBWE_FD->Q_new_input_hp );

#endif

    IF( st_fx->element_mode == EVS_MONO )

    {

        Copy( hBWE_FD->new_input_hp_fx, new_input_hp_fx, Sample_Delay_HP );
@@ -378,6 +384,7 @@ void swb_bwe_enc_fx( 
        Copy( hBWE_FD->new_input_hp_fx, new_input_hp_fx, Sample_Delay_HP );                                                                             // hBWE_FD->Q_new_input_hp

        Copy_Scale_sig( shb_speech_fx, &new_input_hp_fx[Sample_Delay_HP], L_FRAME16k - Sample_Delay_HP, sub( hBWE_FD->Q_new_input_hp, Q_shb_speech ) ); // hBWE_FD->Q_new_input_hp

    }

#endif



    hBWE_FD->Q_new_input_hp = Q_shb_speech;

    move16();