Changeset 207874 in webkit

Timestamp:

Oct 26, 2016 1:37:08 AM (7 years ago)

Author:

eocanha@igalia.com

Message:

[GStreamer] Drain query support
​https://bugs.webkit.org/show_bug.cgi?id=162872

Reviewed by Žan Doberšek.

Under some circumstances, GStreamer deadlocks completely during MSE seeks on OpenGL ES
systems. This is because the video sink still holds samples. Proper DRAIN support
fixes this issue and is also good for all the platforms, not only OpenGL ES.

• platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:

(WebCore::MediaPlayerPrivateGStreamerBase::triggerDrain):
(WebCore::MediaPlayerPrivateGStreamerBase::drainCallback):
(WebCore::MediaPlayerPrivateGStreamerBase::createVideoSink):
(WebCore::MediaPlayerPrivateGStreamerBase::createVideoSinkGL): Deleted.

• platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h:
• platform/graphics/gstreamer/VideoSinkGStreamer.cpp:

(VideoRenderRequestScheduler::drain):
(webkitVideoSinkQuery):
(webkitVideoSinkEvent):
(webkit_video_sink_class_init):
(VideoRenderRequestScheduler::stop): Deleted.
(webkitVideoSinkProposeAllocation): Deleted.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp (modified) (2 diffs)
• platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h (modified) (1 diff)
• platform/graphics/gstreamer/VideoSinkGStreamer.cpp (modified) (6 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-26  Enrique Ocaña González  <eocanha@igalia.com>
+
+        [GStreamer] Drain query support
+        https://bugs.webkit.org/show_bug.cgi?id=162872
+
+        Reviewed by Žan Doberšek.
+
+        Under some circumstances, GStreamer deadlocks completely during MSE seeks on OpenGL ES
+        systems. This is because the video sink still holds samples. Proper DRAIN support
+        fixes this issue and is also good for all the platforms, not only OpenGL ES.
+
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
+        (WebCore::MediaPlayerPrivateGStreamerBase::triggerDrain):
+        (WebCore::MediaPlayerPrivateGStreamerBase::drainCallback):
+        (WebCore::MediaPlayerPrivateGStreamerBase::createVideoSink):
+        (WebCore::MediaPlayerPrivateGStreamerBase::createVideoSinkGL): Deleted.
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h:
+        * platform/graphics/gstreamer/VideoSinkGStreamer.cpp:
+        (VideoRenderRequestScheduler::drain):
+        (webkitVideoSinkQuery):
+        (webkitVideoSinkEvent):
+        (webkit_video_sink_class_init):
+        (VideoRenderRequestScheduler::stop): Deleted.
+        (webkitVideoSinkProposeAllocation): Deleted.
+
 2016-10-26  Enrique Ocaña González  <eocanha@igalia.com>
 

trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp

@@ -629 +629 @@
 }
 
+void MediaPlayerPrivateGStreamerBase::triggerDrain()
+{
+    WTF::GMutexLocker<GMutex> lock(m_sampleMutex);
+    m_videoSize = FloatSize();
+    m_sample = nullptr;
+}
+
 void MediaPlayerPrivateGStreamerBase::repaintCallback(MediaPlayerPrivateGStreamerBase* player, GstSample* sample)
 {
     player->triggerRepaint(sample);
+}
+
+void MediaPlayerPrivateGStreamerBase::drainCallback(MediaPlayerPrivateGStreamerBase* player)
+{
+    player->triggerDrain();
 }
 
@@ -968 +980 @@
         m_videoSink = webkitVideoSinkNew();
         g_signal_connect_swapped(m_videoSink.get(), "repaint-requested", G_CALLBACK(repaintCallback), this);
+        g_signal_connect_swapped(m_videoSink.get(), "drain", G_CALLBACK(drainCallback), this);
     }
 

trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h

@@ -151 +151 @@
     virtual bool handleSyncMessage(GstMessage*);
 
