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.
diff --git a/gst/audiofx/audioamplify.c b/gst/audiofx/audioamplify.c
index d573f8f..5861a8e 100644
--- a/gst/audiofx/audioamplify.c
+++ b/gst/audiofx/audioamplify.c
@@ -216,7 +216,6 @@
{
filter->amplification = 1.0;
filter->clipping_method = METHOD_CLIP;
- filter->width = 0;
filter->format_index = 0;
gst_base_transform_set_in_place (GST_BASE_TRANSFORM (filter), TRUE);
}
@@ -284,8 +283,6 @@
GstAudioAmplify *filter = GST_AUDIO_AMPLIFY (base);
gboolean ret;
- filter->width = format->width / 8;
-
if (format->type == GST_BUFTYPE_LINEAR && format->width == 16)
filter->format_index = 0;
else if (format->type == GST_BUFTYPE_FLOAT && format->width == 32)
@@ -414,7 +411,8 @@
gst_audio_amplify_transform_ip (GstBaseTransform * base, GstBuffer * buf)
{
GstAudioAmplify *filter = GST_AUDIO_AMPLIFY (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;
diff --git a/gst/audiofx/audiodynamic.c b/gst/audiofx/audiodynamic.c
index 583008f..404d707 100644
--- a/gst/audiofx/audiodynamic.c
+++ b/gst/audiofx/audiodynamic.c
@@ -207,7 +207,8 @@
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 @@
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 @@
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 @@
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;
diff --git a/gst/audiofx/audiodynamic.h b/gst/audiofx/audiodynamic.h
index 3f8572c..66cf9b1 100644
--- a/gst/audiofx/audiodynamic.h
+++ b/gst/audiofx/audiodynamic.h
@@ -47,8 +47,6 @@
/* < private > */
GstAudioDynamicProcessFunc process;
- gint width;
- gboolean is_float;
gint characteristics;
gint mode;
gfloat threshold;
diff --git a/gst/audiofx/audioinvert.c b/gst/audiofx/audioinvert.c
index e762d14..f8c17ff 100644
--- a/gst/audiofx/audioinvert.c
+++ b/gst/audiofx/audioinvert.c
@@ -147,7 +147,6 @@
gst_audio_invert_init (GstAudioInvert * filter, GstAudioInvertClass * klass)
{
filter->degree = 0.0;
- filter->width = 0;
gst_base_transform_set_in_place (GST_BASE_TRANSFORM (filter), TRUE);
}
@@ -202,8 +201,6 @@
else
ret = FALSE;
- filter->width = format->width / 8;
-
return ret;
}
@@ -240,7 +237,8 @@
gst_audio_invert_transform_ip (GstBaseTransform * base, GstBuffer * buf)
{
GstAudioInvert *filter = GST_AUDIO_INVERT (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;
diff --git a/gst/audiofx/audioinvert.h b/gst/audiofx/audioinvert.h
index b6ccc6e..b0d841a 100644
--- a/gst/audiofx/audioinvert.h
+++ b/gst/audiofx/audioinvert.h
@@ -47,7 +47,6 @@
/* < private > */
GstAudioInvertProcessFunc process;
- gint width;
};
struct _GstAudioInvertClass
