ext/: When operating in pull mode, error out correct on not-linked.

Original commit message from CVS:
* ext/dv/gstdvdemux.c: (gst_dvdemux_loop):
* ext/libpng/gstpngdec.c: (user_read_data), (gst_pngdec_task):
When operating in pull mode, error out correct on not-linked.

diff --git a/ChangeLog b/ChangeLog
index 0847615..ecbabd2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-06-08  Tim-Philipp Müller  <tim at centricular dot net>
+
+       * ext/dv/gstdvdemux.c: (gst_dvdemux_loop):
+       * ext/libpng/gstpngdec.c: (user_read_data), (gst_pngdec_task):
+         When operating in pull mode, error out correct on not-linked.
+

 2007-06-06  Andy Wingo  <wingo@pobox.com>
 
        * sys/v4l2/v4l2src_calls.c (gst_v4l2src_probe_caps_for_format)
 2007-06-06  Andy Wingo  <wingo@pobox.com>
 
        * sys/v4l2/v4l2src_calls.c (gst_v4l2src_probe_caps_for_format)

diff --git a/ext/dv/gstdvdemux.c b/ext/dv/gstdvdemux.c
index fb47bb3..749b755 100644 (file)
--- a/ext/dv/gstdvdemux.c
+++ b/ext/dv/gstdvdemux.c
@@ -1681,10 +1681,10 @@ small_buffer:
   }
 pause:
   {
   }
 pause:
   {

-    GST_LOG_OBJECT (dvdemux, "pausing task %d", ret);
+    GST_INFO_OBJECT (dvdemux, "pausing task, %s", gst_flow_get_name (ret));

     dvdemux->running = FALSE;
     gst_pad_pause_task (dvdemux->sinkpad);
     dvdemux->running = FALSE;
     gst_pad_pause_task (dvdemux->sinkpad);

-    if (GST_FLOW_IS_FATAL (ret)) {
+    if (GST_FLOW_IS_FATAL (ret) || ret == GST_FLOW_NOT_LINKED) {

       if (ret == GST_FLOW_UNEXPECTED) {
         GST_LOG_OBJECT (dvdemux, "got eos");
         /* perform EOS logic */
       if (ret == GST_FLOW_UNEXPECTED) {
         GST_LOG_OBJECT (dvdemux, "got eos");
         /* perform EOS logic */


@@ -1697,7 +1697,7 @@ pause:
           gst_dvdemux_push_event (dvdemux, gst_event_new_eos ());
         }
       } else {
           gst_dvdemux_push_event (dvdemux, gst_event_new_eos ());
         }
       } else {

-        /* for fatal errors we post an error message */
+        /* for fatal errors or not-linked we post an error message */

         GST_ELEMENT_ERROR (dvdemux, STREAM, FAILED,
             (NULL), ("streaming stopped, reason %s", gst_flow_get_name (ret)));
         gst_dvdemux_push_event (dvdemux, gst_event_new_eos ());
         GST_ELEMENT_ERROR (dvdemux, STREAM, FAILED,
             (NULL), ("streaming stopped, reason %s", gst_flow_get_name (ret)));
         gst_dvdemux_push_event (dvdemux, gst_event_new_eos ());

diff --git a/ext/libpng/gstpngdec.c b/ext/libpng/gstpngdec.c
index f6150e8..bed0a63 100644 (file)
--- a/ext/libpng/gstpngdec.c
+++ b/ext/libpng/gstpngdec.c
@@ -323,9 +323,9 @@ user_read_data (png_structp png_ptr, png_bytep data, png_size_t length)
   return;
 
 pause:
   return;
 
 pause:

-  GST_LOG_OBJECT (pngdec, "pausing task, reason %s", gst_flow_get_name (ret));
+  GST_INFO_OBJECT (pngdec, "pausing task, reason %s", gst_flow_get_name (ret));

   gst_pad_pause_task (pngdec->sinkpad);
   gst_pad_pause_task (pngdec->sinkpad);

-  if (GST_FLOW_IS_FATAL (ret)) {
+  if (GST_FLOW_IS_FATAL (ret) || ret == GST_FLOW_NOT_LINKED) {

     gst_pad_push_event (pngdec->srcpad, gst_event_new_eos ());
     GST_ELEMENT_ERROR (pngdec, STREAM, FAILED,
         (_("Internal data stream error.")),
     gst_pad_push_event (pngdec->srcpad, gst_event_new_eos ());
     GST_ELEMENT_ERROR (pngdec, STREAM, FAILED,
         (_("Internal data stream error.")),


@@ -506,9 +506,10 @@ gst_pngdec_task (GstPad * pad)
 
 pause:
   {
 
 pause:
   {

-    GST_LOG_OBJECT (pngdec, "pausing task, reason %s", gst_flow_get_name (ret));
+    GST_INFO_OBJECT (pngdec, "pausing task, reason %s",
+        gst_flow_get_name (ret));

     gst_pad_pause_task (pngdec->sinkpad);
     gst_pad_pause_task (pngdec->sinkpad);

-    if (GST_FLOW_IS_FATAL (ret)) {
+    if (GST_FLOW_IS_FATAL (ret) || ret == GST_FLOW_NOT_LINKED) {

       GST_ELEMENT_ERROR (pngdec, STREAM, FAILED,
           (_("Internal data stream error.")),
           ("stream stopped, reason %s", gst_flow_get_name (ret)));
       GST_ELEMENT_ERROR (pngdec, STREAM, FAILED,
           (_("Internal data stream error.")),
           ("stream stopped, reason %s", gst_flow_get_name (ret)));