mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-20 07:16:55 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/subparse/gstssaparse.c: remove duplicate log message

Browse source 
Original commit message from CVS:
* gst/subparse/gstssaparse.c:
remove duplicate log message
This commit is contained in:
Thijs Vermeir 2007-12-29 19:23:59 +00:00
parent ff8530e228
commit 41cc98e287
2 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2007-12-29 Thijs Vermeir <thijsvermeir@gmail.com>
* gst/subparse/gstssaparse.c:
remove duplicate log message
2007-12-29 Sebastian Dröge <slomo@circular-chaos.org> 2007-12-29 Sebastian Dröge <slomo@circular-chaos.org>
* ext/libvisual/visual.c: (gst_visual_chain): * ext/libvisual/visual.c: (gst_visual_chain):

20
gst/subparse/gstssaparse.c
View file

@ -222,8 +222,20 @@ gst_ssa_parse_remove_override_codes (GstSsaParse * parse, gchar * txt)
return removed_any; return removed_any;
} }
/**
* gst_ssa_parse_push_line:
* @parse: caller element
* @txt: text to push
* @start: timestamp for the buffer
* @duration: duration for the buffer
*
* Parse the text in a buffer with the given properties and
* push it to the srcpad of the @parse element
*
* Returns: result of the push of the created buffer
*/
static GstFlowReturn static GstFlowReturn
gst_ssa_parse_parse_line (GstSsaParse * parse, gchar * txt, gst_ssa_parse_push_line (GstSsaParse * parse, gchar * txt,
GstClockTime start, GstClockTime duration) GstClockTime start, GstClockTime duration)
{ {
GstFlowReturn ret; GstFlowReturn ret;
@ -274,7 +286,8 @@ gst_ssa_parse_parse_line (GstSsaParse * parse, gchar * txt,
ret = gst_pad_push (parse->srcpad, buf); ret = gst_pad_push (parse->srcpad, buf);
if (ret != GST_FLOW_OK) { if (ret != GST_FLOW_OK) {
GST_DEBUG_OBJECT (parse, "Push returned flow %s", gst_flow_get_name (ret)); GST_DEBUG_OBJECT (parse, "Push of text '%s' returned flow %s", txt,
gst_flow_get_name (ret));
} }
return ret; return ret;
@ -298,10 +311,9 @@ gst_ssa_parse_chain (GstPad * sinkpad, GstBuffer * buf)
return GST_FLOW_UNEXPECTED; return GST_FLOW_UNEXPECTED;
ts = GST_BUFFER_TIMESTAMP (buf); ts = GST_BUFFER_TIMESTAMP (buf);
ret = gst_ssa_parse_parse_line (parse, txt, ts, GST_BUFFER_DURATION (buf)); ret = gst_ssa_parse_push_line (parse, txt, ts, GST_BUFFER_DURATION (buf));
if (ret != GST_FLOW_OK) { if (ret != GST_FLOW_OK) {
GST_WARNING_OBJECT (parse, "Failed to parse dialog line '%s'", txt);
if (GST_CLOCK_TIME_IS_VALID (ts)) { if (GST_CLOCK_TIME_IS_VALID (ts)) {
/* just advance time without sending anything */ /* just advance time without sending anything */
gst_pad_push_event (parse->srcpad, gst_pad_push_event (parse->srcpad,