Changeset 242725 in webkit

Timestamp:

Mar 11, 2019 12:21:48 PM (5 years ago)

Author:

zandobersek@gmail.com

Message:

Unreviewed. Manually rolling out r242701 and r242703 since the changes
are causing test timeouts and crashes on GTK and WPE.

• platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:

(WebCore::MediaPlayerPrivateGStreamer::createGSTPlayBin):

• platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:

(WebCore::MediaPlayerPrivateGStreamerBase::~MediaPlayerPrivateGStreamerBase):
(WebCore::MediaPlayerPrivateGStreamerBase::flushCurrentBuffer):
(WebCore::MediaPlayerPrivateGStreamerBase::createGLAppSink):

• platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h:
• platform/graphics/texmap/TextureMapperPlatformLayerProxy.cpp:

(WebCore::TextureMapperPlatformLayerProxy::pushNextBuffer):
(WebCore::TextureMapperPlatformLayerProxy::dropCurrentBufferWhilePreservingTexture):

• platform/graphics/texmap/TextureMapperPlatformLayerProxy.h:

(): Deleted.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (modified) (1 diff)
• platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp (modified) (4 diffs)
• platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h (modified) (1 diff)
• platform/graphics/texmap/TextureMapperPlatformLayerProxy.cpp (modified) (5 diffs)
• platform/graphics/texmap/TextureMapperPlatformLayerProxy.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-03-11  Zan Dobersek  <zdobersek@igalia.com>
+
+        Unreviewed. Manually rolling out r242701 and r242703 since the changes
+        are causing test timeouts and crashes on GTK and WPE.
+
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+        (WebCore::MediaPlayerPrivateGStreamer::createGSTPlayBin):
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
+        (WebCore::MediaPlayerPrivateGStreamerBase::~MediaPlayerPrivateGStreamerBase):
+        (WebCore::MediaPlayerPrivateGStreamerBase::flushCurrentBuffer):
+        (WebCore::MediaPlayerPrivateGStreamerBase::createGLAppSink):
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h:
+        * platform/graphics/texmap/TextureMapperPlatformLayerProxy.cpp:
+        (WebCore::TextureMapperPlatformLayerProxy::pushNextBuffer):
+        (WebCore::TextureMapperPlatformLayerProxy::dropCurrentBufferWhilePreservingTexture):
+        * platform/graphics/texmap/TextureMapperPlatformLayerProxy.h:
+        (): Deleted.
+
 2019-03-11  Jer Noble  <jer.noble@apple.com>
 

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

@@ -2446 +2446 @@
     g_object_set(m_pipeline.get(), "mute", m_player->muted(), nullptr);
 
