lib_enc/ivas_stereo_dmx_evs_fx.c

@@ -108,9 +108,9 @@
 #define STEREO_DMX_EVS_SGC_GIR_S              32617 // 1/1.00461543f
 #define STEREO_DMX_EVS_SGC_GL                 32391 // 0.9885f
 #define STEREO_DMX_EVS_SGC_GH                 33148 // 1.0116f
-#define STEREO_DMX_EVS_SGC_LEGY_THRES_16      2.5E8
-#define STEREO_DMX_EVS_SGC_LEGY_THRES_32      3.E8
-#define STEREO_DMX_EVS_SGC_LEGY_THRES_48      5.E8
+#define STEREO_DMX_EVS_SGC_LEGY_THRES_16      250000000
+#define STEREO_DMX_EVS_SGC_LEGY_THRES_32      300000000
+#define STEREO_DMX_EVS_SGC_LEGY_THRES_48      500000000
 #define STEREO_DMX_EVS_SGC_LEGY_THRES_E       22
 #define STEREO_DMX_EVS_SGC_GMAX               46340      // 1.4142f
 #define STEREO_DMX_EVS_SGC_GMIN               23170      // 0.7071f
@@ -2116,7 +2116,8 @@ static void apply_gain_sgc(
     }
 
     W_tmp = W_mult_32_32( *gain, lr );
-    *gain = W_shr( W_tmp, 16 );
+    W_tmp = W_shr( W_tmp, 16 );
+    *gain = W_extract_l( W_tmp );
 
     return;
 }
@@ -2634,11 +2635,9 @@ void stereo_dmx_evs_enc_fx(
     }
 
     Copy_Scale_sig32_16( p_dmx_data, data, n_samples, 5 ); // Q26->Q15
-    pop_wmops();
 
     pop_wmops();
 
-
     return;
 }