mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-03 14:08:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

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

Browse source 
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.
This commit is contained in:
Tim-Philipp Müller 2007-06-08 10:43:26 +00:00
parent 51e52ed2cf
commit 08d5dedbaa
3 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

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

6
ext/dv/gstdvdemux.c
View file

@ -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; dvdemux->running = FALSE;
gst_pad_pause_task (dvdemux->sinkpad); 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) { if (ret == GST_FLOW_UNEXPECTED) {
GST_LOG_OBJECT (dvdemux, "got eos"); GST_LOG_OBJECT (dvdemux, "got eos");
/* perform EOS logic */ /* perform EOS logic */
@ -1697,7 +1697,7 @@ pause:
gst_dvdemux_push_event (dvdemux, gst_event_new_eos ()); gst_dvdemux_push_event (dvdemux, gst_event_new_eos ());
} }
} else { } 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, GST_ELEMENT_ERROR (dvdemux, STREAM, FAILED,
(NULL), ("streaming stopped, reason %s", gst_flow_get_name (ret))); (NULL), ("streaming stopped, reason %s", gst_flow_get_name (ret)));
gst_dvdemux_push_event (dvdemux, gst_event_new_eos ()); gst_dvdemux_push_event (dvdemux, gst_event_new_eos ());

9
ext/libpng/gstpngdec.c
View file

@ -323,9 +323,9 @@ user_read_data (png_structp png_ptr, png_bytep data, png_size_t length)
return; return;
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_pad_push_event (pngdec->srcpad, gst_event_new_eos ()); gst_pad_push_event (pngdec->srcpad, gst_event_new_eos ());
GST_ELEMENT_ERROR (pngdec, STREAM, FAILED, GST_ELEMENT_ERROR (pngdec, STREAM, FAILED,
(_("Internal data stream error.")), (_("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, GST_ELEMENT_ERROR (pngdec, STREAM, FAILED,
(_("Internal data stream error.")), (_("Internal data stream error.")),
("stream stopped, reason %s", gst_flow_get_name (ret))); ("stream stopped, reason %s", gst_flow_get_name (ret)));