commit 1c6816d5bb0ee5618f093623dabc0f1bdd985ede
author Jonas Larsson <ljonas@google.com> Tue Jun 02 10:56:54 2020 -0700
committer Jonas Larsson <ljonas@google.com> Wed Jun 03 12:05:44 2020 -0700
tree b453f6efc3ffe29016ff79eae1e61fdbb13e3089
parent 48cafd291b975fd5012b19845cc7b2a5830ffe89

gldownloadelement: fix export of odd width textures

New GPU driver changed the default stride calculations when resolving
textures to external surfaces. To get tightly packed RGB out of i.MX8MQ we
now must specify the stride value explicitly.

BUG: 157921487
Change-Id: I0ef6bf1cfc3230ff8a4097e6db0766f04a100f53

ext/gl/gstgldownloadelement.c

diff --git a/ext/gl/gstgldownloadelement.c b/ext/gl/gstgldownloadelement.c
index 31bf814..053da30 100644
--- a/ext/gl/gstgldownloadelement.c
+++ b/ext/gl/gstgldownloadelement.c
@@ -750,6 +750,11 @@
   params.align = blitter ? 0 : 127;
   alignment.stride_align[0] = params.align;
   gst_video_info_align (&dl->export_info, &alignment);
+  if (blitter) {
+    /* Always tightly pack. */
+    dl->export_info.stride[0] = dl->export_info.width *
+        GST_VIDEO_FORMAT_INFO_PSTRIDE (dl->export_info.finfo, 0);
+  }
   export_caps = gst_video_info_to_caps (&dl->export_info);
   GST_DEBUG_OBJECT (dl, "export_caps %" GST_PTR_FORMAT, export_caps);
   GST_DEBUG_OBJECT (dl, "src_caps %" GST_PTR_FORMAT, src_caps);
@@ -760,8 +765,6 @@
   gst_buffer_pool_config_set_params (config, export_caps,
       dl->export_info.size, 0, 3);
   gst_buffer_pool_config_add_option (config,
-      GST_BUFFER_POOL_OPTION_VIDEO_META);
-  gst_buffer_pool_config_add_option (config,
     GST_BUFFER_POOL_OPTION_VIDEO_ALIGNMENT);
   gst_buffer_pool_config_set_video_alignment (config, &alignment);
   gst_buffer_pool_config_set_allocator (config,
@@ -866,6 +869,7 @@
   GstMemory *memory = gst_buffer_peek_memory (inbuf, 0);
   GstGLContext *context = GST_GL_BASE_MEMORY_CAST (memory)->context;
   GstBuffer *export_buf = NULL, *src_buf = NULL, *outbuf = NULL;
+  GstVideoMeta *export_meta = NULL;
   GstGLColorConvert *glconverter = NULL;
   struct ExportParams params = { 0 };
 
@@ -960,6 +964,18 @@
     goto beach;
   }
 
+  /* If we're packing RGB data more tightly than GStreamer normally does
+     we must manually set our stride on the meta. */
+  export_meta = gst_buffer_get_video_meta (export_buf);
+  if (G_LIKELY (!export_meta)) {
+    gst_buffer_add_video_meta_full (export_buf, GST_VIDEO_FRAME_FLAG_NONE,
+        dl->export_info.finfo->format, dl->export_info.width,
+        dl->export_info.height, dl->export_info.finfo->n_planes,
+        dl->export_info.offset, dl->export_info.stride);
+  } else {
+    export_meta->stride[0] = dl->export_info.stride[0];
+  }
+
   if (dl->converter) {
     GstVideoFrame in_frame, out_frame;
     GstClockTime ts;