feat(sdk): GlContext and GlSyncToken API

homuler · Oct 24, 2020 · 79b3e83 · 79b3e83
1 parent 3cfdcae
commit 79b3e83
Show file tree

Hide file tree

Showing 10 changed files with 105 additions and 2 deletions.
diff --git a/Assets/MediaPipe/SDK/Scripts/Gpu/GlContext.cs b/Assets/MediaPipe/SDK/Scripts/Gpu/GlContext.cs
@@ -0,0 +1,31 @@
+using System;
+
+using MpGlContext = System.IntPtr;
+
+namespace Mediapipe {
+  public class GlContext : ResourceHandle {
+    private bool _disposed = false;
+
+    public GlContext(MpGlContext ptr, bool isOwner = true) : base(ptr, isOwner) {}
+
+    protected override void Dispose(bool disposing) {
+      if (_disposed) return;
+
+      if (OwnsResource()) {
+        UnsafeNativeMethods.MpGlContextDestroy(ptr);
+      }
+
+      ptr = IntPtr.Zero;
+
+      _disposed = true;
+    }
+
+    public IntPtr Get() {
+      return UnsafeNativeMethods.MpGlContextGet(ptr);
+    }
+
+    public static GlContext GetCurrent() {
+      return new GlContext(UnsafeNativeMethods.MpGlContextGetCurrent());
+    }
+  }
+}
diff --git a/Assets/MediaPipe/SDK/Scripts/Gpu/GlContext.cs.meta b/Assets/MediaPipe/SDK/Scripts/Gpu/GlContext.cs.meta
diff --git a/Assets/MediaPipe/SDK/Scripts/Gpu/GlSyncToken.cs b/Assets/MediaPipe/SDK/Scripts/Gpu/GlSyncToken.cs
@@ -0,0 +1,39 @@
+using System;
+
+using MpGlSyncToken = System.IntPtr;
+
+namespace Mediapipe {
+  public class GlSyncToken : ResourceHandle {
+    private bool _disposed = false;
+
+    public GlSyncToken(MpGlSyncToken ptr, bool isOwner = true) : base(ptr, isOwner) {}
+
+    protected override void Dispose(bool disposing) {
+      if (_disposed) return;
+
+      if (OwnsResource()) {
+        UnsafeNativeMethods.MpGlSyncTokenDestroy(ptr);
+      }
+
+      ptr = IntPtr.Zero;
+
+      _disposed = true;
+    }
+
+    public void Wait() {
+      UnsafeNativeMethods.MpGlSyncTokenWait(ptr);
+    }
+
+    public void WaitOnGpu() {
+      UnsafeNativeMethods.MpGlSyncTokenWaitOnGpu(ptr);
+    }
+
+    public bool IsReady() {
+      return UnsafeNativeMethods.MpGlSyncTokenIsReady(ptr);
+    }
+
+    public GlContext GetContext() {
+      return new GlContext(UnsafeNativeMethods.MpGlSyncTokenGetContext(ptr));
+    }
+  }
+}
diff --git a/Assets/MediaPipe/SDK/Scripts/Gpu/GlSyncToken.cs.meta b/Assets/MediaPipe/SDK/Scripts/Gpu/GlSyncToken.cs.meta
diff --git a/Assets/MediaPipe/SDK/Scripts/UnsafeNativeMethods.cs b/Assets/MediaPipe/SDK/Scripts/UnsafeNativeMethods.cs
@@ -136,6 +136,9 @@ internal static class UnsafeNativeMethods {
 
 
     /// GlContext API
+    [DllImport (MediaPipeLibrary)]
+    public static extern unsafe void MpGlContextDestroy(MpGlContext glContext);
+
     [DllImport (MediaPipeLibrary)]
     public static extern unsafe MpGlContext MpGlContextGetCurrent();
 

diff --git a/C/mediapipe_api/gpu/BUILD b/C/mediapipe_api/gpu/BUILD
@@ -41,6 +41,7 @@ cc_library(
     srcs = ["gl_texture_buffer.cc"],
     hdrs = ["gl_texture_buffer.h"],
     deps = [
+        ":gl_context",
         "//mediapipe_api:common",
         "@com_google_mediapipe//mediapipe/gpu:gl_texture_buffer",
     ],

diff --git a/C/mediapipe_api/gpu/gl_context.cc b/C/mediapipe_api/gpu/gl_context.cc
@@ -1,5 +1,9 @@
 #include "mediapipe_api/gpu/gl_context.h"
 
+void MpGlContextDestroy(MpGlContext* gl_context) {
+  delete gl_context;
+}
+
 MpGlContext* MpGlContextGetCurrent() {
   return new MpGlContext { mediapipe::GlContext::GetCurrent() };
 }

diff --git a/C/mediapipe_api/gpu/gl_context.h b/C/mediapipe_api/gpu/gl_context.h
@@ -16,6 +16,7 @@ typedef struct MpGlSyncToken {
   std::shared_ptr<mediapipe::GlSyncPoint> impl;
 } MpGlSyncToken;
 
+MP_CAPI_EXPORT extern void MpGlContextDestroy(MpGlContext* gl_context);
 MP_CAPI_EXPORT extern MpGlContext* MpGlContextGetCurrent();
 MP_CAPI_EXPORT extern mediapipe::GlContext* MpGlContextGet(MpGlContext* gl_context);
 

diff --git a/C/mediapipe_api/gpu/gl_texture_buffer.cc b/C/mediapipe_api/gpu/gl_texture_buffer.cc
@@ -3,7 +3,8 @@
 MpGlTextureBuffer* MpGlTextureBufferCreate(GLenum target, GLuint name, int width, int height,
     uint32_t format_code, MpDeletionCallback* deletion_callback, mediapipe::GlContext* producer_context /* =nullptr */) {
   auto callback = [&deletion_callback](mediapipe::GlSyncToken token) -> void {
-    deletion_callback(token.get());
+    auto mpToken = new MpGlSyncToken { token };
+    deletion_callback(mpToken);
   };
   auto buffer = std::make_shared<mediapipe::GlTextureBuffer>(
     GL_TEXTURE_2D,

diff --git a/C/mediapipe_api/gpu/gl_texture_buffer.h b/C/mediapipe_api/gpu/gl_texture_buffer.h
@@ -5,14 +5,15 @@
 #include <utility>
 #include "mediapipe/gpu/gl_texture_buffer.h"
 #include "mediapipe_api/common.h"
+#include "mediapipe_api/gpu/gl_context.h"
 
 extern "C" {
 
 typedef struct MpGlTextureBuffer {
   std::shared_ptr<mediapipe::GlTextureBuffer> impl;
 } MpGlTextureBuffer;
 
-typedef void MpDeletionCallback(mediapipe::GlSyncPoint* gl_sync_point);
+typedef void MpDeletionCallback(MpGlSyncToken* gl_sync_token);
 
 MP_CAPI_EXPORT extern MpGlTextureBuffer* MpGlTextureBufferCreate(GLenum target, GLuint name, int width, int height,
     uint32_t format_code, MpDeletionCallback* deletion_callback, mediapipe::GlContext* producer_context = nullptr);