Fix UTF8Marshaler for FFmpeg.AutoGen (#248)

Co-authored-by: Ruslan Balanukhin <[email protected]>
Ruslan-B · Mar 16, 2023 · 91b5ebe · 91b5ebe
1 parent 046fe44
commit 91b5ebe
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <PackageId>$(AssemblyName)</PackageId>
-    <Version>5.1.2</Version>
+    <Version>5.1.2.1</Version>
     <Authors>Ruslan Balanukhin</Authors>
     <Company>Rationale One</Company>
     <Product>FFmpeg.AutoGen</Product>

diff --git a/FFmpeg.AutoGen/UTF8Marshaler.cs b/FFmpeg.AutoGen/UTF8Marshaler.cs
@@ -6,13 +6,15 @@ namespace FFmpeg.AutoGen;
 
 public class UTF8Marshaler : ICustomMarshaler
 {
+    private static readonly UTF8Marshaler Instance = new();
+
     public virtual object MarshalNativeToManaged(IntPtr pNativeData) => FromNative(Encoding.UTF8, pNativeData);
 
     public virtual IntPtr MarshalManagedToNative(object managedObj)
     {
         if (managedObj == null)
             return IntPtr.Zero;
-        
+
         if (managedObj is not string str)
             throw new MarshalDirectiveException($"{GetType().Name} must be used on a string.");
 
@@ -35,7 +37,9 @@ public void CleanUpManagedData(object managedObj)
     }
 
     public int GetNativeDataSize() => -1; // Not a value type
-
+
+    public static ICustomMarshaler GetInstance(string cookie) => Instance;
+
     public static unsafe string FromNative(Encoding encoding, IntPtr pNativeData) => FromNative(encoding, (byte*)pNativeData);
 
     public static unsafe string FromNative(Encoding encoding, byte* pNativeData)