Skip to content
Permalink
Browse files
Unreviewed, rolling out r251772.
Caused lots of media related tests to timeout

Reverted changeset:

"REGRESSION(r249428): [GStreamer] VP9 video rendered green"
https://bugs.webkit.org/show_bug.cgi?id=201422
https://trac.webkit.org/changeset/251772

Canonical link: https://commits.webkit.org/217029@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@251838 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
magomez committed Oct 31, 2019
1 parent f0929a7 commit 66a89fcc595c29654ae02e4f87129165d5189e3d
Showing with 13 additions and 13 deletions.
  1. +12 −0 Source/WebCore/ChangeLog
  2. +1 −13 Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
@@ -1,3 +1,15 @@
2019-10-31 Miguel Gomez <magomez@igalia.com>

Unreviewed, rolling out r251772.

Caused lots of media related tests to timeout

Reverted changeset:

"REGRESSION(r249428): [GStreamer] VP9 video rendered green"
https://bugs.webkit.org/show_bug.cgi?id=201422
https://trac.webkit.org/changeset/251772

2019-10-31 Miguel Gomez <magomez@igalia.com>

[CoordGraphics] Avoid painting backing stores for zero-opacity layers
@@ -1201,19 +1201,7 @@ GstElement* MediaPlayerPrivateGStreamerBase::createVideoSinkGL()
gst_bin_add_many(GST_BIN(videoSink), upload, colorconvert, appsink, nullptr);

GRefPtr<GstCaps> caps = adoptGRef(gst_caps_from_string("video/x-raw, format = (string) " GST_GL_CAPS_FORMAT));
GstCapsFeatures* features = gst_caps_features_new(GST_CAPS_FEATURE_MEMORY_GL_MEMORY, nullptr);

// Workaround until we can depend on GStreamer 1.16.2.
// https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/commit/8d32de090554cf29fe359f83aa46000ba658a693
// Adding the texture upload meta here allows glupload to add video meta to
// the buffers, without needing the patch above. However this specific caps
// feature is going to be removed from GStreamer so it is considered a
// short-term workaround.
// See also https://bugs.webkit.org/show_bug.cgi?id=201422
if (!webkitGstCheckVersion(1, 16, 2))
gst_caps_features_add(features, GST_CAPS_FEATURE_META_GST_VIDEO_GL_TEXTURE_UPLOAD_META);

gst_caps_set_features(caps.get(), 0, features);
gst_caps_set_features(caps.get(), 0, gst_caps_features_new(GST_CAPS_FEATURE_MEMORY_GL_MEMORY, nullptr));
g_object_set(appsink, "caps", caps.get(), nullptr);

result &= gst_element_link_many(upload, colorconvert, appsink, nullptr);

0 comments on commit 66a89fc

Please sign in to comment.