diff options
author | Sebastian Dröge <slomo@circular-chaos.org> | 2008-01-26 16:19:26 +0000 |
---|---|---|
committer | Sebastian Dröge <slomo@circular-chaos.org> | 2008-01-26 16:19:26 +0000 |
commit | fe38597aee1bda146e2ca9c1b1dbc8ec04dc4d50 (patch) | |
tree | 4a1e5c3706ed9b60adbb621e24265b434ea5e0da | |
parent | b05b9d04d6a6ff723b97079f3aa22b51d32d7170 (diff) | |
download | gst-plugins-bad-fe38597aee1bda146e2ca9c1b1dbc8ec04dc4d50.tar.gz gst-plugins-bad-fe38597aee1bda146e2ca9c1b1dbc8ec04dc4d50.tar.bz2 gst-plugins-bad-fe38597aee1bda146e2ca9c1b1dbc8ec04dc4d50.zip |
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.
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | gst/filter/gstbpwsinc.c | 21 | ||||
-rw-r--r-- | gst/filter/gstlpwsinc.c | 21 |
3 files changed, 7 insertions, 42 deletions
@@ -1,5 +1,12 @@ 2008-01-26 Sebastian Dröge <slomo@circular-chaos.org> + * 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 <slomo@circular-chaos.org> + * ext/soundtouch/gstpitch.cc: Allow seeking only in TIME and DEFAULT format, other formats will not work as expected. Also handle a stop position of -1 correctly 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) |