Fixed tfm compatibility in AVFoundation related fragments.

Made build completion in linux environment.

Author: kekyo

Directory.Build.props

@@ -4,7 +4,6 @@
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
     <PlatformTarget>AnyCPU</PlatformTarget>
-    <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
 
     <DebugSymbols>true</DebugSymbols>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -19,7 +18,7 @@
     <RootNamespace>FlashCap</RootNamespace>
     <ProduceReferenceAssembly>false</ProduceReferenceAssembly>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <NoWarn>$(NoWarn);CS1570;CS1591;CA1416;CS8981</NoWarn>
+    <NoWarn>$(NoWarn);CS1570;CS1591;CA1416;CS8981;NETSDK1215</NoWarn>
 
     <Product>FlashCap</Product>
     <Trademark>FlashCap</Trademark>

FlashCap.Core/Devices/AVFoundationDevice.cs

@@ -63,15 +63,15 @@ protected override Task OnInitializeAsync(VideoCharacteristics characteristics,
                 $"FlashCap: Couldn't set video format: UniqueID={this.uniqueID}");
         }
 
-        this.bitmapHeader = NativeMethods.AllocateMemory(new IntPtr(Marshal.SizeOf<BITMAPINFOHEADER>()));
+        this.bitmapHeader = NativeMethods.AllocateMemory(new IntPtr(MarshalEx.SizeOf<BITMAPINFOHEADER>()));
 
         try
         {
             unsafe
             {
                 var pBih = (BITMAPINFOHEADER*)this.bitmapHeader.ToPointer();
 
-                pBih->biSize = sizeof(NativeMethods.BITMAPINFOHEADER);
+                pBih->biSize = MarshalEx.SizeOf<BITMAPINFOHEADER>();
                 pBih->biCompression = compression;
                 pBih->biPlanes = 1;
                 pBih->biBitCount = bitCount;
@@ -135,19 +135,19 @@ format.FormatDescription.Dimensions is var dimensions &&
             throw new Exception("Can't add video output");
         }
 
-        return Task.CompletedTask;
+        return TaskCompat.CompletedTask;
     }
 
     protected override Task OnStartAsync(CancellationToken ct)
     {
         this.session?.StartRunning();
-        return Task.CompletedTask;
+        return TaskCompat.CompletedTask;
     }
 
     protected override Task OnStopAsync(CancellationToken ct)
     {
         this.session?.StopRunning();
-        return Task.CompletedTask;
+        return TaskCompat.CompletedTask;
     }
 
     protected override void OnCapture(IntPtr pData, int size, long timestampMicroseconds, long frameIndex, PixelBuffer buffer)
@@ -201,8 +201,6 @@ public void CaptureOutputCallback(IntPtr self, IntPtr _cmd, IntPtr output, IntPt
                     CVPixelBufferUnlockBaseAddress(pixelBuffer, PixelBufferLockFlags.ReadOnly);
                 }
             }
-            
         }
-        
     }
 }

FlashCap.Core/Internal/BackwardCompat.cs

@@ -11,6 +11,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
 
 #if NET35 || NET40 || NET45
 namespace System
@@ -28,6 +29,29 @@ private static class EmptyArray<T>
         public static T[] Empty<T>() =>
             EmptyArray<T>.Empty;
     }
+
+    namespace Text
+    {
+        internal static class EncodingEx
+        {
+            public static unsafe string GetString(
+                this Encoding encoding, byte* bytes, int byteCount)
+            {
+                var stringData = new byte[byteCount];
+                Marshal.Copy((IntPtr)bytes, stringData, 0, stringData.Length);
+                return Encoding.UTF8.GetString(stringData);
+            }
+        }
+    }
+
+    namespace Runtime.InteropServices
+    {
+        internal static class MarshalEx
+        {
+            public static int SizeOf<T>() =>
+                Marshal.SizeOf(typeof(T));
+        }
+    }
 }
 #else
 namespace System
@@ -40,6 +64,15 @@ internal static class ArrayEx
         public static T[] Empty<T>() =>
             Array.Empty<T>();
     }
+
+    namespace Runtime.InteropServices
+    {
+        internal static class MarshalEx
+        {
+            public static int SizeOf<T>() =>
+                Marshal.SizeOf<T>();
+        }
+    }
 }
 #endif
 

FlashCap.Core/Internal/NativeMethods_AVFoundation.cs

@@ -241,9 +241,9 @@ public struct BlockDescriptor
             public static IntPtr Create(string signature, Delegate target, BlockLiteralCopy copy, BlockLiteralDispose dispose)
             {
                 var signatureBytes = Encoding.UTF8.GetBytes(signature);
-                var descriptorSize = Marshal.SizeOf<BlockDescriptor>();
+                var descriptorSize = MarshalEx.SizeOf<BlockDescriptor>();
 
-                var memory = Marshal.AllocHGlobal(descriptorSize + signatureBytes.Length);
+                nint memory = Marshal.AllocHGlobal(descriptorSize + signatureBytes.Length);
                 var memoryToSignature = memory + descriptorSize;
 
                 Marshal.Copy(signatureBytes, startIndex: 0, memoryToSignature, length: 0);
@@ -252,7 +252,7 @@ public static IntPtr Create(string signature, Delegate target, BlockLiteralCopy
                 {
                     var descriptor = (BlockDescriptor*)memory;
 
-                    descriptor->Size = new IntPtr(Marshal.SizeOf<BlockLiteral>());
+                    descriptor->Size = new IntPtr(MarshalEx.SizeOf<BlockLiteral>());
                     descriptor->Copy = Marshal.GetFunctionPointerForDelegate(copy);
                     descriptor->Dispose = Marshal.GetFunctionPointerForDelegate(dispose);
                     descriptor->Signature = memoryToSignature;
@@ -514,7 +514,7 @@ public static unsafe T[] ToArray<T>(IntPtr handle, Func<IntPtr, T> constructor)
             {
                 var count = CFArrayGetCount(handle).ToInt32();
                 if (count == 0)
-                    return Array.Empty<T>();
+                    return ArrayEx.Empty<T>();
 
                 var buffer = new IntPtr[count];