mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 04:01:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

libs: Fix some merge mistakes

Browse source
This commit is contained in:
Sebastian Dröge 2012-03-01 14:51:26 +01:00
parent 99a8cd1048
commit a8dcb63616
2 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libs/gst/base/gstcollectpads2.c
View file

@ -1662,8 +1662,8 @@ gst_collect_pads2_event (GstPad * pad, GstObject * parent, GstEvent * event)
pads = data->collect; pads = data->collect;
GST_DEBUG_OBJECT (data->pad, "Got %s event on sink pad from %s", GST_DEBUG_OBJECT (data->pad, "Got %s event on sink pad",
GST_EVENT_TYPE_NAME (event), GST_OBJECT_NAME (GST_EVENT_SRC (event))); GST_EVENT_TYPE_NAME (event));
GST_OBJECT_LOCK (pads); GST_OBJECT_LOCK (pads);
event_func = pads->priv->event_func; event_func = pads->priv->event_func;

14
libs/gst/check/gstconsistencychecker.c
View file

@ -37,7 +37,7 @@ struct _GstStreamConsistency
{ {
/* FIXME: do we want to track some states per pad? */ /* FIXME: do we want to track some states per pad? */
volatile gboolean flushing; volatile gboolean flushing;
volatile gboolean newsegment; volatile gboolean segment;
volatile gboolean eos; volatile gboolean eos;
volatile gboolean expect_flush; volatile gboolean expect_flush;
GstObject *parent; GstObject *parent;
@ -57,7 +57,7 @@ source_pad_data_cb (GstPad * pad, GstPadProbeInfo * info,
GstMiniObject *data = GST_PAD_PROBE_INFO_DATA (info); GstMiniObject *data = GST_PAD_PROBE_INFO_DATA (info);
GST_DEBUG_OBJECT (pad, "%p: %d %d %d %d", consist, consist->flushing, GST_DEBUG_OBJECT (pad, "%p: %d %d %d %d", consist, consist->flushing,
consist->newsegment, consist->eos, consist->expect_flush); consist->segment, consist->eos, consist->expect_flush);
if (GST_IS_BUFFER (data)) { if (GST_IS_BUFFER (data)) {
GST_DEBUG_OBJECT (pad, GST_DEBUG_OBJECT (pad,
@ -122,15 +122,15 @@ sink_pad_data_cb (GstPad * pad, GstPadProbeInfo * info,
GstMiniObject *data = GST_PAD_PROBE_INFO_DATA (info); GstMiniObject *data = GST_PAD_PROBE_INFO_DATA (info);
GST_DEBUG_OBJECT (pad, "%p: %d %d %d %d", consist, consist->flushing, GST_DEBUG_OBJECT (pad, "%p: %d %d %d %d", consist, consist->flushing,
consist->newsegment, consist->eos, consist->expect_flush); consist->segment, consist->eos, consist->expect_flush);
if (GST_IS_BUFFER (data)) { if (GST_IS_BUFFER (data)) {
GST_DEBUG_OBJECT (pad, "Buffer %" GST_TIME_FORMAT, GST_DEBUG_OBJECT (pad, "Buffer %" GST_TIME_FORMAT,
GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (GST_BUFFER (data)))); GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (GST_BUFFER (data))));
/* If an EOS went through, a buffer would be invalid */ /* If an EOS went through, a buffer would be invalid */
fail_if (consist->eos, "Buffer received after EOS"); fail_if (consist->eos, "Buffer received after EOS");
/* Buffers need to be preceded by a newsegment event */ /* Buffers need to be preceded by a segment event */
fail_unless (consist->newsegment, "Buffer received without newsegment"); fail_unless (consist->segment, "Buffer received without segment");
} else if (GST_IS_EVENT (data)) { } else if (GST_IS_EVENT (data)) {
GstEvent *event = (GstEvent *) data; GstEvent *event = (GstEvent *) data;
@ -266,10 +266,6 @@ gst_consistency_checker_free (GstStreamConsistency * consist)
GList *node; GList *node;
GstStreamConsistencyProbe *p; GstStreamConsistencyProbe *p;
/* Remove the data probe */
gst_pad_remove_probe (consist->pad, consist->probeid);
g_object_unref (consist->pad);
/* Remove the data probes */ /* Remove the data probes */
for (node = consist->pads; node; node = g_list_next (node)) { for (node = consist->pads; node; node = g_list_next (node)) {
p = (GstStreamConsistencyProbe *) node->data; p = (GstStreamConsistencyProbe *) node->data;