+    void triggerDrain();
+
     void triggerRepaint(GstSample*);
     void repaint();
 
+    static void drainCallback(MediaPlayerPrivateGStreamerBase*);
     static void repaintCallback(MediaPlayerPrivateGStreamerBase*, GstSample*);
 

trunk/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp

@@ -2 +2 @@
  *  Copyright (C) 2007 OpenedHand
  *  Copyright (C) 2007 Alp Toker <alp@atoker.com>
- *  Copyright (C) 2009, 2010, 2011, 2012 Igalia S.L
+ *  Copyright (C) 2009, 2010, 2011, 2012, 2015, 2016 Igalia S.L
+ *  Copyright (C) 2015, 2016 Metrological Group B.V.
  *
  *  This library is free software; you can redistribute it and/or
@@ -58 +59 @@
 enum {
     REPAINT_REQUESTED,
+    DRAIN,
     LAST_SIGNAL
 };
@@ -94 +96 @@
         m_dataCondition.notifyOne();
 #endif
+    }
+
+    void drain()
+    {
+        LockHolder locker(m_sampleMutex);
+        m_sample = nullptr;
     }
 
@@ -348 +356 @@
 }
 
+static gboolean webkitVideoSinkQuery(GstBaseSink* baseSink, GstQuery* query)
+{
+    WebKitVideoSink* sink = WEBKIT_VIDEO_SINK(baseSink);
+
+    switch (GST_QUERY_TYPE(query)) {
+    case GST_QUERY_DRAIN:
+        GST_OBJECT_LOCK(sink);
+        g_signal_emit(sink, webkitVideoSinkSignals[DRAIN], 0);
+        GST_OBJECT_UNLOCK(sink);
+        return TRUE;
+    default:
+        return GST_CALL_PARENT_WITH_DEFAULT(GST_BASE_SINK_CLASS, query, (baseSink, query), TRUE);
+    }
+}
+
+static gboolean webkitVideoSinkEvent(GstBaseSink* baseSink, GstEvent* event)
+{
+    switch (GST_EVENT_TYPE(event)) {
+    case GST_EVENT_FLUSH_START: {
+        WebKitVideoSink* sink = WEBKIT_VIDEO_SINK(baseSink);
+        sink->priv->scheduler.drain();
+
+        GST_DEBUG_OBJECT(sink, "Flush-start, emitting DRAIN signal and releasing m_sample");
+
+        GST_OBJECT_LOCK(sink);
+        g_signal_emit(sink, webkitVideoSinkSignals[DRAIN], 0);
+        GST_OBJECT_UNLOCK(sink);
+        }
+        FALLTHROUGH;
+    default:
+        return GST_CALL_PARENT_WITH_DEFAULT(GST_BASE_SINK_CLASS, event, (baseSink, event), TRUE);
+    }
+}
+
 static void webkit_video_sink_class_init(WebKitVideoSinkClass* klass)
 {
@@ -369 +411 @@
     baseSinkClass->set_caps = webkitVideoSinkSetCaps;
     baseSinkClass->propose_allocation = webkitVideoSinkProposeAllocation;
+    baseSinkClass->query = webkitVideoSinkQuery;
+    baseSinkClass->event = webkitVideoSinkEvent;
 
     webkitVideoSinkSignals[REPAINT_REQUESTED] = g_signal_new("repaint-requested",
@@ -380 +424 @@
             1, // Only one parameter
             GST_TYPE_SAMPLE);
+
+    webkitVideoSinkSignals[DRAIN] = g_signal_new("drain",
+        G_TYPE_FROM_CLASS(klass),
+        static_cast<GSignalFlags>(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
+        0, // Class offset.
+        0, // Accumulator.
+        0, // Accumulator data.
+        g_cclosure_marshal_generic,
+        G_TYPE_NONE, // Return type.
+        0); // No parameters.
 }