[ARC-237] Add Muxer that complements Seek Head and Cues information (#47

) * WIP: working but need review * Review fixes * Update XmfMuxer.h * remove printf
Devolutions · Jul 17, 2024 · 28a632e · 28a632e
1 parent dfacabe
commit 28a632e
Show file tree

Hide file tree

Showing 5 changed files with 560 additions and 4 deletions.
diff --git a/dotnet/Devolutions.Cadeau.Test/Program.cs b/dotnet/Devolutions.Cadeau.Test/Program.cs
@@ -562,16 +562,29 @@ static void TestStreamingV3()
             streamer.Disconnect();
         }
 
+        static void TestMuxer() {
+            XmfMuxer muxer = new XmfMuxer();
+            string currentDir = Directory.GetCurrentDirectory();
+            string rootDir = Directory.GetParent(currentDir).Parent.FullName;
+            string mediaDir = Path.Combine(rootDir, "media");
+            string mediaFile = Path.Combine(mediaDir, "non-seekable-3.webm");
+            string outputFile = mediaFile.Replace(".webm", "-muxed.webm");
+            Console.WriteLine("media dir: {0}", mediaDir);
+            Console.WriteLine("output file: {0}", outputFile);
+            muxer.Remux(mediaFile, outputFile);
+            muxer.Free();
+        }
         static void Main(string[] args)
         {
             //TestRecorder();
             //TestBipBuffer();
             //TestMkvStream();
             //TestImageFile();
-            //TestTranscode();
+            // TestTranscode();
             //TestWebSocket();
             //TestStreaming();
-            TestStreamingV3();
+            //TestStreamingV3();
+            TestMuxer();
         }
     }
 }
diff --git a/dotnet/Devolutions.Cadeau/XmfMuxer.cs b/dotnet/Devolutions.Cadeau/XmfMuxer.cs
@@ -0,0 +1,44 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace Devolutions.Cadeau
+{
+    public class XmfMuxer
+    {
+        private IntPtr muxerHandle;
+
+        private static class ffi
+        {
+            [DllImport("xmf", EntryPoint = "XmfWebMMuxer_New")]
+            public static extern IntPtr New();
+
+            [DllImport("xmf", EntryPoint = "XmfWebMMuxer_Remux")]
+            public static extern int Remux(IntPtr muxer, [MarshalAs(UnmanagedType.LPStr)] string inputPath, [MarshalAs(UnmanagedType.LPStr)] string outputPath);
+
+            [DllImport("xmf", EntryPoint = "XmfWebMMuxer_Free")]
+            public static extern void Free(IntPtr muxer);
+        }
+
+        public IntPtr Handle => muxerHandle;
+
+        public XmfMuxer()
+        {
+            muxerHandle = ffi.New();
+        }
+
+        ~XmfMuxer()
+        {
+            ffi.Free(muxerHandle);
+        }
+
+        public int Remux(string inputPath, string outputPath)
+        {
+            return ffi.Remux(muxerHandle, inputPath, outputPath);
+        }
+
+        public void Cleanup()
+        {
+            ffi.Free(muxerHandle);
+        }
+    }
+}
diff --git a/libxmf/CMakeLists.txt b/libxmf/CMakeLists.txt
@@ -12,7 +12,9 @@ set(${MODULE_PREFIX}_SOURCES
     XmfBipBuffer.c
     XmfMkvWriter.c
     XmfNamedPipe.c
-    XmfRecorder.c)
+    XmfRecorder.c
+    XmfMuxer.cpp
+    )
 
 set(${MODULE_PREFIX}_HEADERS
     XmfMath.h
@@ -26,7 +28,9 @@ set(${MODULE_PREFIX}_HEADERS
     XmfBipBuffer.h
     XmfMkvWriter.h
     XmfNamedPipe.h
-    XmfRecorder.h)
+    XmfRecorder.h
+    XmfMuxer.h
+    )
 
 set(${MODULE_PREFIX}_RESOURCES "")