Merge branch 'feature/132-2' into develop

kekyo · kekyo · commit facf83773ceb · 2024-04-12T10:25:28.000+09:00
diff --git a/FlashCap.Core/Internal/IndependentSingleApartmentContext.cs b/FlashCap.Core/Internal/IndependentSingleApartmentContext.cs
@@ -120,7 +120,7 @@ public IndependentSingleApartmentContext()
         this.thread.SetApartmentState(ApartmentState.STA);   // Improved compatibility
         this.thread.Start();
 
-        this.ready.Wait();
+        this.ready!.Wait();
         this.ready.Dispose();
         this.ready = null;
     }
diff --git a/FlashCap.Core/Internal/V4L2/NativeMethods_V4L2_Interop.cs b/FlashCap.Core/Internal/V4L2/NativeMethods_V4L2_Interop.cs
diff --git a/FlashCap.Core/Internal/V4L2/NativeMethods_V4L2_Interop_i686.cs b/FlashCap.Core/Internal/V4L2/NativeMethods_V4L2_Interop_i686.cs
diff --git a/FlashCap.Core/Internal/V4L2/NativeMethods_V4L2_Interop_loongarch64.cs b/FlashCap.Core/Internal/V4L2/NativeMethods_V4L2_Interop_loongarch64.cs
@@ -189,6 +189,13 @@ public uint reserved2
                 set => this.reserved2_ = (uint)value;
             }
 
+            [FieldOffset(80)] private int request_fd_;
+            public int request_fd
+            {
+                get => this.request_fd_;
+                set => this.request_fd_ = (int)value;
+            }
+
             [FieldOffset(80)] private uint reserved_;
             public uint reserved
             {
@@ -312,11 +319,18 @@ public uint pixelformat
                 set => this.pixelformat_ = (uint)value;
             }
 
-            [FieldOffset(48)] private fixed uint reserved_[4];
+            [FieldOffset(48)] private uint mbus_code_;
+            public uint mbus_code
+            {
+                get => this.mbus_code_;
+                set => this.mbus_code_ = (uint)value;
+            }
+
+            [FieldOffset(52)] private fixed uint reserved_[3];
             public uint[] reserved
             {
-                get { fixed (uint* p = this.reserved_) { return get(p, 4); } }
-                set { fixed (uint* p = this.reserved_) { set(p, value, 4); } }
+                get { fixed (uint* p = this.reserved_) { return get(p, 3); } }
+                set { fixed (uint* p = this.reserved_) { set(p, value, 3); } }
             }
 
         }
@@ -970,11 +984,18 @@ public uint memory
                 set => this.memory_ = (uint)value;
             }
 
-            [FieldOffset(12)] private fixed uint reserved_[2];
+            [FieldOffset(12)] private uint capabilities_;
+            public uint capabilities
+            {
+                get => this.capabilities_;
+                set => this.capabilities_ = (uint)value;
+            }
+
+            [FieldOffset(16)] private fixed uint reserved_[1];
             public uint[] reserved
             {
-                get { fixed (uint* p = this.reserved_) { return get(p, 2); } }
-                set { fixed (uint* p = this.reserved_) { set(p, value, 2); } }
+                get { fixed (uint* p = this.reserved_) { return get(p, 1); } }
+                set { fixed (uint* p = this.reserved_) { set(p, value, 1); } }
             }
 
         }
