[0.11] gst-plugins-bad: GST_FLOW_UNEXPECTED -> GST_FLOW_EOS

Wim Taymans wtay at kemper.freedesktop.org
Tue Jan 3 06:29:30 PST 2012


Module: gst-plugins-bad
Branch: 0.11
Commit: b592f431e3c972966e5dac970840bb711d26722d
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=b592f431e3c972966e5dac970840bb711d26722d

Author: Wim Taymans <wim.taymans at collabora.co.uk>
Date:   Tue Jan  3 15:26:54 2012 +0100

GST_FLOW_UNEXPECTED -> GST_FLOW_EOS

---

 ext/faad/gstfaad.c                       |    2 +-
 ext/libmms/gstmms.c                      |    2 +-
 gst-libs/gst/video/gstbasevideoencoder.c |    2 +-
 gst/dataurisrc/gstdataurisrc.c           |    2 +-
 gst/mpegtsdemux/mpegtsbase.c             |    4 ++--
 gst/mpegtsdemux/tsdemux.c                |    4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ext/faad/gstfaad.c b/ext/faad/gstfaad.c
index b6b7f5c..191c549 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 2acf194..781f83f 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 f4b1ee2..8126c12 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 0887dc2..92c1607 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 c903fae..e7d856f 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 264bbad..4e66122 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;
   }



More information about the gstreamer-commits mailing list