mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-19 22:05:58 +00:00
Code Issues 1 Projects Releases Wiki Activity

pad-monitor: More fixes of previous commit

Browse source 
You'd think in 2016 compilers could complain when assigning/comparing
different types of enums ... *sigh*.
This commit is contained in:
Edward Hervey 2016-01-21 15:05:52 +01:00 committed by Edward Hervey
parent 4e2c7af46c
commit 35eeed9aee
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
validate/gst/validate/gst-validate-pad-monitor.c
View file

@ -1812,7 +1812,8 @@ gst_validate_pad_monitor_downstream_event_check (GstValidatePadMonitor *
GstCaps *caps; GstCaps *caps;
gst_event_parse_caps (event, &caps); gst_event_parse_caps (event, &caps);
gst_validate_pad_monitor_setcaps_post (pad_monitor, caps, ret); gst_validate_pad_monitor_setcaps_post (pad_monitor, caps,
ret == GST_FLOW_OK);
break; break;
} }
case GST_EVENT_FLUSH_START: case GST_EVENT_FLUSH_START:
@ -2082,13 +2083,13 @@ gst_validate_pad_monitor_event_is_tracked (GstValidatePadMonitor * monitor,
return TRUE; return TRUE;
} }
static gboolean static GstFlowReturn
gst_validate_pad_monitor_sink_event_full_func (GstPad * pad, GstObject * parent, gst_validate_pad_monitor_sink_event_full_func (GstPad * pad, GstObject * parent,
GstEvent * event) GstEvent * event)
{ {
GstValidatePadMonitor *pad_monitor = GstValidatePadMonitor *pad_monitor =
g_object_get_data ((GObject *) pad, "validate-monitor"); g_object_get_data ((GObject *) pad, "validate-monitor");
gboolean ret; GstFlowReturn ret;
GST_VALIDATE_PAD_MONITOR_PARENT_LOCK (pad_monitor); GST_VALIDATE_PAD_MONITOR_PARENT_LOCK (pad_monitor);
GST_VALIDATE_MONITOR_LOCK (pad_monitor); GST_VALIDATE_MONITOR_LOCK (pad_monitor);
@ -2270,12 +2271,11 @@ gst_validate_pad_monitor_buffer_probe (GstPad * pad, GstBuffer * buffer,
return TRUE; return TRUE;
} }
static gboolean static void
gst_validate_pad_monitor_event_probe (GstPad * pad, GstEvent * event, gst_validate_pad_monitor_event_probe (GstPad * pad, GstEvent * event,
gpointer udata) gpointer udata)
{ {
GstValidatePadMonitor *monitor = GST_VALIDATE_PAD_MONITOR_CAST (udata); GstValidatePadMonitor *monitor = GST_VALIDATE_PAD_MONITOR_CAST (udata);
gboolean ret;
GST_VALIDATE_PAD_MONITOR_PARENT_LOCK (monitor); GST_VALIDATE_PAD_MONITOR_PARENT_LOCK (monitor);
GST_VALIDATE_MONITOR_LOCK (monitor); GST_VALIDATE_MONITOR_LOCK (monitor);
@ -2364,13 +2364,9 @@ gst_validate_pad_monitor_event_probe (GstPad * pad, GstEvent * event,
/* This so far is just like an event that is flowing downstream, /* This so far is just like an event that is flowing downstream,
* so we do the same checks as a sinkpad event handler */ * so we do the same checks as a sinkpad event handler */
ret = gst_validate_pad_monitor_downstream_event_check (monitor, NULL, event, NULL);
gst_validate_pad_monitor_downstream_event_check (monitor, NULL, event,
NULL);
GST_VALIDATE_MONITOR_UNLOCK (monitor); GST_VALIDATE_MONITOR_UNLOCK (monitor);
GST_VALIDATE_PAD_MONITOR_PARENT_UNLOCK (monitor); GST_VALIDATE_PAD_MONITOR_PARENT_UNLOCK (monitor);
return ret;
} }
static GstPadProbeReturn static GstPadProbeReturn