mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-07-19 21:08:24 +00:00
ext/pango/gsttextoverlay.c: Stick to seeking theory until i find the bug.
Original commit message from CVS: 2006-02-06 Julien MOUTTE <julien@moutte.net> * ext/pango/gsttextoverlay.c: (gst_text_overlay_src_event): Stick to seeking theory until i find the bug. * gst/subparse/gstsubparse.c: (parse_subrip): Fix debug.
This commit is contained in:
parent
1b7a2c9c72
commit
4e0e05f698
|
@ -1,3 +1,9 @@
|
||||||
|
2006-02-06 Julien MOUTTE <julien@moutte.net>
|
||||||
|
|
||||||
|
* ext/pango/gsttextoverlay.c: (gst_text_overlay_src_event):
|
||||||
|
Stick to seeking theory until i find the bug.
|
||||||
|
* gst/subparse/gstsubparse.c: (parse_subrip): Fix debug.
|
||||||
|
|
||||||
2006-02-06 Jan Schmidt <thaytan@mad.scientist.com>
|
2006-02-06 Jan Schmidt <thaytan@mad.scientist.com>
|
||||||
|
|
||||||
* ext/theora/theoraenc.c: (gst_theora_enc_class_init),
|
* ext/theora/theoraenc.c: (gst_theora_enc_class_init),
|
||||||
|
|
|
@ -528,11 +528,6 @@ gst_text_overlay_src_event (GstPad * pad, GstEvent * event)
|
||||||
/* Stopping collect pads */
|
/* Stopping collect pads */
|
||||||
gst_collect_pads_stop (overlay->collect);
|
gst_collect_pads_stop (overlay->collect);
|
||||||
|
|
||||||
/* Flush upstream, this is required so that we can take the stream lock
|
|
||||||
safely */
|
|
||||||
gst_pad_push_event (overlay->video_sinkpad, gst_event_new_flush_start ());
|
|
||||||
gst_pad_push_event (overlay->text_sinkpad, gst_event_new_flush_start ());
|
|
||||||
|
|
||||||
/* Acquire stream lock */
|
/* Acquire stream lock */
|
||||||
GST_PAD_STREAM_LOCK (overlay->video_sinkpad);
|
GST_PAD_STREAM_LOCK (overlay->video_sinkpad);
|
||||||
GST_PAD_STREAM_LOCK (overlay->text_sinkpad);
|
GST_PAD_STREAM_LOCK (overlay->text_sinkpad);
|
||||||
|
@ -546,10 +541,6 @@ gst_text_overlay_src_event (GstPad * pad, GstEvent * event)
|
||||||
gst_event_unref (event);
|
gst_event_unref (event);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Stop flushing upstream */
|
|
||||||
gst_pad_push_event (overlay->video_sinkpad, gst_event_new_flush_stop ());
|
|
||||||
gst_pad_push_event (overlay->text_sinkpad, gst_event_new_flush_stop ());
|
|
||||||
|
|
||||||
/* Start collect pads again */
|
/* Start collect pads again */
|
||||||
gst_collect_pads_start (overlay->collect);
|
gst_collect_pads_start (overlay->collect);
|
||||||
|
|
||||||
|
|
|
@ -408,7 +408,7 @@ parse_subrip (ParserState * state, const gchar * line)
|
||||||
(((guint64) h2) * 3600 + m2 * 60 + s2) * GST_SECOND +
|
(((guint64) h2) * 3600 + m2 * 60 + s2) * GST_SECOND +
|
||||||
ms2 * GST_MSECOND - state->start_time;
|
ms2 * GST_MSECOND - state->start_time;
|
||||||
} else {
|
} else {
|
||||||
GST_DEBUG (0, "error parsing subrip time line");
|
GST_DEBUG ("error parsing subrip time line");
|
||||||
state->state = 0;
|
state->state = 0;
|
||||||
}
|
}
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
Loading…
Reference in a new issue