gst-libs/gst/gl/meson.build

@@ -235,6 +235,7 @@ if gl_winsys.contains('auto')
   need_win_win32 = 'auto'
   need_win_winrt = 'auto'
   need_win_cocoa = 'auto'
+  need_win_egl = 'auto'
   need_win_eagl = 'auto'
   need_win_dispmanx = 'auto'
   need_win_viv_fb = 'auto'
@@ -246,6 +247,7 @@ else
   need_win_win32 = 'no'
   need_win_winrt = 'no'
   need_win_cocoa = 'no'
+  need_win_egl = 'no'
   need_win_eagl = 'no'
   need_win_dispmanx = 'no'
   need_win_viv_fb = 'no'
@@ -262,6 +264,8 @@ else
       need_win_winrt = 'yes'
     elif winsys == 'cocoa'
       need_win_cocoa = 'yes'
+    elif winsys == 'egl'
+      need_win_egl = 'yes'
     elif winsys == 'eagl'
       need_win_eagl = 'yes'
     elif winsys == 'dispmanx'
@@ -520,6 +524,17 @@ if need_platform_egl != 'no'
   endif
 endif
 
+# winsys_egl checks
+if need_win_egl == 'yes'
+  if need_platform_egl == 'no'
+    error('Impossible situation requested: Cannot use Winsys egl without EGL support')
+  elif not egl_dep.found()
+    error ('Could not find EGL libraries for Winsys egl')
+  else
+    enabled_gl_winsys += 'egl'
+  endif
+endif
+
 # wayland checks
 wayland_client_dep = unneeded_dep
 wayland_cursor_dep = unneeded_dep

gst-libs/gst/gl/wayland/gstglwindow_wayland_egl.c

@@ -554,8 +554,8 @@ gst_gl_window_wayland_egl_open (GstGLWindow * window, GError ** error)
   wl_registry_add_listener (window_egl->display.registry, &registry_listener,
       window_egl);
 
-  if (gst_gl_wl_display_roundtrip_queue (window_egl->display.display,
-          display->display, window_egl->window.queue) < 0) {
+  if (wl_display_roundtrip_queue (display->display,
+          window_egl->window.queue) < 0) {
     g_set_error (error, GST_GL_WINDOW_ERROR,
         GST_GL_WINDOW_ERROR_RESOURCE_UNAVAILABLE,
         "Failed to perform a wayland roundtrip");
@@ -610,8 +610,8 @@ _roundtrip_async (GstGLWindow * window)
 
   create_surfaces (window_egl);
 
-  if (gst_gl_wl_display_roundtrip_queue (window_egl->display.display,
-          display->display, window_egl->window.queue) < 0)
+  if (wl_display_roundtrip_queue (display->display,
+          window_egl->window.queue) < 0)
     GST_WARNING_OBJECT (window, "failed a roundtrip");
 }
 

gst-libs/gst/gl/wayland/wayland_event_source.c

@@ -54,75 +54,6 @@ init_debug (void)
   }
 }
 
