commit 703f28a3b9e40ebf9558a936feb82e52354640df
author Haihua Hu <jared.hu@nxp.com> Mon Apr 23 12:38:38 2018 +0800
committer Lyon Wang <lyon.wang@nxp.com> Wed Dec 19 16:18:10 2018 +0800
tree 4c1080c607f2d12b6ecd9bf15dffe4d7a56ea273
parent 530a7941e9cfc29a9b6b518e03a35ac6d15fd533

MMFMWK-7954 waylandsink: pass dmabuf modifier to weston

upstream status: imx specific

ext/wayland/gstwaylandsink.c

diff --git a/ext/wayland/gstwaylandsink.c b/ext/wayland/gstwaylandsink.c
index 0322190..449737e 100644
--- a/ext/wayland/gstwaylandsink.c
+++ b/ext/wayland/gstwaylandsink.c
@@ -50,6 +50,10 @@
 #include <gst/wayland/wayland.h>
 #include <gst/video/videooverlay.h>
 
+#include <drm_fourcc.h>
+#include <xf86drm.h>
+#include <xf86drmMode.h>
+
 /* signals */
 enum
 {
@@ -587,9 +591,13 @@
   GstBufferPool *pool = NULL;
   gboolean need_pool;
   GstAllocator *alloc;
+  guint64 drm_modifier;
 
   gst_query_parse_allocation (query, &caps, &need_pool);
 
+  drm_modifier = DRM_FORMAT_MOD_AMPHION_TILED;
+  gst_query_add_allocation_dmabuf_meta (query, drm_modifier);
+
   if (need_pool)
     pool = gst_wayland_create_pool (sink, caps);
 

ext/wayland/wllinuxdmabuf.c

diff --git a/ext/wayland/wllinuxdmabuf.c b/ext/wayland/wllinuxdmabuf.c
index 96487d1..5314c5e 100644
--- a/ext/wayland/wllinuxdmabuf.c
+++ b/ext/wayland/wllinuxdmabuf.c
@@ -24,6 +24,7 @@
 #endif
 
 #include <gst/allocators/gstdmabuf.h>
+#include <gst/allocators/gstdmabufmeta.h>
 
 #include "wllinuxdmabuf.h"
 #include "wlvideoformat.h"
@@ -79,6 +80,8 @@
   struct zwp_linux_buffer_params_v1 *params;
   gint64 timeout;
   ConstructBufferData data;
+  GstDmabufMeta *dmabuf_meta;
+  gint64 drm_modifier = 0;
 
   g_return_val_if_fail (gst_wl_display_check_format_for_dmabuf (display,
           GST_VIDEO_INFO_FORMAT (info)), NULL);
@@ -94,6 +97,10 @@
   height = GST_VIDEO_INFO_HEIGHT (info);
   nplanes = GST_VIDEO_INFO_N_PLANES (info);
 
+  dmabuf_meta = gst_buffer_get_dmabuf_meta (buf);
+  if (dmabuf_meta)
+    drm_modifier = dmabuf_meta->drm_modifier;
+
   GST_DEBUG_OBJECT (display, "Creating wl_buffer from DMABuf of size %"
       G_GSSIZE_FORMAT " (%d x %d), format %s", info->size, width, height,
       gst_wl_dmabuf_format_to_string (format));
@@ -111,7 +118,7 @@
       GstMemory *m = gst_buffer_peek_memory (buf, mem_idx);
       gint fd = gst_dmabuf_memory_get_fd (m);
       zwp_linux_buffer_params_v1_add (params, fd, i, m->offset + skip,
-          stride, 0, 0);
+          stride, drm_modifier >> 32, drm_modifier & 0xffffffff);
     } else {
       GST_ERROR_OBJECT (mem->allocator, "memory does not seem to contain "
           "enough data for the specified format");