Commit feffbe7c authored by Vladimir Malenovsky's avatar Vladimir Malenovsky
Browse files

Merge branch... 

Merge branch 'basop-2580-static-value-used-instead-of-existing-variable-in-function-unclr_calc_corr_features_fx' into 'main'

Resolve "Static value used instead of existing variable in function unclr_calc_corr_features_fx()"

See merge request !3025
parents 6dd0ecbe 595e9cb2

lib_com/options.h

100755 → 100644
+1 −0
Original line number Diff line number Diff line
@@ -153,6 +153,7 @@ 
#define FIX_BASOP_2519_ICBWE_DEC_Q_TRACK                /* FhG: BASOP #2519: Track Q-format of dec_2over3_mem_fx across frames in stereo_icBWE_preproc_fx */

#define FIX_BASOP_2592_OVERFLOW                         /* FhG: BASOP #2592: fix overflow in GetF0() */

#define FIX_BASOP_2591_EDGE_DETECT_COMP                 /* FhG: BASOP #2591: Wrong comparison in edge_detect_fx() */

#define FIX_NONBE_2580_USE_LENGTH_NOT_CONSTANT          /* Dolby: fix 2580: use dynamic length denominator for average energy in unclr_calc_corr_features_fx() */



/* ##################### End NON-BE switches ########################### */

lib_enc/ivas_stereo_ica_enc_fx.c

+3 −0
Original line number Diff line number Diff line
@@ -2282,6 +2282,9 @@ static void unclr_calc_corr_features_fx( 
    }



    /* average energy of L and R channels */

#ifdef FIX_NONBE_2580_USE_LENGTH_NOT_CONSTANT

    /* Note, that length is a fixed value equal to L_FRAME_DS, so 1/length = 1/160 = 13421772 */

#endif

    hStereoClassif->ave_ener_L_fx = Mpy_32_32( hStereoTCA->E1_mem_fx, 13421772 /* 1/length in Q31*/ ); /* Q31-hStereoClassif->ave_ener_L_fx_e */

    move32();

    hStereoClassif->ave_ener_L_fx_e = hStereoTCA->E1_mem_exp;