-static void
-sync_callback (void *data, struct wl_callback *callback, uint32_t serial)
-{
-  gboolean *done = data;
-
-  GST_TRACE ("roundtrip done. callback:%p", callback);
-
-  *done = TRUE;
-  wl_callback_destroy (callback);
-}
-
-static const struct wl_callback_listener sync_listener = {
-  sync_callback
-};
-
-/* only thread safe iff called on the same thread @queue is being dispatched on.
- * Otherwise, two prepare_read{_queue}()'s can be indicated for the same
- * queue and dispatch{_queue}() may be called for different threads which
- * will cause deadlocks as no guarantees for thread-safety are given when
- * pumping the same queue from multiple threads.
- * As a concrete example, if the wayland event source (below) for a @queue is
- * running on a certain thread, then this function must only be called in that
- * thread (with that @queue). */
-/* @sync_display is the wl_display that is used to create the sync object and
- * may be a proxy wrapper.
- * @dispatch_display must not be a proxy wrapper.
- * @queue can be NULL. */
-gint
-gst_gl_wl_display_roundtrip_queue (struct wl_display *sync_display,
-    struct wl_display *dispatch_display, struct wl_event_queue *queue)
-{
-  struct wl_callback *callback;
-  gboolean done = FALSE;
-  gint ret = 0;
-
-  init_debug ();
-
-  GST_TRACE ("roundtrip start for dpy %p and queue %p", dispatch_display,
-      queue);
-
-  if (!(callback = wl_display_sync (sync_display))) {
-    GST_WARNING ("creating sync callback failed");
-    return -1;
-  }
-  GST_TRACE ("create roundtrip callback %p", callback);
-  wl_callback_add_listener (callback, &sync_listener, &done);
-  if (queue) {
-    while (!done && ret >= 0) {
-      ret = wl_display_dispatch_queue (dispatch_display, queue);
-      GST_TRACE ("dispatch ret: %i, errno: (%i, 0x%x) \'%s\'", ret, errno,
-          errno, g_strerror (errno));
-    }
-  } else {
-    while (!done && ret >= 0) {
-      ret = wl_display_dispatch (dispatch_display);
-      GST_TRACE ("dispatch ret: %i, errno: (%i, 0x%x) \'%s\'", ret, errno,
-          errno, g_strerror (errno));
-    }
-  }
-
-  if (ret == -1 && !done)
-    wl_callback_destroy (callback);
-  GST_DEBUG ("roundtrip done for dpy %p and queue %p. ret %i, "
-      "errno: (%i, 0x%x) \'%s\'", dispatch_display, queue, ret, errno, errno,
-      g_strerror (errno));
-
-  return ret;
-}
-
 typedef struct _WaylandEventSource
 {
   GSource source;

gst-libs/gst/gl/wayland/wayland_event_source.h

@@ -36,8 +36,4 @@
 GSource * wayland_event_source_new (struct wl_display *display,
                                     struct wl_event_queue *queue);
 
-G_GNUC_INTERNAL gint      gst_gl_wl_display_roundtrip_queue (struct wl_display *sync_display,
-                                             struct wl_display *dispatch_display,
-                                             struct wl_event_queue *queue);
-
 #endif /* __WAYLAND_EVENT_SOURCE_H__ */

gst-libs/gst/rtsp/gstrtspconnection.c

@@ -4813,7 +4813,7 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 /**
  * gst_rtsp_connection_connect:
  * @conn: a #GstRTSPConnection
- * @timeout: a #GTimeVal timeout
+ * @timeout: a GTimeVal timeout
  *
  * Attempt to connect to the url of @conn made with
  * gst_rtsp_connection_create(). If @timeout is %NULL this function can block
@@ -4835,7 +4835,7 @@ gst_rtsp_connection_connect (GstRTSPConnection * conn, GTimeVal * timeout)
 /**
  * gst_rtsp_connection_connect_with_response:
  * @conn: a #GstRTSPConnection
- * @timeout: a #GTimeVal timeout
+ * @timeout: a GTimeVal timeout
  * @response: a #GstRTSPMessage
  *
  * Attempt to connect to the url of @conn made with
@@ -5038,7 +5038,7 @@ gst_rtsp_connection_next_timeout (GstRTSPConnection * conn, GTimeVal * timeout)
 /**
  * gst_rtsp_watch_wait_backlog:
  * @watch: a #GstRTSPWatch
- * @timeout: a #GTimeVal timeout
+ * @timeout: a GTimeVal timeout
  *
  * Wait until there is place in the backlog queue, @timeout is reached
  * or @watch is set to flushing.

gst/subparse/gstsubparse.c

@@ -903,8 +903,18 @@ parse_subrip_time (const gchar * ts_string, GstClockTime * t)
 
   GST_LOG ("parsing timestamp '%s'", s);
   if (sscanf (s, "%u:%u:%u,%u", &hour, &min, &sec, &msec) != 4) {
-    GST_WARNING ("failed to parse subrip timestamp string '%s'", s);
-    return FALSE;
+    /* https://www.w3.org/TR/webvtt1/#webvtt-timestamp
+     *
+     * The hours component is optional with webVTT, for example
+     * mm:ss,500 is a valid webVTT timestamp. When not present,
+     * hours is 0.
+     */
+    hour = 0;
+
+    if (sscanf (s, "%u:%u,%u", &min, &sec, &msec) != 3) {
+      GST_WARNING ("failed to parse subrip timestamp string '%s'", s);
+      return FALSE;
+    }
   }
 
   *t = ((hour * 3600) + (min * 60) + sec) * GST_SECOND + msec * GST_MSECOND;

meson_options.txt

@@ -12,8 +12,8 @@ option('gl_platform', type : 'array',
        choices : ['glx', 'egl', 'cgl', 'wgl', 'eagl', 'auto'], value : ['auto'],
        description : 'A comma separated list of opengl platforms to enable building against')
 option('gl_winsys', type : 'array',
-       choices : ['x11', 'wayland', 'win32', 'winrt', 'cocoa', 'dispmanx', 'viv-fb', 'gbm', 'android', 'auto'], value : ['auto'],
-       description : 'A comma separated list of opengl windows systems to enable building against. Supported values are x11, wayland, win32, winrt, cocoa, dispmanx, viv-fb, gbm, and android')
+       choices : ['x11', 'wayland', 'win32', 'winrt', 'cocoa', 'dispmanx', 'egl', 'viv-fb', 'gbm', 'android', 'auto'], value : ['auto'],
+       description : 'A comma separated list of opengl windows systems to enable building against. Supported values are x11, wayland, win32, winrt, cocoa, dispmanx, egl, viv-fb, gbm, and android')
 option('egl_module_name', type : 'string', value : '',
        description : 'The file to pass to g_module_open to open the libEGL library (default: libEGL)')
 option('opengl_module_name', type : 'string', value : '',