Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
gst-plugins-good
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Marc-André Lureau
gst-plugins-good
Commits
150edef8
Commit
150edef8
authored
Aug 19, 2016
by
Thibault Saunier
Committed by
Thibault Saunier
Aug 26, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use the new API to post flow ERROR messages on the bus
https://bugzilla.gnome.org/show_bug.cgi?id=770158
parent
d40f007d
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
12 additions
and
32 deletions
+12
-32
ext/dv/gstdvdemux.c
ext/dv/gstdvdemux.c
+1
-2
ext/gdk_pixbuf/gstgdkpixbufdec.c
ext/gdk_pixbuf/gstgdkpixbufdec.c
+1
-2
gst/avi/gstavidemux.c
gst/avi/gstavidemux.c
+1
-3
gst/debugutils/rndbuffersize.c
gst/debugutils/rndbuffersize.c
+1
-3
gst/flv/gstflvdemux.c
gst/flv/gstflvdemux.c
+1
-3
gst/imagefreeze/gstimagefreeze.c
gst/imagefreeze/gstimagefreeze.c
+1
-3
gst/isomp4/qtdemux.c
gst/isomp4/qtdemux.c
+1
-2
gst/matroska/matroska-demux.c
gst/matroska/matroska-demux.c
+1
-2
gst/matroska/matroska-parse.c
gst/matroska/matroska-parse.c
+1
-2
gst/multifile/gstsplitmuxsrc.c
gst/multifile/gstsplitmuxsrc.c
+1
-4
gst/rtsp/gstrtspsrc.c
gst/rtsp/gstrtspsrc.c
+1
-3
gst/wavparse/gstwavparse.c
gst/wavparse/gstwavparse.c
+1
-3
No files found.
ext/dv/gstdvdemux.c
View file @
150edef8
...
...
@@ -1892,8 +1892,7 @@ pause:
}
else
if
(
ret
==
GST_FLOW_NOT_LINKED
||
ret
<
GST_FLOW_EOS
)
{
GstEvent
*
event
=
gst_event_new_eos
();
/* 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_ELEMENT_FLOW_ERROR
(
dvdemux
,
ret
);
if
(
dvdemux
->
segment_seqnum
)
gst_event_set_seqnum
(
event
,
dvdemux
->
segment_seqnum
);
gst_dvdemux_push_event
(
dvdemux
,
event
);
...
...
ext/gdk_pixbuf/gstgdkpixbufdec.c
View file @
150edef8
...
...
@@ -417,8 +417,7 @@ gst_gdk_pixbuf_dec_sink_event (GstPad * pad, GstObject * parent,
* things failed */
if
(
res
!=
GST_FLOW_OK
&&
res
!=
GST_FLOW_FLUSHING
&&
res
!=
GST_FLOW_EOS
&&
res
!=
GST_FLOW_NOT_LINKED
)
{
GST_ELEMENT_ERROR
(
pixbuf
,
STREAM
,
FAILED
,
(
NULL
),
(
"Flow: %s"
,
gst_flow_get_name
(
res
)));
GST_ELEMENT_FLOW_ERROR
(
pixbuf
,
res
);
forward
=
FALSE
;
ret
=
FALSE
;
}
...
...
gst/avi/gstavidemux.c
View file @
150edef8
...
...
@@ -5695,9 +5695,7 @@ pause:{
/* for fatal errors we post an error message, wrong-state is
* not fatal because it happens due to flushes and only means
* that we should stop now. */
GST_ELEMENT_ERROR
(
avi
,
STREAM
,
FAILED
,
(
_
(
"Internal data stream error."
)),
(
"streaming stopped, reason %s"
,
gst_flow_get_name
(
res
)));
GST_ELEMENT_FLOW_ERROR
(
avi
,
res
);
push_eos
=
TRUE
;
}
if
(
push_eos
)
{
...
...
gst/debugutils/rndbuffersize.c
View file @
150edef8
...
...
@@ -515,9 +515,7 @@ push_failed:
GST_DEBUG_OBJECT
(
self
,
"eos"
);
gst_pad_push_event
(
self
->
srcpad
,
gst_event_new_eos
());
}
else
if
(
ret
<
GST_FLOW_EOS
||
ret
==
GST_FLOW_NOT_LINKED
)
{
GST_ELEMENT_ERROR
(
self
,
STREAM
,
FAILED
,
(
"Internal data stream error."
),
(
"streaming stopped, reason: %s"
,
gst_flow_get_name
(
ret
)));
GST_ELEMENT_FLOW_ERROR
(
self
,
ret
);
}
goto
pause_task
;
}
...
...
gst/flv/gstflvdemux.c
View file @
150edef8
...
...
@@ -2729,9 +2729,7 @@ pause:
GST_WARNING_OBJECT
(
demux
,
"failed pushing EOS on streams"
);
}
}
else
if
(
ret
==
GST_FLOW_NOT_LINKED
||
ret
<
GST_FLOW_EOS
)
{
GST_ELEMENT_ERROR
(
demux
,
STREAM
,
FAILED
,
(
"Internal data stream error."
),
(
"stream stopped, reason %s"
,
reason
));
GST_ELEMENT_FLOW_ERROR
(
demux
,
ret
);
gst_flv_demux_push_src_event
(
demux
,
gst_event_new_eos
());
}
gst_object_unref
(
demux
);
...
...
gst/imagefreeze/gstimagefreeze.c
View file @
150edef8
...
...
@@ -846,9 +846,7 @@ pause_task:
}
else
if
(
flow_ret
==
GST_FLOW_NOT_LINKED
||
flow_ret
<
GST_FLOW_EOS
)
{
GstEvent
*
e
=
gst_event_new_eos
();
GST_ELEMENT_ERROR
(
self
,
STREAM
,
FAILED
,
(
"Internal data stream error."
),
(
"stream stopped, reason %s"
,
reason
));
GST_ELEMENT_FLOW_ERROR
(
self
,
flow_ret
);
if
(
self
->
seqnum
)
gst_event_set_seqnum
(
e
,
self
->
seqnum
);
...
...
gst/isomp4/qtdemux.c
View file @
150edef8
...
...
@@ -5766,8 +5766,7 @@ pause:
gst_qtdemux_push_event
(
qtdemux
,
event
);
}
}
else
if
(
ret
==
GST_FLOW_NOT_LINKED
||
ret
<
GST_FLOW_EOS
)
{
GST_ELEMENT_ERROR
(
qtdemux
,
STREAM
,
FAILED
,
(
NULL
),
(
"streaming stopped, reason %s"
,
reason
));
GST_ELEMENT_FLOW_ERROR
(
qtdemux
,
ret
);
gst_qtdemux_push_event
(
qtdemux
,
gst_event_new_eos
());
}
goto
done
;
...
...
gst/matroska/matroska-demux.c
View file @
150edef8
...
...
@@ -4756,8 +4756,7 @@ pause:
}
}
else
if
(
ret
==
GST_FLOW_NOT_LINKED
||
ret
<
GST_FLOW_EOS
)
{
/* for fatal errors we post an error message */
GST_ELEMENT_ERROR
(
demux
,
STREAM
,
FAILED
,
(
NULL
),
(
"stream stopped, reason %s"
,
reason
));
GST_ELEMENT_FLOW_ERROR
(
demux
,
ret
);
push_eos
=
TRUE
;
}
if
(
push_eos
)
{
...
...
gst/matroska/matroska-parse.c
View file @
150edef8
...
...
@@ -2920,8 +2920,7 @@ pause:
}
} else if (ret == GST_FLOW_NOT_LINKED || ret < GST_FLOW_EOS) {
/* for fatal errors we post an error message */
GST_ELEMENT_ERROR (parse, STREAM, FAILED, (NULL),
("stream stopped, reason %s", reason));
GST_ELEMENT_FLOW_ERROR (parse, ret);
push_eos = TRUE;
}
if (push_eos) {
...
...
gst/multifile/gstsplitmuxsrc.c
View file @
150edef8
...
...
@@ -549,10 +549,7 @@ gst_splitmux_pad_loop (GstPad * pad)
GST_INFO_OBJECT
(
splitpad
,
"Stopping due to pad_push() result %d"
,
ret
);
gst_pad_pause_task
(
pad
);
if
(
ret
<
GST_FLOW_EOS
)
{
const
gchar
*
reason
=
gst_flow_get_name
(
ret
);
GST_ELEMENT_ERROR
(
splitmux
,
STREAM
,
FAILED
,
(
_
(
"Internal data flow error."
)),
(
"streaming task paused, reason %s (%d)"
,
reason
,
ret
));
GST_ELEMENT_FLOW_ERROR
(
splitmux
,
ret
);
}
}
}
...
...
gst/rtsp/gstrtspsrc.c
View file @
150edef8
...
...
@@ -5119,9 +5119,7 @@ pause:
}
else
if
(
ret
==
GST_FLOW_NOT_LINKED
||
ret
<
GST_FLOW_EOS
)
{
/* for fatal errors we post an error message, post the error before the
* EOS so the app knows about the error first. */
GST_ELEMENT_ERROR
(
src
,
STREAM
,
FAILED
,
(
"Internal data flow error."
),
(
"streaming task paused, reason %s (%d)"
,
reason
,
ret
));
GST_ELEMENT_FLOW_ERROR
(
src
,
ret
);
gst_rtspsrc_push_event
(
src
,
gst_event_new_eos
());
}
gst_rtspsrc_loop_send_cmd
(
src
,
CMD_WAIT
,
CMD_LOOP
);
...
...
gst/wavparse/gstwavparse.c
View file @
150edef8
...
...
@@ -2246,9 +2246,7 @@ pause:
}
else
if
(
ret
==
GST_FLOW_NOT_LINKED
||
ret
<
GST_FLOW_EOS
)
{
/* for fatal errors we post an error message, post the error
* first so the app knows about the error first. */
GST_ELEMENT_ERROR
(
wav
,
STREAM
,
FAILED
,
(
_
(
"Internal data flow error."
)),
(
"streaming task paused, reason %s (%d)"
,
reason
,
ret
));
GST_ELEMENT_FLOW_ERROR
(
wav
,
ret
);
gst_pad_push_event
(
wav
->
srcpad
,
gst_event_new_eos
());
}
return
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment