From 5f350149a00f581641383b6705479da022e319ec Mon Sep 17 00:00:00 2001 From: Sebastian Dröge Date: Thu, 26 Jul 2007 19:41:07 +0000 Subject: gst/audiofx/: Don't save format information ourselves, this is already saved in Original commit message from CVS: * gst/audiofx/audioamplify.c: (gst_audio_amplify_init), (gst_audio_amplify_setup), (gst_audio_amplify_transform_ip): * gst/audiofx/audiodynamic.c: (gst_audio_dynamic_set_process_function), (gst_audio_dynamic_init), (gst_audio_dynamic_setup), (gst_audio_dynamic_transform_ip): * gst/audiofx/audiodynamic.h: * gst/audiofx/audioinvert.c: (gst_audio_invert_init), (gst_audio_invert_setup), (gst_audio_invert_transform_ip): * gst/audiofx/audioinvert.h: Don't save format information ourselves, this is already saved in GstAudioFilter. --- gst/audiofx/audiodynamic.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'gst/audiofx/audiodynamic.c') diff --git a/gst/audiofx/audiodynamic.c b/gst/audiofx/audiodynamic.c index 583008f1..404d7071 100644 --- a/gst/audiofx/audiodynamic.c +++ b/gst/audiofx/audiodynamic.c @@ -207,7 +207,8 @@ gst_audio_dynamic_set_process_function (GstAudioDynamic * filter) func_index = (filter->mode == MODE_COMPRESSOR) ? 0 : 4; func_index += (filter->characteristics == CHARACTERISTICS_HARD_KNEE) ? 0 : 2; - func_index += (!filter->is_float) ? 0 : 1; + func_index += + (GST_AUDIO_FILTER (filter)->format.type == GST_BUFTYPE_FLOAT) ? 1 : 0; if (func_index >= 0 && func_index < 8) { filter->process = process_functions[func_index]; @@ -278,8 +279,6 @@ gst_audio_dynamic_init (GstAudioDynamic * filter, GstAudioDynamicClass * klass) filter->threshold = 0.0; filter->characteristics = CHARACTERISTICS_HARD_KNEE; filter->mode = MODE_COMPRESSOR; - filter->width = 0; - filter->is_float = FALSE; gst_base_transform_set_in_place (GST_BASE_TRANSFORM (filter), TRUE); } @@ -343,9 +342,6 @@ gst_audio_dynamic_setup (GstAudioFilter * base, GstRingBufferSpec * format) GstAudioDynamic *filter = GST_AUDIO_DYNAMIC (base); gboolean ret = TRUE; - filter->width = format->width / 8; - filter->is_float = (format->type == GST_BUFTYPE_FLOAT) ? TRUE : FALSE; - ret = gst_audio_dynamic_set_process_function (filter); return ret; @@ -700,7 +696,8 @@ static GstFlowReturn gst_audio_dynamic_transform_ip (GstBaseTransform * base, GstBuffer * buf) { GstAudioDynamic *filter = GST_AUDIO_DYNAMIC (base); - guint num_samples = GST_BUFFER_SIZE (buf) / filter->width; + guint num_samples = + GST_BUFFER_SIZE (buf) / (GST_AUDIO_FILTER (filter)->format.width / 8); if (!gst_buffer_is_writable (buf)) return GST_FLOW_OK; -- cgit