diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2014-05-19 11:34:42 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2014-05-19 11:34:42 +0200 |
| commit | 5fc8820d8c35e4542151ae500bcd2a3ded70f2b2 (patch) | |
| tree | 884f1daa76fae835a3431f16fcbcd186164b351c | |
| parent | cbc37f389f2fde9cb6f73e94614b005e1d3c1818 (diff) | |
| download | gstreamer-plugins-bad-5fc8820d8c35e4542151ae500bcd2a3ded70f2b2.tar.gz | |
freeverb: Don't pass floats to abs() but instead cast them to ints first
gstfreeverb.c:781:29: error: using integer absolute value function 'abs' when
argument is of floating point type [-Werror,-Wabsolute-value]
if (abs (out_l2) > 0 || abs (out_r2) > 0)
| -rw-r--r-- | gst/freeverb/gstfreeverb.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/gst/freeverb/gstfreeverb.c b/gst/freeverb/gstfreeverb.c index 30bcb1cf7..819d08cf6 100644 --- a/gst/freeverb/gstfreeverb.c +++ b/gst/freeverb/gstfreeverb.c @@ -701,7 +701,6 @@ gst_freeverb_transform_m2s_int (GstFreeverb * filter, gboolean drained = TRUE; for (k = 0; k < num_samples; k++) { - out_l1 = out_r1 = 0.0; /* The original Freeverb code expects a stereo signal and 'input_1' @@ -729,10 +728,12 @@ gst_freeverb_transform_m2s_int (GstFreeverb * filter, /* Calculate output */ out_l2 = out_l1 * priv->wet1 + out_r1 * priv->wet2 + input_2 * priv->dry; out_r2 = out_r1 * priv->wet1 + out_l1 * priv->wet2 + input_2 * priv->dry; - *odata++ = (gint16) CLAMP (out_l2, G_MININT16, G_MAXINT16); - *odata++ = (gint16) CLAMP (out_r2, G_MININT16, G_MAXINT16); + out_l2 = CLAMP (out_l2, G_MININT16, G_MAXINT16); + out_r2 = CLAMP (out_r2, G_MININT16, G_MAXINT16); + *odata++ = (gint16) out_l2; + *odata++ = (gint16) out_r2; - if (abs (out_l2) > 0 || abs (out_r2) > 0) + if (abs ((gint16) out_l2) > 0 || abs ((gint16) out_r2) > 0) drained = FALSE; } return drained; @@ -749,7 +750,6 @@ gst_freeverb_transform_s2s_int (GstFreeverb * filter, gboolean drained = TRUE; for (k = 0; k < num_samples; k++) { - out_l1 = out_r1 = 0.0; input_2l = (gfloat) * idata++; @@ -775,10 +775,12 @@ gst_freeverb_transform_s2s_int (GstFreeverb * filter, /* Calculate output */ out_l2 = out_l1 * priv->wet1 + out_r1 * priv->wet2 + input_2l * priv->dry; out_r2 = out_r1 * priv->wet1 + out_l1 * priv->wet2 + input_2r * priv->dry; - *odata++ = (gint16) CLAMP (out_l2, G_MININT16, G_MAXINT16); - *odata++ = (gint16) CLAMP (out_r2, G_MININT16, G_MAXINT16); + out_l2 = CLAMP (out_l2, G_MININT16, G_MAXINT16); + out_r2 = CLAMP (out_r2, G_MININT16, G_MAXINT16); + *odata++ = (gint16) out_l2; + *odata++ = (gint16) out_r2; - if (abs (out_l2) > 0 || abs (out_r2) > 0) + if (abs ((gint16) out_l2) > 0 || abs ((gint16) out_r2) > 0) drained = FALSE; } return drained; @@ -795,7 +797,6 @@ gst_freeverb_transform_m2s_float (GstFreeverb * filter, gboolean drained = TRUE; for (k = 0; k < num_samples; k++) { - out_l1 = out_r1 = 0.0; /* The original Freeverb code expects a stereo signal and 'input_1' @@ -843,7 +844,6 @@ gst_freeverb_transform_s2s_float (GstFreeverb * filter, gboolean drained = TRUE; for (k = 0; k < num_samples; k++) { - out_l1 = out_r1 = 0.0; input_2l = *idata++; |