From 7ec579da849ac9787dddee7a88f49a8b5c2c0e24 Mon Sep 17 00:00:00 2001 From: David Schleef Date: Mon, 30 Jun 2003 06:54:18 +0000 Subject: [PATCH] Fix type punning. Original commit message from CVS: Fix type punning. --- gst/level/filter.func | 4 ++-- gst/level/gstlevel.c | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gst/level/filter.func b/gst/level/filter.func index 8ef4753..a530270 100644 --- a/gst/level/filter.func +++ b/gst/level/filter.func @@ -14,7 +14,7 @@ */ /* for(j = 0; j < num_samples; j++) { - (*out_data)[j] = in_data[j]; + out_data[j] = in_data[j]; squaresum += in_data[j] * in_data[j]; } RMS = sqrt (squaresum / (float) num_samples); @@ -24,7 +24,7 @@ */ for(j = 0; j < num_samples; j++) { - (*out_data)[j] = in_data[j]; + out_data[j] = in_data[j]; squaresum += pow ((double) in_data[j] / 32767.0, 2); } RMS = sqrt (squaresum / (float) num_samples); diff --git a/gst/level/gstlevel.c b/gst/level/gstlevel.c index ba246be..91ea46d 100644 --- a/gst/level/gstlevel.c +++ b/gst/level/gstlevel.c @@ -95,9 +95,9 @@ static void gst_level_set_property (GObject *object, guint prop_id, const GVa static void gst_level_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec); static void gst_level_chain (GstPad *pad, GstBuffer *buf); -static void inline gst_level_fast_16bit_chain (gint16* data, gint16** out_data, +static void inline gst_level_fast_16bit_chain (gint16* data, gint16* out_data, guint numsamples); -static void inline gst_level_fast_8bit_chain (gint8* data, gint8** out_data, +static void inline gst_level_fast_8bit_chain (gint8* data, gint8* out_data, guint numsamples); static GstElementClass *parent_class = NULL; @@ -182,12 +182,12 @@ gst_level_chain (GstPad *pad, GstBuffer *buf) g_print ("%s: ", gst_element_get_name (GST_ELEMENT (filter))); switch (width) { case 16: - gst_level_fast_16bit_chain (in_data, &out_data, + gst_level_fast_16bit_chain (in_data, out_data, GST_BUFFER_SIZE (buf) / 2); break; case 8: gst_level_fast_8bit_chain ((gint8 *) in_data, - (gint8 **) &out_data, GST_BUFFER_SIZE(buf)); + (gint8 *) out_data, GST_BUFFER_SIZE(buf)); break; } gst_buffer_unref (buf); @@ -195,12 +195,12 @@ gst_level_chain (GstPad *pad, GstBuffer *buf) } static void inline -gst_level_fast_16bit_chain (gint16* in_data, gint16** out_data, +gst_level_fast_16bit_chain (gint16* in_data, gint16* out_data, guint num_samples) #include "filter.func" static void inline -gst_level_fast_8bit_chain (gint8* in_data, gint8** out_data, +gst_level_fast_8bit_chain (gint8* in_data, gint8* out_data, guint num_samples) #include "filter.func" -- 2.7.4