summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@collabora.co.uk>2012-01-03 15:26:54 +0100
committerWim Taymans <wim.taymans@collabora.co.uk>2012-01-03 15:26:54 +0100
commitb592f431e3c972966e5dac970840bb711d26722d (patch)
treef542244af1978134f5bfb690a69578eafd80d4e5
parentf017f9a913060ce5154cfc651edbbc53cead09c3 (diff)
GST_FLOW_UNEXPECTED -> GST_FLOW_EOS
-rw-r--r--ext/faad/gstfaad.c2
-rw-r--r--ext/libmms/gstmms.c2
-rw-r--r--gst-libs/gst/video/gstbasevideoencoder.c2
-rw-r--r--gst/dataurisrc/gstdataurisrc.c2
-rw-r--r--gst/mpegtsdemux/mpegtsbase.c4
-rw-r--r--gst/mpegtsdemux/tsdemux.c4
6 files changed, 8 insertions, 8 deletions
diff --git a/ext/faad/gstfaad.c b/ext/faad/gstfaad.c
index b6b7f5c98..191c5496e 100644
--- a/ext/faad/gstfaad.c
+++ b/ext/faad/gstfaad.c
@@ -649,7 +649,7 @@ gst_faad_parse (GstAudioDecoder * dec, GstAdapter * adapter,
ret = gst_faad_sync (faad, data, size, !eos, offset, length);
gst_adapter_unmap (adapter);
- return (ret ? GST_FLOW_OK : GST_FLOW_UNEXPECTED);
+ return (ret ? GST_FLOW_OK : GST_FLOW_EOS);
}
}
diff --git a/ext/libmms/gstmms.c b/ext/libmms/gstmms.c
index 2acf19459..781f83f0f 100644
--- a/ext/libmms/gstmms.c
+++ b/ext/libmms/gstmms.c
@@ -349,7 +349,7 @@ eos:
GST_DEBUG_OBJECT (mmssrc, "EOS");
g_free (data);
*buf = NULL;
- return GST_FLOW_UNEXPECTED;
+ return GST_FLOW_EOS;
}
}
diff --git a/gst-libs/gst/video/gstbasevideoencoder.c b/gst-libs/gst/video/gstbasevideoencoder.c
index f4b1ee2d1..8126c120f 100644
--- a/gst-libs/gst/video/gstbasevideoencoder.c
+++ b/gst-libs/gst/video/gstbasevideoencoder.c
@@ -777,7 +777,7 @@ gst_base_video_encoder_chain (GstPad * pad, GstObject * parent, GstBuffer * buf)
GST_TIME_ARGS (GST_BUFFER_DURATION (buf)));
if (base_video_encoder->at_eos) {
- ret = GST_FLOW_UNEXPECTED;
+ ret = GST_FLOW_EOS;
goto done;
}
diff --git a/gst/dataurisrc/gstdataurisrc.c b/gst/dataurisrc/gstdataurisrc.c
index 0887dc247..92c160730 100644
--- a/gst/dataurisrc/gstdataurisrc.c
+++ b/gst/dataurisrc/gstdataurisrc.c
@@ -226,7 +226,7 @@ gst_data_uri_src_create (GstBaseSrc * basesrc, guint64 offset, guint size,
/* This is only correct because GstBaseSrc already clips size for us to be no
* larger than the max. available size if a segment at the end is requested */
if (offset + size > gst_buffer_get_size (src->buffer)) {
- ret = GST_FLOW_UNEXPECTED;
+ ret = GST_FLOW_EOS;
} else {
ret = GST_FLOW_OK;
*buf =
diff --git a/gst/mpegtsdemux/mpegtsbase.c b/gst/mpegtsdemux/mpegtsbase.c
index c903fae30..e7d856fd4 100644
--- a/gst/mpegtsdemux/mpegtsbase.c
+++ b/gst/mpegtsdemux/mpegtsbase.c
@@ -1441,9 +1441,9 @@ error:
const gchar *reason = gst_flow_get_name (ret);
GST_DEBUG_OBJECT (base, "Pausing task, reason %s", reason);
- if (ret == GST_FLOW_UNEXPECTED)
+ if (ret == GST_FLOW_EOS)
GST_MPEGTS_BASE_GET_CLASS (base)->push_event (base, gst_event_new_eos ());
- else if (ret == GST_FLOW_NOT_LINKED || ret < GST_FLOW_UNEXPECTED) {
+ else if (ret == GST_FLOW_NOT_LINKED || ret < GST_FLOW_EOS) {
GST_ELEMENT_ERROR (base, STREAM, FAILED,
(_("Internal data stream error.")),
("stream stopped, reason %s", reason));
diff --git a/gst/mpegtsdemux/tsdemux.c b/gst/mpegtsdemux/tsdemux.c
index 264bbad44..4e66122c8 100644
--- a/gst/mpegtsdemux/tsdemux.c
+++ b/gst/mpegtsdemux/tsdemux.c
@@ -704,7 +704,7 @@ gst_ts_demux_perform_seek (MpegTSBase * base, GstSegment * segment, guint16 pid)
res =
find_pcr_packet (&demux->parent, seekpos, 4000 * MPEGTS_MAX_PACKETSIZE,
&seekpcroffset);
- if (G_UNLIKELY (res == GST_FLOW_UNEXPECTED)) {
+ if (G_UNLIKELY (res == GST_FLOW_EOS)) {
seekpos =
MAX ((gint64) pcr_start.offset,
seekpos - 2000 * MPEGTS_MAX_PACKETSIZE) + 188;
@@ -1596,7 +1596,7 @@ find_timestamps (MpegTSBase * base, guint64 initoff, guint64 * offset)
/* Search for the first PCRs */
ret = process_pcr (base, base->first_pat_offset, &initial, 10, TRUE);
- if (ret != GST_FLOW_OK && ret != GST_FLOW_UNEXPECTED) {
+ if (ret != GST_FLOW_OK && ret != GST_FLOW_EOS) {
GST_WARNING ("Problem getting initial PCRs");
goto beach;
}