AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-13 22:10:08 +00:00
Code Issues Projects Releases Wiki Activity

Revert "gstreamer: Add more debug spew"

Browse Source 
This reverts commit 67e50a6cfd.
This commit is contained in:
Matthias Clasen 2024-02-07 15:26:08 -05:00
parent da36a6a5d2
commit b885d288cc
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/media/gtkgstsink.c
View File

@ -156,7 +156,8 @@ add_drm_formats_and_modifiers (GstCaps *caps,
gst_value_list_append_and_take_value (&dmabuf_list, &value); gst_value_list_append_and_take_value (&dmabuf_list, &value);
} }
gst_structure_take_value (gst_caps_get_structure (caps, 0), "drm-format", &dmabuf_list); gst_structure_take_value (gst_caps_get_structure (caps, 0), "drm-format",
&dmabuf_list);
} }
#endif #endif
@ -370,7 +371,6 @@ gtk_gst_sink_texture_from_buffer (GtkGstSink *self,
g_autoptr (GdkDmabufTextureBuilder) builder = NULL; g_autoptr (GdkDmabufTextureBuilder) builder = NULL;
const GstVideoMeta *vmeta = gst_buffer_get_video_meta (buffer); const GstVideoMeta *vmeta = gst_buffer_get_video_meta (buffer);
GError *error = NULL; GError *error = NULL;
GdkDisplay *display;
int i; int i;
/* We don't map dmabufs */ /* We don't map dmabufs */
@ -380,17 +380,8 @@ gtk_gst_sink_texture_from_buffer (GtkGstSink *self,
g_return_val_if_fail (self->gdk_context, NULL); g_return_val_if_fail (self->gdk_context, NULL);
g_return_val_if_fail (self->drm_info.drm_fourcc != DRM_FORMAT_INVALID, NULL); g_return_val_if_fail (self->drm_info.drm_fourcc != DRM_FORMAT_INVALID, NULL);
display = gdk_gl_context_get_display (self->gdk_context);
GDK_DISPLAY_DEBUG (display, DMABUF,
"Got %dx%d dmabuf from gstreamer, format %.4s:%#" G_GINT64_MODIFIER "x, %d planes",
GSK_VIDEO_INFO_WIDTH (&self->v_info),
GSK_VIDEO_INFO_HEIGHT (&self->v_info),
(char *) self->drm_info.drm_fourcc, self->drm_info.drm_modifier,
vmeta->n_planes);
builder = gdk_dmabuf_texture_builder_new (); builder = gdk_dmabuf_texture_builder_new ();
gdk_dmabuf_texture_builder_set_display (builder, display); gdk_dmabuf_texture_builder_set_display (builder, gdk_gl_context_get_display (self->gdk_context));
gdk_dmabuf_texture_builder_set_fourcc (builder, self->drm_info.drm_fourcc); gdk_dmabuf_texture_builder_set_fourcc (builder, self->drm_info.drm_fourcc);
gdk_dmabuf_texture_builder_set_modifier (builder, self->drm_info.drm_modifier); gdk_dmabuf_texture_builder_set_modifier (builder, self->drm_info.drm_modifier);
// Padded width/height is set into the vmeta, perhaps we should import using these ? // Padded width/height is set into the vmeta, perhaps we should import using these ?