From fe38597aee1bda146e2ca9c1b1dbc8ec04dc4d50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Sat, 26 Jan 2008 16:19:26 +0000 Subject: gst/filter/: Don't implement get_unit_size() ourselves, the GstAudioFilter base class already does this for us. Original commit message from CVS: * gst/filter/gstbpwsinc.c: (gst_bpwsinc_class_init): * gst/filter/gstlpwsinc.c: (gst_lpwsinc_class_init): Don't implement get_unit_size() ourselves, the GstAudioFilter base class already does this for us. --- ChangeLog | 7 +++++++ gst/filter/gstbpwsinc.c | 21 --------------------- gst/filter/gstlpwsinc.c | 21 --------------------- 3 files changed, 7 insertions(+), 42 deletions(-) diff --git a/ChangeLog b/ChangeLog index d23faf87..db77eb55 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-01-26 Sebastian Dröge + + * gst/filter/gstbpwsinc.c: (gst_bpwsinc_class_init): + * gst/filter/gstlpwsinc.c: (gst_lpwsinc_class_init): + Don't implement get_unit_size() ourselves, the GstAudioFilter base + class already does this for us. + 2008-01-26 Sebastian Dröge * ext/soundtouch/gstpitch.cc: diff --git a/gst/filter/gstbpwsinc.c b/gst/filter/gstbpwsinc.c index 7e77661c..929daec6 100644 --- a/gst/filter/gstbpwsinc.c +++ b/gst/filter/gstbpwsinc.c @@ -175,8 +175,6 @@ static void bpwsinc_get_property (GObject * object, guint prop_id, static GstFlowReturn bpwsinc_transform (GstBaseTransform * base, GstBuffer * inbuf, GstBuffer * outbuf); -static gboolean bpwsinc_get_unit_size (GstBaseTransform * base, GstCaps * caps, - guint * size); static gboolean bpwsinc_start (GstBaseTransform * base); static gboolean bpwsinc_event (GstBaseTransform * base, GstEvent * event); @@ -259,7 +257,6 @@ gst_bpwsinc_class_init (GstBPWSincClass * klass) WINDOW_HAMMING, G_PARAM_READWRITE | GST_PARAM_CONTROLLABLE)); trans_class->transform = GST_DEBUG_FUNCPTR (bpwsinc_transform); - trans_class->get_unit_size = GST_DEBUG_FUNCPTR (bpwsinc_get_unit_size); trans_class->start = GST_DEBUG_FUNCPTR (bpwsinc_start); trans_class->event = GST_DEBUG_FUNCPTR (bpwsinc_event); filter_class->setup = GST_DEBUG_FUNCPTR (bpwsinc_setup); @@ -559,24 +556,6 @@ bpwsinc_setup (GstAudioFilter * base, GstRingBufferSpec * format) /* GstBaseTransform vmethod implementations */ -static gboolean -bpwsinc_get_unit_size (GstBaseTransform * base, GstCaps * caps, guint * size) -{ - gint width, channels; - GstStructure *structure; - gboolean ret; - - g_assert (size); - - structure = gst_caps_get_structure (caps, 0); - ret = gst_structure_get_int (structure, "width", &width); - ret &= gst_structure_get_int (structure, "channels", &channels); - - *size = width * channels / 8; - - return ret; -} - static GstFlowReturn bpwsinc_transform (GstBaseTransform * base, GstBuffer * inbuf, GstBuffer * outbuf) diff --git a/gst/filter/gstlpwsinc.c b/gst/filter/gstlpwsinc.c index 7d5f8e4d..20b3f176 100644 --- a/gst/filter/gstlpwsinc.c +++ b/gst/filter/gstlpwsinc.c @@ -171,8 +171,6 @@ static void lpwsinc_get_property (GObject * object, guint prop_id, static GstFlowReturn lpwsinc_transform (GstBaseTransform * base, GstBuffer * inbuf, GstBuffer * outbuf); -static gboolean lpwsinc_get_unit_size (GstBaseTransform * base, GstCaps * caps, - guint * size); static gboolean lpwsinc_start (GstBaseTransform * base); static gboolean lpwsinc_event (GstBaseTransform * base, GstEvent * event); static gboolean lpwsinc_setup (GstAudioFilter * base, @@ -253,7 +251,6 @@ gst_lpwsinc_class_init (GstLPWSincClass * klass) WINDOW_HAMMING, G_PARAM_READWRITE | GST_PARAM_CONTROLLABLE)); trans_class->transform = GST_DEBUG_FUNCPTR (lpwsinc_transform); - trans_class->get_unit_size = GST_DEBUG_FUNCPTR (lpwsinc_get_unit_size); trans_class->start = GST_DEBUG_FUNCPTR (lpwsinc_start); trans_class->event = GST_DEBUG_FUNCPTR (lpwsinc_event); filter_class->setup = GST_DEBUG_FUNCPTR (lpwsinc_setup); @@ -500,24 +497,6 @@ lpwsinc_setup (GstAudioFilter * base, GstRingBufferSpec * format) /* GstBaseTransform vmethod implementations */ -static gboolean -lpwsinc_get_unit_size (GstBaseTransform * base, GstCaps * caps, guint * size) -{ - gint width, channels; - GstStructure *structure; - gboolean ret; - - g_assert (size); - - structure = gst_caps_get_structure (caps, 0); - ret = gst_structure_get_int (structure, "width", &width); - ret &= gst_structure_get_int (structure, "channels", &channels); - - *size = width * channels / 8; - - return ret; -} - static GstFlowReturn lpwsinc_transform (GstBaseTransform * base, GstBuffer * inbuf, GstBuffer * outbuf) -- cgit v1.2.1