Commit 524970e6 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_2384_INIT_DEQUANT_COV

parent 7f89d0d5
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -84,7 +84,6 @@
#define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR      /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */
#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */
#define FIX_1904_HARM_GSC_ENC                           /* VA: #1904 Harmonization of EVS and IVAS GSC code */
#define FIX_2384_INIT_DEQUANT_COV                       /* FhG: basop issue 2384: only read initialized values from Cy_buf_e[k] in ivas_param_mc_dequantize_cov_fx() during renormalization */
#define FIX_2383_INIT_Q_A_ITF                           /* FhG: Initialize Q_A_itf, to avoid reading of uninitialized memory in case ITF is not triggered */
#define FIX_2382_COPY_AQ_IN_MCT                         /* FhG: basop issue 2382: 2nd instance of prevent copying uninitialized values from Aq_fx[][] to Aq_fx_32[][] in TCX */
#define FIX_2391_INIT_HQ_GENERIC_OFFSET                 /* FhG/Eri: basop issue 2391: make sure hq_generic_offset is initialized inside hq_hr_dec_fx() */
+0 −14
Original line number Diff line number Diff line
@@ -3142,9 +3142,7 @@ static void ivas_param_mc_dequantize_cov_fx(
    const PARAM_MC_ILD_MAPPING *h_ild_mapping;
    Word32 Cy_state_int_fx[MAX_OUTPUT_CHANNELS * MAX_OUTPUT_CHANNELS];
    Word16 Cy_state_int_e[MAX_OUTPUT_CHANNELS * MAX_OUTPUT_CHANNELS];
#ifdef FIX_2384_INIT_DEQUANT_COV
    Word16 nY_norm;
#endif

    set16_fx( Cp_buf_e, Cproto_e, MAX_OUTPUT_CHANNELS * MAX_OUTPUT_CHANNELS );
    set32_fx( Nrqq_fx, 0, MAX_OUTPUT_CHANNELS );
@@ -3398,38 +3396,26 @@ static void ivas_param_mc_dequantize_cov_fx(
                Cyp_e += nY_cov;
            }
        }
#ifdef FIX_2384_INIT_DEQUANT_COV
        nY_norm = nY_cov;
        move16();
#endif
    }
    ELSE
    {
        Copy32( Cy_state_int_fx, Cy_state_fx, imult1616( nY_int, nY_int ) );
        Copy( Cy_state_int_e, Cy_buf_e, imult1616( nY_int, nY_int ) );
#ifdef FIX_2384_INIT_DEQUANT_COV
        nY_norm = nY_int;
        move16();
#endif
    }

    /*normalize output matrix to a common exponent*/
    tmp = 0;
#ifdef FIX_2384_INIT_DEQUANT_COV
    FOR( k = 0; k < nY_norm * nY_norm; k++ )
#else
    FOR( k = 0; k < nY_int * nY_int; k++ )
#endif
    {
        Cy_state_fx[k] = BASOP_Util_Add_Mant32Exp( Cy_state_fx[k], Cy_buf_e[k], 0, 0, &Cy_buf_e[k] );
        move32();
        tmp = s_max( tmp, Cy_buf_e[k] );
    }
#ifdef FIX_2384_INIT_DEQUANT_COV
    FOR( k = 0; k < nY_norm * nY_norm; k++ )
#else
    FOR( k = 0; k < nY_int * nY_int; k++ )
#endif
    {
        L_tmp = L_shr( Cy_state_fx[k], sub( tmp, Cy_buf_e[k] ) );
        Cy_state_fx[k] = L_tmp;