Commit 3e696396 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Fix variable reuse bug.

parent 1d8e1fde

lib_rend/ivas_dirac_output_synthesis_dec_fx.c

+7 −3
Original line number Diff line number Diff line
@@ -1880,6 +1880,10 @@ void ivas_dirac_dec_output_synthesis_process_subframe_psd_ls_fx( 
    Word16 exp = 0, exp1, tmp, q_com, q_tmp, min_exp;

    Word32 tmp32;

    move16();

#ifdef FIX_BASOP_2442_MASA2TC_TO_MONO_AND_AMBI

    Word32 L_tmp_cross;

    Word16 q_tmp_cross;

#endif



    Word64 Cldfb_RealBuffer64_fx[MAX_OUTPUT_CHANNELS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX];

    Word64 Cldfb_ImagBuffer64_fx[MAX_OUTPUT_CHANNELS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX];
@@ -2430,9 +2434,9 @@ void ivas_dirac_dec_output_synthesis_process_subframe_psd_ls_fx( 
#ifdef FIX_BASOP_2442_MASA2TC_TO_MONO_AND_AMBI



            W_temp = W_mac_32_32( W_mult_32_32( g1, ( *( p_cy_cross_dir_smooth ) ) ), g2, ( *( p_cy_cross_dir_smooth_prev ) ) );

            q_tmp = W_norm( W_temp );

            L_tmp = W_extract_h( W_shl( W_temp, q_tmp ) );

            *( p_cy_cross_dir_smooth_prev ) = L_shr_r( L_tmp, q_tmp ); // q_cy_cross_dir_smooth_prev

            q_tmp_cross = W_norm( W_temp );

            L_tmp_cross = W_extract_h( W_shl( W_temp, q_tmp_cross ) );

            *( p_cy_cross_dir_smooth_prev ) = L_shr_r( L_tmp_cross, q_tmp_cross ); // q_cy_cross_dir_smooth_prev

#else

            *( p_cy_cross_dir_smooth_prev ) = Madd_32_32( Mpy_32_32( g1, ( *( p_cy_cross_dir_smooth ) ) ),

                                                          g2, ( *( p_cy_cross_dir_smooth_prev ) ) ); // (Q31, q_cy_cross_dir_smooth_prev) -> q_cy_cross_dir_smooth_prev