Skip to content
Permalink
Browse files
[GStreamer] Can't play any video with GSTREAMER_GL enabled
https://bugs.webkit.org/show_bug.cgi?id=162669

Reviewed by Philippe Normand.

Make sure an EGLDisplay type is passed when creating the GstGlDisplay
for the EGL code path, instead of a native X11 display type, so
that we get a valid GstGlDisplay as a result, not a dummy one.

* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
(WebCore::MediaPlayerPrivateGStreamerBase::ensureGstGLContext):

Canonical link: https://commits.webkit.org/180912@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@206859 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
mariospr committed Oct 6, 2016
1 parent fd989ca commit 52f2fffc56841e1854d69c91879e45eabd4c3e4d
Showing with 16 additions and 2 deletions.
  1. +14 −0 Source/WebCore/ChangeLog
  2. +2 −2 Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
@@ -1,3 +1,17 @@
2016-10-06 Mario Sanchez Prada <mario@endlessm.com>

[GStreamer] Can't play any video with GSTREAMER_GL enabled
https://bugs.webkit.org/show_bug.cgi?id=162669

Reviewed by Philippe Normand.

Make sure an EGLDisplay type is passed when creating the GstGlDisplay
for the EGL code path, instead of a native X11 display type, so
that we get a valid GstGlDisplay as a result, not a dummy one.

* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
(WebCore::MediaPlayerPrivateGStreamerBase::ensureGstGLContext):

2016-10-06 Youenn Fablet <youenn@apple.com>

[Fetch API] Forbid redirection to non-HTTP(s) URL in non-navigation mode.
@@ -262,13 +262,13 @@ bool MediaPlayerPrivateGStreamerBase::ensureGstGLContext()
m_glDisplay = GST_GL_DISPLAY(gst_gl_display_x11_new_with_display(downcast<PlatformDisplayX11>(sharedDisplay).native()));
#elif USE(EGL)
if (is<PlatformDisplayX11>(sharedDisplay))
m_glDisplay = GST_GL_DISPLAY(gst_gl_display_egl_new_with_egl_display(downcast<PlatformDisplayX11>(sharedDisplay).native()));
m_glDisplay = GST_GL_DISPLAY(gst_gl_display_egl_new_with_egl_display(downcast<PlatformDisplayX11>(sharedDisplay).eglDisplay()));
#endif
#endif

#if PLATFORM(WAYLAND)
if (is<PlatformDisplayWayland>(sharedDisplay))
m_glDisplay = GST_GL_DISPLAY(gst_gl_display_egl_new_with_egl_display(downcast<PlatformDisplayWayland>(sharedDisplay).native()));
m_glDisplay = GST_GL_DISPLAY(gst_gl_display_egl_new_with_egl_display(downcast<PlatformDisplayWayland>(sharedDisplay).eglDisplay()));
#endif

ASSERT(m_glDisplay);

0 comments on commit 52f2fff

Please sign in to comment.