From c789277ec065eb2ac2bcb77ab2f5329caf3fe9ab Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Fri, 4 May 2018 22:54:01 +1000 Subject: [PATCH] dvdsubdec: Take the highlight event from the structure. Don't use GST_EVENT_TIMESTAMP to transfer any PTS associated with a highlight event, instead store it in the event structure directly, as GstEvent::timestamp will disappear in GStreamer 2.0 https://bugzilla.gnome.org/show_bug.cgi?id=761477 --- gst/dvdsub/gstdvdsubdec.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gst/dvdsub/gstdvdsubdec.c b/gst/dvdsub/gstdvdsubdec.c index 77bfbc96..f68825be 100644 --- a/gst/dvdsub/gstdvdsubdec.c +++ b/gst/dvdsub/gstdvdsubdec.c @@ -950,10 +950,13 @@ gst_dvd_sub_dec_sink_event (GstPad * pad, GstObject * parent, GstEvent * event) break; } case GST_EVENT_CUSTOM_DOWNSTREAM:{ - GstClockTime ts = GST_EVENT_TIMESTAMP (event); if (gst_event_has_name (event, "application/x-gst-dvd")) { - if (GST_CLOCK_TIME_IS_VALID (ts)) + const GstStructure *s = gst_event_get_structure (event); + GstClockTime ts = GST_CLOCK_TIME_NONE; + + if (gst_structure_get_clock_time (s, "ts", &ts) + && GST_CLOCK_TIME_IS_VALID (ts)) gst_dvd_sub_dec_advance_time (dec, ts); if (gst_dvd_sub_dec_handle_dvd_event (dec, event)) { -- 2.34.1