diff options
author | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-11-17 15:53:42 +0100 |
---|---|---|
committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-11-17 15:53:42 +0100 |
commit | 940de5b195943ad3a64df3bc590916fe59c89688 (patch) | |
tree | 9a32180f916e667751c5fa4196c99e8d5eab87f5 /gst/y4m/gsty4mdec.c | |
parent | 2711109c13dc59c3e91e0b479c90a2243c4d2b83 (diff) | |
download | gstreamer-plugins-bad-940de5b195943ad3a64df3bc590916fe59c89688.tar.gz |
add parent to pad functions
Diffstat (limited to 'gst/y4m/gsty4mdec.c')
-rw-r--r-- | gst/y4m/gsty4mdec.c | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/gst/y4m/gsty4mdec.c b/gst/y4m/gsty4mdec.c index f39632227..3b431bda0 100644 --- a/gst/y4m/gsty4mdec.c +++ b/gst/y4m/gsty4mdec.c @@ -55,10 +55,13 @@ static void gst_y4m_dec_get_property (GObject * object, static void gst_y4m_dec_dispose (GObject * object); static void gst_y4m_dec_finalize (GObject * object); -static GstFlowReturn gst_y4m_dec_chain (GstPad * pad, GstBuffer * buffer); -static gboolean gst_y4m_dec_sink_event (GstPad * pad, GstEvent * event); +static GstFlowReturn gst_y4m_dec_chain (GstPad * pad, GstObject * parent, + GstBuffer * buffer); +static gboolean gst_y4m_dec_sink_event (GstPad * pad, GstObject * parent, + GstEvent * event); -static gboolean gst_y4m_dec_src_event (GstPad * pad, GstEvent * event); +static gboolean gst_y4m_dec_src_event (GstPad * pad, GstObject * parent, + GstEvent * event); static gboolean gst_y4m_dec_src_query (GstPad * pad, GstObject * parent, GstQuery * query); @@ -415,7 +418,7 @@ error: } static GstFlowReturn -gst_y4m_dec_chain (GstPad * pad, GstBuffer * buffer) +gst_y4m_dec_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer) { GstY4mDec *y4mdec; int n_avail; @@ -425,7 +428,7 @@ gst_y4m_dec_chain (GstPad * pad, GstBuffer * buffer) int i; int len; - y4mdec = GST_Y4M_DEC (gst_pad_get_parent (pad)); + y4mdec = GST_Y4M_DEC (parent); GST_DEBUG_OBJECT (y4mdec, "chain"); @@ -545,18 +548,18 @@ gst_y4m_dec_chain (GstPad * pad, GstBuffer * buffer) break; } - gst_object_unref (y4mdec); GST_DEBUG ("returning %d", flow_ret); + return flow_ret; } static gboolean -gst_y4m_dec_sink_event (GstPad * pad, GstEvent * event) +gst_y4m_dec_sink_event (GstPad * pad, GstObject * parent, GstEvent * event) { gboolean res; GstY4mDec *y4mdec; - y4mdec = GST_Y4M_DEC (gst_pad_get_parent (pad)); + y4mdec = GST_Y4M_DEC (parent); GST_DEBUG_OBJECT (y4mdec, "event"); @@ -592,17 +595,16 @@ gst_y4m_dec_sink_event (GstPad * pad, GstEvent * event) break; } - gst_object_unref (y4mdec); return res; } static gboolean -gst_y4m_dec_src_event (GstPad * pad, GstEvent * event) +gst_y4m_dec_src_event (GstPad * pad, GstObject * parent, GstEvent * event) { gboolean res; GstY4mDec *y4mdec; - y4mdec = GST_Y4M_DEC (gst_pad_get_parent (pad)); + y4mdec = GST_Y4M_DEC (parent); GST_DEBUG_OBJECT (y4mdec, "event"); @@ -643,7 +645,6 @@ gst_y4m_dec_src_event (GstPad * pad, GstEvent * event) break; } - gst_object_unref (y4mdec); return res; } |