mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-20 00:31:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

goom: Fix event handling and negotiate as soon as possible

Browse source
This commit is contained in:
Sebastian Dröge 2013-07-17 14:27:57 +02:00
parent fbafca49f8
commit 78c7c16e9e
1 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
gst/goom/gstgoom.c
View file

@ -111,6 +111,8 @@ static gboolean gst_goom_sink_event (GstPad * pad, GstObject * parent,
static gboolean gst_goom_src_query (GstPad * pad, GstObject * parent, static gboolean gst_goom_src_query (GstPad * pad, GstObject * parent,
GstQuery * query); GstQuery * query);
static gboolean gst_goom_src_negotiate (GstGoom * goom);
#define gst_goom_parent_class parent_class #define gst_goom_parent_class parent_class
G_DEFINE_TYPE (GstGoom, gst_goom, GST_TYPE_ELEMENT); G_DEFINE_TYPE (GstGoom, gst_goom, GST_TYPE_ELEMENT);
@ -207,7 +209,7 @@ gst_goom_sink_setcaps (GstGoom * goom, GstCaps * caps)
goom->bps = goom->channels * sizeof (gint16); goom->bps = goom->channels * sizeof (gint16);
return TRUE; return gst_goom_src_negotiate (goom);
} }
static gboolean static gboolean
@ -360,11 +362,11 @@ gst_goom_src_event (GstPad * pad, GstObject * parent, GstEvent * event)
goom->earliest_time = timestamp + diff; goom->earliest_time = timestamp + diff;
GST_OBJECT_UNLOCK (goom); GST_OBJECT_UNLOCK (goom);
res = gst_pad_push_event (goom->sinkpad, event); res = gst_pad_event_default (pad, parent, event);
break; break;
} }
default: default:
res = gst_pad_push_event (goom->sinkpad, event); res = gst_pad_event_default (pad, parent, event);
break; break;
} }
@ -389,12 +391,9 @@ gst_goom_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
gst_event_unref (event); gst_event_unref (event);
break; break;
} }
case GST_EVENT_FLUSH_START:
res = gst_pad_push_event (goom->srcpad, event);
break;
case GST_EVENT_FLUSH_STOP: case GST_EVENT_FLUSH_STOP:
gst_goom_reset (goom); gst_goom_reset (goom);
res = gst_pad_push_event (goom->srcpad, event); res = gst_pad_event_default (pad, parent, event);
break; break;
case GST_EVENT_SEGMENT: case GST_EVENT_SEGMENT:
{ {
@ -403,11 +402,11 @@ gst_goom_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
* we can do QoS */ * we can do QoS */
gst_event_copy_segment (event, &goom->segment); gst_event_copy_segment (event, &goom->segment);
res = gst_pad_push_event (goom->srcpad, event); res = gst_pad_event_default (pad, parent, event);
break; break;
} }
default: default:
res = gst_pad_push_event (goom->srcpad, event); res = gst_pad_event_default (pad, parent, event);
break; break;
} }
@ -476,12 +475,7 @@ gst_goom_src_query (GstPad * pad, GstObject * parent, GstQuery * query)
static GstFlowReturn static GstFlowReturn
ensure_negotiated (GstGoom * goom) ensure_negotiated (GstGoom * goom)
{ {
gboolean reconfigure; if (gst_pad_check_reconfigure (goom->srcpad)) {
reconfigure = gst_pad_check_reconfigure (goom->srcpad);
/* we don't know an output format yet, pick one */
if (reconfigure || !gst_pad_has_current_caps (goom->srcpad)) {
if (!gst_goom_src_negotiate (goom)) if (!gst_goom_src_negotiate (goom))
return GST_FLOW_NOT_NEGOTIATED; return GST_FLOW_NOT_NEGOTIATED;
} }