diff --git a/FlashCap.Core/Internal/V4L2/NativeMethods_V4L2_Interop_x86_64.cs b/FlashCap.Core/Internal/V4L2/NativeMethods_V4L2_Interop_x86_64.cs
diff --git a/FlashCap.V4L2Generator/.gitignore b/FlashCap.V4L2Generator/.gitignore
@@ -0,0 +1,5 @@
+*.json
+videodev2.dumper*
+*_version.txt
+NativeMethods_V4L2_Interop.cs
+
diff --git a/FlashCap.V4L2Generator/Program.cs b/FlashCap.V4L2Generator/Program.cs
@@ -64,30 +64,6 @@ public SymbolName(string name, bool withComment = false)
         private static readonly HashSet<string> symbolExactIncludeList =
             new HashSet<string>()
         {
-            "V4L2_CAP_VIDEO_CAPTURE",
-            "V4L2_PIX_FMT_ABGR32",
-            "V4L2_PIX_FMT_ARGB32",
-            "V4L2_PIX_FMT_JPEG",
-            "V4L2_PIX_FMT_MJPEG",
-            "V4L2_PIX_FMT_RGB24",
-            "V4L2_PIX_FMT_RGB332",
-            "V4L2_PIX_FMT_RGB565X",
-            "V4L2_PIX_FMT_RGB565",
-            "V4L2_PIX_FMT_UYVY",
-            "V4L2_PIX_FMT_XRGB32",
-            "V4L2_PIX_FMT_YUYV",
-            "V4L2_PIX_FMT_NV12",
-            "VIDIOC_DQBUF",
-            "VIDIOC_ENUM_FMT",
-            "VIDIOC_ENUM_FRAMEINTERVALS",
-            "VIDIOC_ENUM_FRAMESIZES",
-            "VIDIOC_QBUF",
-            "VIDIOC_QUERYBUF",
-            "VIDIOC_QUERYCAP",
-            "VIDIOC_REQBUFS",
-            "VIDIOC_S_FMT",
-            "VIDIOC_STREAMOFF",
-            "VIDIOC_STREAMON",
             "v4l2_buf_type",
             "v4l2_field",
             "v4l2_frmivaltypes",
@@ -196,7 +172,9 @@ private static void GenerateStructureDumper(
             string sourceHeaderFileName,
             string clangAstJsonFileName,
             string dumperFileName,
-            string architecture)
+            string architecture,
+            string clangVersion,
+            string gccVersion)
         {
             var versionLabel = LoadVersionLabel();
             
@@ -244,6 +222,8 @@ private static void GenerateStructureDumper(
             {
                 tw.WriteLine($"// This is auto generated code by FlashCap.V4L2Generator [{ThisAssembly.AssemblyVersion}]. Do not edit.");
                 tw.WriteLine($"// {versionLabel}");
+                tw.WriteLine($"// {clangVersion.Replace("\r", "").Replace("\n", "")}");
+                tw.WriteLine($"// {gccVersion.Replace("\r", "").Replace("\n", "")}");
                 tw.WriteLine($"// {DateTimeOffset.Now:R}");
                 tw.WriteLine();
                 
@@ -261,6 +241,8 @@ private static void GenerateStructureDumper(
                 tw.WriteLine();
                 tw.WriteLine("  printf(\"  \\\"label\\\": \\\"{0}\\\",\\n\");", versionLabel);
                 tw.WriteLine("  printf(\"  \\\"architecture\\\": \\\"{0}\\\",\\n\");", architecture);
+                tw.WriteLine("  printf(\"  \\\"clangVersion\\\": \\\"{0}\\\",\\n\");", clangVersion);
+                tw.WriteLine("  printf(\"  \\\"gccVersion\\\": \\\"{0}\\\",\\n\");", gccVersion);
                 tw.WriteLine("  printf(\"  \\\"sizeof_size_t\\\": %d,\\n\", (int)sizeof(size_t));");
                 tw.WriteLine("  printf(\"  \\\"sizeof_off_t\\\": %d,\\n\", (int)sizeof(off_t));");
                 tw.WriteLine();
@@ -424,6 +406,8 @@ private static void GenerateInteropCode(
             {
                 tw.WriteLine($"// This is auto generated code by FlashCap.V4L2Generator [{ThisAssembly.AssemblyVersion}]. Do not edit.");
                 tw.WriteLine($"// {root.Label}");
+                tw.WriteLine($"// {root.ClangVersion}");
+                tw.WriteLine($"// {root.GccVersion}");
                 tw.WriteLine($"// {DateTimeOffset.Now:R}");
                 tw.WriteLine();
 
@@ -448,21 +432,28 @@ private static void GenerateInteropCode(
                 {
                     tw.WriteLine("        public abstract string Label { get; }");
                     tw.WriteLine("        public abstract string Architecture { get; }");
+                    tw.WriteLine("        public virtual string ClangVersion => throw new NotImplementedException();");
+                    tw.WriteLine("        public virtual string GccVersion => throw new NotImplementedException();");
                     tw.WriteLine("        public abstract int sizeof_size_t { get; }");
                     tw.WriteLine("        public abstract int sizeof_off_t { get; }");
                 }
                 else
                 {
                     tw.WriteLine("        public override string Label => \"{0}\";", root.Label);
                     tw.WriteLine("        public override string Architecture => \"{0}\";", root.Architecture);
+                    tw.WriteLine("        public override string ClangVersion => \"{0}\";", root.ClangVersion);
+                    tw.WriteLine("        public override string GccVersion => \"{0}\";", root.GccVersion);
                     tw.WriteLine("        public override int sizeof_size_t => {0};", root.sizeof_size_t);
                     tw.WriteLine("        public override int sizeof_off_t => {0};", root.sizeof_off_t);
                 }
                 tw.WriteLine();
 
                 tw.WriteLine("        // Definitions");
                 foreach (var definition in root.Definitions.
-                    Where(d => symbolExactIncludeList.Contains(d.Key)).
+                    Where(d => symbolExactIncludeList.Contains(d.Key) ||
+                       d.Key.StartsWith("V4L2_CAP_") ||
+                       d.Key.StartsWith("V4L2_PIX_FMT_") ||
+                       d.Key.StartsWith("VIDIOC_")).
                     OrderBy(d => d.Key))
                 {
                     if (isBase)
@@ -677,7 +668,7 @@ public static void Main(string[] args)
             {
                 case 1:
                     Console.Write("  Generating dumper source code ...");
-                    GenerateStructureDumper(args[1], args[2], args[3], args[4]);
+                    GenerateStructureDumper(args[1], args[2], args[3], args[4], args[5], args[6]);
                     Console.WriteLine(" done.");
                     break;
                 case 2:
diff --git a/FlashCap.V4L2Generator/StructureDumpedJsonSchema.cs b/FlashCap.V4L2Generator/StructureDumpedJsonSchema.cs
@@ -46,6 +46,8 @@ public sealed class StructureDumpedJsonRoot
     {
         public readonly string Label;
         public readonly string Architecture;
+        public readonly string ClangVersion;
+        public readonly string GccVersion;
         public readonly int sizeof_size_t;
         public readonly int sizeof_off_t;
         public readonly IReadOnlyDictionary<string, uint> Definitions;
@@ -54,14 +56,16 @@ public sealed class StructureDumpedJsonRoot
 
         [JsonConstructor]
         public StructureDumpedJsonRoot(
-            string label, string architecture,
+            string label, string architecture, string clangVersion, string gccVersion,
             int sizeof_size_t, int sizeof_off_t,
             Dictionary<string, uint> definitions,
             Dictionary<string, JToken> enums,
             Dictionary<string, StructureType> structures)
         {
             this.Label = label;
             this.Architecture = architecture;
+            this.ClangVersion = clangVersion;
+            this.GccVersion = gccVersion;
             this.sizeof_size_t = sizeof_size_t;
             this.sizeof_off_t = sizeof_off_t;
             this.Definitions = definitions;
diff --git a/FlashCap.V4L2Generator/dumper.sh b/FlashCap.V4L2Generator/dumper.sh
@@ -1,20 +1,31 @@
 #!/bin/bash
 
-#sudo apt install clang mono
+#sudo apt install clang-11 build-essential mono-devel
+#sudo apt install clang-10 build-essential mono-devel
+
+Clang=clang-11; export Clang
+#Clang=clang-11; export Clang
+Configuration=Debug; export Configuration
+
+$Clang -v |& head -n 1 > clang_version.txt
+gcc -v |& tail -n 1 > gcc_version.txt
 
 echo "Step 1: Dump video2dev.h AST by Clang."
-clang -Xclang -ast-dump=json -fsyntax-only /usr/include/linux/videodev2.h > videodev2.h.ast.json
+$Clang -Xclang -ast-dump=json -fsyntax-only /usr/include/linux/videodev2.h > videodev2.h.ast.json
 
 echo "Step 2: Generate members dumper."
-mono FlashCap.V4L2Generator.exe 1 /usr/include/linux/videodev2.h videodev2.h.ast.json videodev2.dumper.cpp `uname -m`
+mono bin/$Configuration/mono/FlashCap.V4L2Generator.exe 1 /usr/include/linux/videodev2.h videodev2.h.ast.json videodev2.dumper.cpp `uname -m` "`cat clang_version.txt`" "`cat gcc_version.txt`"
 
 echo "Step 3: Execute members dumper."
 gcc -o videodev2.dumper videodev2.dumper.cpp
 ./videodev2.dumper > videodev2.h.members.json
 
 echo "Step 4: Generate interop code."
-mono FlashCap.V4L2Generator.exe 2 videodev2.h.members.json ../../../../FlashCap.Core/Internal/V4L2/
+mono bin/$Configuration/mono/FlashCap.V4L2Generator.exe 2 videodev2.h.members.json ../FlashCap.Core/Internal/V4L2/
 
 echo "Step 5: Generate base interop code."
-mono FlashCap.V4L2Generator.exe 3 videodev2.h.members.json .
+mono bin/$Configuration/mono/FlashCap.V4L2Generator.exe 3 videodev2.h.members.json .
+
+echo ""
+echo "Done, you have to check './NativeMethods_V4L2_Interop.cs' to merge manually some symbols into '../FlashCap.Core/Internal/V4L2/NativeMethods_V4L2_Interop.cs'."
 
diff --git a/samples/FlashCap.Wpf/FlashCap.Wpf.csproj b/samples/FlashCap.Wpf/FlashCap.Wpf.csproj
@@ -9,6 +9,7 @@
     <EnableWindowsTargeting>true</EnableWindowsTargeting>
     <DebugType>portable</DebugType>
     <DebugSymbols>true</DebugSymbols>
+    <EnableWindowsTargeting>true</EnableWindowsTargeting>
   </PropertyGroup>
 
   <ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ public IndependentSingleApartmentContext()`
`120`	`120`	`this.thread.SetApartmentState(ApartmentState.STA); // Improved compatibility`
`121`	`121`	`this.thread.Start();`
`122`	`122`
`123`		`- this.ready.Wait();`
	`123`	`+ this.ready!.Wait();`
`124`	`124`	`this.ready.Dispose();`
`125`	`125`	`this.ready = null;`
`126`	`126`	`}`
Original file line number	Diff line number	Diff line change
`@@ -189,6 +189,13 @@ public uint reserved2`
`189`	`189`	`set => this.reserved2_ = (uint)value;`
`190`	`190`	`}`
`191`	`191`
	`192`	`+ [FieldOffset(80)] private int request_fd_;`
	`193`	`+ public int request_fd`
	`194`	`+ {`
	`195`	`+ get => this.request_fd_;`
	`196`	`+ set => this.request_fd_ = (int)value;`
	`197`	`+ }`
	`198`	`+`
`192`	`199`	`[FieldOffset(80)] private uint reserved_;`
`193`	`200`	`public uint reserved`
`194`	`201`	`{`
`@@ -312,11 +319,18 @@ public uint pixelformat`
`312`	`319`	`set => this.pixelformat_ = (uint)value;`
`313`	`320`	`}`
`314`	`321`
`315`		`- [FieldOffset(48)] private fixed uint reserved_[4];`
	`322`	`+ [FieldOffset(48)] private uint mbus_code_;`
	`323`	`+ public uint mbus_code`
	`324`	`+ {`
	`325`	`+ get => this.mbus_code_;`
	`326`	`+ set => this.mbus_code_ = (uint)value;`
	`327`	`+ }`
	`328`	`+`
	`329`	`+ [FieldOffset(52)] private fixed uint reserved_[3];`
`316`	`330`	`public uint[] reserved`
`317`	`331`	`{`
`318`		`- get { fixed (uint* p = this.reserved_) { return get(p, 4); } }`
`319`		`- set { fixed (uint* p = this.reserved_) { set(p, value, 4); } }`
	`332`	`+ get { fixed (uint* p = this.reserved_) { return get(p, 3); } }`
	`333`	`+ set { fixed (uint* p = this.reserved_) { set(p, value, 3); } }`
`320`	`334`	`}`
`321`	`335`
`322`	`336`	`}`
`@@ -970,11 +984,18 @@ public uint memory`
`970`	`984`	`set => this.memory_ = (uint)value;`
`971`	`985`	`}`
`972`	`986`
`973`		`- [FieldOffset(12)] private fixed uint reserved_[2];`
	`987`	`+ [FieldOffset(12)] private uint capabilities_;`
	`988`	`+ public uint capabilities`
	`989`	`+ {`
	`990`	`+ get => this.capabilities_;`
	`991`	`+ set => this.capabilities_ = (uint)value;`
	`992`	`+ }`
	`993`	`+`
	`994`	`+ [FieldOffset(16)] private fixed uint reserved_[1];`
`974`	`995`	`public uint[] reserved`
`975`	`996`	`{`
`976`		`- get { fixed (uint* p = this.reserved_) { return get(p, 2); } }`
`977`		`- set { fixed (uint* p = this.reserved_) { set(p, value, 2); } }`
	`997`	`+ get { fixed (uint* p = this.reserved_) { return get(p, 1); } }`
	`998`	`+ set { fixed (uint* p = this.reserved_) { set(p, value, 1); } }`
`978`	`999`	`}`
`979`	`1000`
`980`	`1001`	`}`