-    g_signal_connect(GST_BIN_CAST(m_pipeline.get()), "deep-element-added", G_CALLBACK(+[](GstBin*, GstBin* subBin, GstElement* element, MediaPlayerPrivateGStreamer* player) {
-        GUniquePtr<char> binName(gst_element_get_name(GST_ELEMENT_CAST(subBin)));
-        if (!g_str_has_prefix(binName.get(), "decodebin"))
-            return;
-
-        GUniquePtr<char> elementName(gst_element_get_name(element));
-        player->m_isVideoDecoderVideo4Linux = g_str_has_prefix(elementName.get(), "v4l2");
-    }), this);
-
     g_signal_connect_swapped(m_pipeline.get(), "source-setup", G_CALLBACK(sourceSetupCallback), this);
     if (m_isLegacyPlaybin) {

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

@@ -270 +270 @@
 MediaPlayerPrivateGStreamerBase::~MediaPlayerPrivateGStreamerBase()
 {
-#if USE(GSTREAMER_GL)
-    flushCurrentBuffer();
-#endif
 #if USE(TEXTURE_MAPPER_GL) && USE(NICOSIA)
     downcast<Nicosia::ContentLayerTextureMapperImpl>(m_nicosiaLayer->impl()).invalidateClient();
@@ -850 +847 @@
 void MediaPlayerPrivateGStreamerBase::flushCurrentBuffer()
 {
+    GST_DEBUG_OBJECT(pipeline(), "Flushing video sample");
     auto sampleLocker = holdLock(m_sampleMutex);
 
@@ -861 +859 @@
 
     auto proxyOperation =
-        [shouldWait = m_isVideoDecoderVideo4Linux, pipeline = pipeline()](TextureMapperPlatformLayerProxy& proxy)
+        [](TextureMapperPlatformLayerProxy& proxy)
         {
-            GST_DEBUG_OBJECT(pipeline, "Flushing video sample %s", shouldWait ? "synchronously" : "");
-            if (!shouldWait)
-                proxy.lock().lock();
+            LockHolder locker(proxy.lock());
 
             if (proxy.isActive())
-                proxy.dropCurrentBufferWhilePreservingTexture(shouldWait);
+                proxy.dropCurrentBufferWhilePreservingTexture();
         };
 
@@ -1015 +1011 @@
 
     GRefPtr<GstPad> pad = adoptGRef(gst_element_get_static_pad(appsink, "sink"));
-    gst_pad_add_probe(pad.get(), static_cast<GstPadProbeType>(GST_PAD_PROBE_TYPE_PUSH | GST_PAD_PROBE_TYPE_QUERY_DOWNSTREAM | GST_PAD_PROBE_TYPE_EVENT_FLUSH), [] (GstPad*, GstPadProbeInfo* info,  gpointer userData) -> GstPadProbeReturn {
+    gst_pad_add_probe(pad.get(), static_cast<GstPadProbeType>(GST_PAD_PROBE_TYPE_QUERY_DOWNSTREAM | GST_PAD_PROBE_TYPE_EVENT_FLUSH), [] (GstPad*, GstPadProbeInfo* info,  gpointer userData) -> GstPadProbeReturn {
         // In some platforms (e.g. OpenMAX on the Raspberry Pi) when a resolution change occurs the
         // pipeline has to be drained before a frame with the new resolution can be decoded.

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

@@ -283 +283 @@
     bool m_waitingForKey { false };
 #endif
-
-    mutable bool m_isVideoDecoderVideo4Linux { false };
 };
 

trunk/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerProxy.cpp

@@ -37 +37 @@
 #include <wtf/glib/RunLoopSourcePriority.h>
 #endif
-#include <wtf/Scope.h>
 
 static const Seconds releaseUnusedSecondsTolerance { 1_s };
@@ -115 +114 @@
     ASSERT(m_lock.isHeld());
     m_pendingBuffer = WTFMove(newBuffer);
-    m_wasBufferDropped = false;
 
     if (m_compositor)
@@ -190 +188 @@
 }
 
-void TextureMapperPlatformLayerProxy::dropCurrentBufferWhilePreservingTexture(bool shouldWait)
-{
-    if (!shouldWait)
-        ASSERT(m_lock.isHeld());
+void TextureMapperPlatformLayerProxy::dropCurrentBufferWhilePreservingTexture()
+{
+    ASSERT(m_lock.isHeld());
 
     if (m_pendingBuffer && m_pendingBuffer->hasManagedTexture()) {
@@ -204 +201 @@
 
     m_compositorThreadUpdateFunction =
-        [this, shouldWait] {
+        [this] {
             LockHolder locker(m_lock);
-
-            auto maybeNotifySynchronousOperation = WTF::makeScopeExit([this, shouldWait]() {
-                if (shouldWait) {
-                    LockHolder holder(m_wasBufferDroppedLock);
-                    m_wasBufferDropped = true;
-                    m_wasBufferDroppedCondition.notifyAll();
-                }
-            });
 
             if (!m_compositor || !m_targetLayer || !m_currentBuffer)
@@ -226 +215 @@
                 appendToUnusedBuffers(WTFMove(prevBuffer));
         };
-
-    if (shouldWait) {
-        LockHolder holder(m_wasBufferDroppedLock);
-        m_wasBufferDropped = false;
-    }
-
     m_compositorThreadUpdateTimer->startOneShot(0_s);
-    if (shouldWait) {
-        LockHolder holder(m_wasBufferDroppedLock);
-        m_wasBufferDroppedCondition.wait(m_wasBufferDroppedLock, [this] {
-            return m_wasBufferDropped;
-        });
-    }
 }
 

trunk/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerProxy.h

@@ -29 +29 @@
 
 #include "TextureMapperGLHeaders.h"
-#include <wtf/Condition.h>
 #include <wtf/Function.h>
 #include <wtf/Lock.h>
@@ -70 +69 @@
 
     WEBCORE_EXPORT void swapBuffer();
-    void dropCurrentBufferWhilePreservingTexture(bool shouldWait = false);
+    void dropCurrentBufferWhilePreservingTexture();
 
     bool scheduleUpdateOnCompositorThread(Function<void()>&&);
@@ -87 +86 @@
     Lock m_lock;
 
-    Lock m_wasBufferDroppedLock;
-    Condition m_wasBufferDroppedCondition;
-    bool m_wasBufferDropped { false };
-
     Vector<std::unique_ptr<TextureMapperPlatformLayerBuffer>> m_usedBuffers;
     std::unique_ptr<RunLoop::Timer<TextureMapperPlatformLayerProxy>> m_releaseUnusedBuffersTimer;