diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-01-03 15:25:31 +0100 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-01-03 15:25:31 +0100 |
| commit | bc1974e962251320496fd7448be64457b782dae4 (patch) | |
| tree | 5f8a011feed8040db9f94187e6551e2e5647e0aa | |
| parent | e0c610f635ccba7c9bd076be2d7eb7c63e321331 (diff) | |
GST_FLOW_UNEXPECTED -> GST_FLOW_EOS
| -rw-r--r-- | gst/gstcompat.h | 2 | ||||
| -rw-r--r-- | libs/gst/base/gstcollectpads2.c | 12 |
2 files changed, 6 insertions, 8 deletions
diff --git a/gst/gstcompat.h b/gst/gstcompat.h index 5b607bf126..8fe8c52626 100644 --- a/gst/gstcompat.h +++ b/gst/gstcompat.h @@ -51,8 +51,6 @@ G_BEGIN_DECLS #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_IS_VALID GST_BUFFER_PTS_IS_VALID diff --git a/libs/gst/base/gstcollectpads2.c b/libs/gst/base/gstcollectpads2.c index 970ae54c21..cf1f500972 100644 --- a/libs/gst/base/gstcollectpads2.c +++ b/libs/gst/base/gstcollectpads2.c @@ -1540,7 +1540,7 @@ gst_collect_pads2_default_collected (GstCollectPads2 * pads, gpointer user_data) if (G_UNLIKELY (best == NULL)) { ret = func (pads, best, NULL, buffer_user_data); if (ret == GST_FLOW_OK) - ret = GST_FLOW_UNEXPECTED; + ret = GST_FLOW_EOS; goto done; } @@ -1829,7 +1829,7 @@ gst_collect_pads2_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer) /* pad was EOS, we can refuse this data */ if (G_UNLIKELY (GST_COLLECT_PADS2_STATE_IS_SET (data, GST_COLLECT_PADS2_STATE_EOS))) - goto unexpected; + goto eos; /* see if we need to clip */ if (pads->clip_func) { @@ -1840,8 +1840,8 @@ gst_collect_pads2_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer) if (G_UNLIKELY (outbuf == NULL)) goto clipped; - if (G_UNLIKELY (ret == GST_FLOW_UNEXPECTED)) - goto unexpected; + if (G_UNLIKELY (ret == GST_FLOW_EOS)) + goto eos; else if (G_UNLIKELY (ret != GST_FLOW_OK)) goto error; } @@ -1953,12 +1953,12 @@ flushing: ret = GST_FLOW_WRONG_STATE; goto unlock_done; } -unexpected: +eos: { /* we should not post an error for this, just inform upstream that * we don't expect anything anymore */ GST_DEBUG ("pad %s:%s is eos", GST_DEBUG_PAD_NAME (pad)); - ret = GST_FLOW_UNEXPECTED; + ret = GST_FLOW_EOS; goto unlock_done; } clipped: |