commit f6f3a0cf3a8d277295243e21a8d3204f0c428809
author Jonas Larsson <ljonas@google.com> Thu Dec 26 16:04:12 2019 -0800
committer Jonas Larsson <ljonas@google.com> Thu Dec 26 16:04:12 2019 -0800
tree cde54ea9b8ab5fe718bef6a012db663d6256b3b9
parent ccfbf11dc3065e3aa4e5d2d30cd4beeb1b27a429

glmemorydma: wait for completion with gst_gl_sync_meta_wait_cpu

Required on Columbia. Its blitter is different from Enterprise and
uses a different code path under the hood. NOP on Enterprise.

Change-Id: I2738a20cc07b996f7f3da55d8f553c1c904583a6

gst-libs/gst/gl/gstglmemorydma.c

diff --git a/gst-libs/gst/gl/gstglmemorydma.c b/gst-libs/gst/gl/gstglmemorydma.c
index 566d77b..79b109b 100644
--- a/gst-libs/gst/gl/gstglmemorydma.c
+++ b/gst-libs/gst/gl/gstglmemorydma.c
@@ -253,15 +253,18 @@
   GstBuffer *buf;
   GstGLMemoryDMA *glmem;
   GstGLSyncMeta *sync_meta;
+  GstClockTime ts;
 
   sync_meta = gst_buffer_get_gl_sync_meta (glbuf);
-  if (!sync_meta) {
-    GstClockTime ts = gst_util_get_timestamp ();
+  ts = gst_util_get_timestamp ();
+  if (sync_meta) {
+    gst_gl_sync_meta_wait_cpu (sync_meta, ctx);
+  } else {
     gst_gl_context_thread_add (ctx, (GstGLContextThreadFunc) _finish_texture, NULL);
-    ts = gst_util_get_timestamp () - ts;
-    GST_CAT_DEBUG (GST_CAT_GL_DMA_MEMORY,
-        "glFinish %.2g ms", (double) ts / GST_MSECOND);
   }
+  ts = gst_util_get_timestamp () - ts;
+  GST_CAT_DEBUG (GST_CAT_GL_DMA_MEMORY, "%s %.2g ms",
+      sync_meta ? "wait_cpu" : "glFinish", (double) ts / GST_MSECOND);
 
   glmem = gst_buffer_peek_memory (glbuf, 0);