mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-03 14:08:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

wlvideoformat: Fix sign issue for DRM fourcc

Browse source 
DRM fourcc ared defined as 32bit unsigned in, but the format helper was passing
an int, while using a unsigned int internally. This is a API/ABI break, but
the API is still unstable.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3801>
This commit is contained in:
Nicolas Dufresne 2023-02-17 09:42:42 -05:00 committed by GStreamer Marge Bot
parent 6ce1b484fd
commit a961838b0a
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
subprojects/gst-plugins-bad/gst-libs/gst/wayland/gstwldisplay.c
View file

@ -226,7 +226,7 @@ gst_wl_display_check_format_for_dmabuf (GstWlDisplay * self,
return FALSE; return FALSE;
dmabuf_fmt = gst_video_format_to_wl_dmabuf_format (format); dmabuf_fmt = gst_video_format_to_wl_dmabuf_format (format);
if (dmabuf_fmt == (guint) - 1) if (!dmabuf_fmt)
return FALSE; return FALSE;
formats = priv->dmabuf_formats; formats = priv->dmabuf_formats;

4
subprojects/gst-plugins-bad/gst-libs/gst/wayland/gstwllinuxdmabuf.c
View file

@ -175,8 +175,8 @@ out:
GST_ERROR_OBJECT (mem->allocator, "can't create linux-dmabuf buffer"); GST_ERROR_OBJECT (mem->allocator, "can't create linux-dmabuf buffer");
} else { } else {
GST_DEBUG_OBJECT (mem->allocator, "created linux_dmabuf wl_buffer (%p):" GST_DEBUG_OBJECT (mem->allocator, "created linux_dmabuf wl_buffer (%p):"
"%dx%d, fmt=%.4s, %d planes", "%dx%d, fmt=%" GST_FOURCC_FORMAT ", %d planes",
data.wbuf, width, height, (char *) &format, nplanes); data.wbuf, width, height, GST_FOURCC_ARGS (format), nplanes);
} }
g_mutex_unlock (&data.lock); g_mutex_unlock (&data.lock);

6
subprojects/gst-plugins-bad/gst-libs/gst/wayland/gstwlvideoformat.c
View file

@ -48,7 +48,7 @@ gst_wl_videoformat_init_once (void)
typedef struct typedef struct
{ {
enum wl_shm_format wl_shm_format; enum wl_shm_format wl_shm_format;
guint dma_format; guint32 dma_format;
GstVideoFormat gst_format; GstVideoFormat gst_format;
} wl_VideoFormat; } wl_VideoFormat;
@ -96,7 +96,7 @@ gst_video_format_to_wl_shm_format (GstVideoFormat format)
return -1; return -1;
} }
gint guint32
gst_video_format_to_wl_dmabuf_format (GstVideoFormat format) gst_video_format_to_wl_dmabuf_format (GstVideoFormat format)
{ {
guint i; guint i;
@ -106,7 +106,7 @@ gst_video_format_to_wl_dmabuf_format (GstVideoFormat format)
return wl_formats[i].dma_format; return wl_formats[i].dma_format;
GST_WARNING ("wayland dmabuf video format not found"); GST_WARNING ("wayland dmabuf video format not found");
return -1; return 0;
} }
GstVideoFormat GstVideoFormat

2
subprojects/gst-plugins-bad/gst-libs/gst/wayland/gstwlvideoformat.h
View file

@ -36,7 +36,7 @@ GST_WL_API
enum wl_shm_format gst_video_format_to_wl_shm_format (GstVideoFormat format); enum wl_shm_format gst_video_format_to_wl_shm_format (GstVideoFormat format);
GST_WL_API GST_WL_API
gint gst_video_format_to_wl_dmabuf_format (GstVideoFormat format); guint32 gst_video_format_to_wl_dmabuf_format (GstVideoFormat format);
GST_WL_API GST_WL_API
GstVideoFormat gst_wl_shm_format_to_video_format (enum wl_shm_format wl_format); GstVideoFormat gst_wl_shm_format_to_video_format (enum wl_shm_format wl_format);