[gtk/matthiasc/gl-media-stream] Revert "Only force GL if we're using a GL renderer"
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/matthiasc/gl-media-stream] Revert "Only force GL if we're using a GL renderer"
- Date: Sat, 2 Jan 2021 06:43:33 +0000 (UTC)
commit 2b764b9d8cc977beba981ebc9e7fe5d813876767
Author: Matthias Clasen <mclasen redhat com>
Date: Sat Jan 2 01:41:30 2021 -0500
Revert "Only force GL if we're using a GL renderer"
This reverts commit 87eff5090ff8e8585fca4839985c3cf4542dbe57.
When using gst-vaapi, it turns out that conversion to RGBA
is broken in vaapipostproc, so we are better off going the
GL route and downloading the texture in the end (since the
gstreamer gl elements succeed in converting the content
to RGBA).
modules/media/gtkgstpaintable.c | 16 +---------------
1 file changed, 1 insertion(+), 15 deletions(-)
---
diff --git a/modules/media/gtkgstpaintable.c b/modules/media/gtkgstpaintable.c
index 470a5f59e4..fcc5a4f1d2 100644
--- a/modules/media/gtkgstpaintable.c
+++ b/modules/media/gtkgstpaintable.c
@@ -20,11 +20,10 @@
#include "config.h"
#include "gtkgstpaintableprivate.h"
+
#include "gtkgstsinkprivate.h"
-#include <gtk/gtk.h>
#include <gst/player/gstplayer-video-renderer.h>
-#include <gsk/gl/gskglrenderer.h>
#include <math.h>
@@ -123,9 +122,6 @@ gtk_gst_paintable_video_renderer_create_video_sink (GstPlayerVideoRenderer *rend
"gl-context", self->context,
NULL);
- if (self->context == NULL)
- return sink;
-
glsinkbin = gst_element_factory_make ("glsinkbin", NULL);
g_object_set (glsinkbin, "sink", sink, NULL);
@@ -179,20 +175,10 @@ gtk_gst_paintable_realize (GtkGstPaintable *self,
GdkSurface *surface)
{
GError *error = NULL;
- GtkNative *native;
- GskRenderer *renderer;
if (self->context)
return;
- native = gtk_native_get_for_surface (surface);
- renderer = gtk_native_get_renderer (native);
- if (!GSK_IS_GL_RENDERER (renderer))
- {
- GST_INFO ("not using GL with a %s renderer\n", G_OBJECT_TYPE_NAME (renderer));
- return;
- }
-
self->context = gdk_surface_create_gl_context (surface, &error);
if (self->context == NULL)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]