mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

GST_FLOW_UNEXPECTED -> GST_FLOW_EOS

Browse source
This commit is contained in:
Wim Taymans 2012-01-03 15:25:31 +01:00
parent e0c610f635
commit bc1974e962
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gst/gstcompat.h
View file

@ -51,8 +51,6 @@ G_BEGIN_DECLS
#define gst_buffer_new_and_alloc(s) gst_buffer_new_allocate(NULL, s, 0) #define gst_buffer_new_and_alloc(s) gst_buffer_new_allocate(NULL, s, 0)
#define GST_FLOW_UNEXPECTED GST_FLOW_EOS
#define GST_BUFFER_TIMESTAMP GST_BUFFER_PTS #define GST_BUFFER_TIMESTAMP GST_BUFFER_PTS
#define GST_BUFFER_TIMESTAMP_IS_VALID GST_BUFFER_PTS_IS_VALID #define GST_BUFFER_TIMESTAMP_IS_VALID GST_BUFFER_PTS_IS_VALID

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

@ -1540,7 +1540,7 @@ gst_collect_pads2_default_collected (GstCollectPads2 * pads, gpointer user_data)
if (G_UNLIKELY (best == NULL)) { if (G_UNLIKELY (best == NULL)) {
ret = func (pads, best, NULL, buffer_user_data); ret = func (pads, best, NULL, buffer_user_data);
if (ret == GST_FLOW_OK) if (ret == GST_FLOW_OK)
ret = GST_FLOW_UNEXPECTED; ret = GST_FLOW_EOS;
goto done; goto done;
} }
@ -1829,7 +1829,7 @@ gst_collect_pads2_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer)
/* pad was EOS, we can refuse this data */ /* pad was EOS, we can refuse this data */
if (G_UNLIKELY (GST_COLLECT_PADS2_STATE_IS_SET (data, if (G_UNLIKELY (GST_COLLECT_PADS2_STATE_IS_SET (data,
GST_COLLECT_PADS2_STATE_EOS))) GST_COLLECT_PADS2_STATE_EOS)))
goto unexpected; goto eos;
/* see if we need to clip */ /* see if we need to clip */
if (pads->clip_func) { if (pads->clip_func) {
@ -1840,8 +1840,8 @@ gst_collect_pads2_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer)
if (G_UNLIKELY (outbuf == NULL)) if (G_UNLIKELY (outbuf == NULL))
goto clipped; goto clipped;
if (G_UNLIKELY (ret == GST_FLOW_UNEXPECTED)) if (G_UNLIKELY (ret == GST_FLOW_EOS))
goto unexpected; goto eos;
else if (G_UNLIKELY (ret != GST_FLOW_OK)) else if (G_UNLIKELY (ret != GST_FLOW_OK))
goto error; goto error;
} }
@ -1953,12 +1953,12 @@ flushing:
ret = GST_FLOW_WRONG_STATE; ret = GST_FLOW_WRONG_STATE;
goto unlock_done; goto unlock_done;
} }
unexpected: eos:
{ {
/* we should not post an error for this, just inform upstream that /* we should not post an error for this, just inform upstream that
* we don't expect anything anymore */ * we don't expect anything anymore */
GST_DEBUG ("pad %s:%s is eos", GST_DEBUG_PAD_NAME (pad)); GST_DEBUG ("pad %s:%s is eos", GST_DEBUG_PAD_NAME (pad));
ret = GST_FLOW_UNEXPECTED; ret = GST_FLOW_EOS;
goto unlock_done; goto unlock_done;
} }
clipped: clipped: