Skip to content

Commit 2eabb2f

Browse files
kekyokekyo
committed
Merge branch 'feature/132-3' into develop
2 parents facf837 + b68ff40 commit 2eabb2f

20 files changed

+1228
-72
lines changed

‎.github/workflows/build.yaml

+9-9
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ on: [push]
44

55
jobs:
66
build:
7-
runs-on: windows-latest
7+
runs-on: ubuntu-latest
88
steps:
99

1010
#-----------------------------------------------------------------------
1111
# Checkout
1212

13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v4
1414
with:
1515
fetch-depth: 0
1616
# lfs: true
@@ -20,16 +20,16 @@ jobs:
2020
- name: Extract branch name
2121
id: extract_branch_name
2222
run: |
23-
$branch_name=$(git name-rev --name-only --exclude=tags/* HEAD)
23+
export branch_name=`git name-rev --name-only --exclude=tags/* HEAD`
2424
echo "Detected current branch: ${branch_name}"
25-
echo "::set-output name=branch_name::${branch_name}"
25+
echo "branch_name=${branch_name}" >> $GITHUB_OUTPUT
2626
2727
#-----------------------------------------------------------------------
2828
# Setup environments
2929
# Setup environments
3030

3131
- name: Setup .NET
32-
uses: actions/setup-dotnet@v3
32+
uses: actions/setup-dotnet@v4
3333
with:
3434
dotnet-version: |
3535
2.2.x
@@ -66,14 +66,14 @@ jobs:
6666
- name: Deploy NuGet package (develop/ref1)
6767
if: startsWith( github.ref, 'refs/tags/' )
6868
run: |
69-
dotnet nuget push artifacts\FlashCap.*.nupkg --source ref1
70-
dotnet nuget push artifacts\FSharp.FlashCap.*.nupkg --source ref1
69+
dotnet nuget push artifacts/FlashCap.*.nupkg --source ref1
70+
dotnet nuget push artifacts/FSharp.FlashCap.*.nupkg --source ref1
7171
7272
#-----------------------------------------------------------------------
7373
# Deploy packages (main)
7474

7575
#- name: Deploy NuGet package (main/ref2)
7676
# if: (startsWith( github.ref, 'refs/tags/' )) && (endsWith(steps.extract_branch_name.outputs.branch_name, 'main'))
7777
# run: |
78-
# dotnet nuget push artifacts\FlashCap.*.nupkg --source ref1
79-
# dotnet nuget push artifacts\FSharp.FlashCap.*.nupkg --source ref1
78+
# dotnet nuget push artifacts/FlashCap.*.nupkg --source ref1
79+
# dotnet nuget push artifacts/FSharp.FlashCap.*.nupkg --source ref1

‎FlashCap.Core/Internal/V4L2/NativeMethods_V4L2_Interop.cs

+26-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// This is auto generated code by FlashCap.V4L2Generator [0.14.6]. Do not edit.
2-
// Linux version 5.10.102.1-microsoft-standard-WSL2 (oe-user@oe-host) (x86_64-msft-linux-gcc (GCC) 9.3.0, GNU ld (GNU Binutils) 2.34.0.20200220) #1 SMP Wed Mar 2 00:30:59 UTC 2022
3-
// Ubuntu clang version 11.1.0-6
4-
// gcc version 11.4.0 (Ubuntu 11.4.0-1ubuntu1~22.04)
5-
// Fri, 22 Mar 2024 10:16:40 GMT
2+
// Linux version 6.1.0-20-686-pae ([email protected]) (gcc-12 (Debian 12.2.0-14) 12.2.0, GNU ld (GNU Binutils for Debian) 2.40) #1 SMP PREEMPT_DYNAMIC Debian 6.1.85-1 (2024-04-11)
3+
// Debian clang version 13.0.1-11+b2
4+
// gcc version 12.2.0 (Debian 12.2.0-14)
5+
// Sat, 13 Apr 2024 11:00:26 GMT
66

77
using System;
88
using System.Runtime.InteropServices;
@@ -84,6 +84,7 @@ internal abstract partial class NativeMethods_V4L2_Interop
8484
public virtual uint V4L2_PIX_FMT_H264_NO_SC => throw new NotImplementedException();
8585
public virtual uint V4L2_PIX_FMT_H264_SLICE => throw new NotImplementedException();
8686
public virtual uint V4L2_PIX_FMT_HEVC => throw new NotImplementedException();
87+
public virtual uint V4L2_PIX_FMT_HEVC_SLICE => throw new NotImplementedException();
8788
public virtual uint V4L2_PIX_FMT_HI240 => throw new NotImplementedException();
8889
public virtual uint V4L2_PIX_FMT_HM12 => throw new NotImplementedException();
8990
public virtual uint V4L2_PIX_FMT_HSV24 => throw new NotImplementedException();
@@ -93,12 +94,14 @@ internal abstract partial class NativeMethods_V4L2_Interop
9394
public virtual uint V4L2_PIX_FMT_IPU3_SGBRG10 => throw new NotImplementedException();
9495
public virtual uint V4L2_PIX_FMT_IPU3_SGRBG10 => throw new NotImplementedException();
9596
public virtual uint V4L2_PIX_FMT_IPU3_SRGGB10 => throw new NotImplementedException();
97+
public virtual uint V4L2_PIX_FMT_IPU3_Y10 => throw new NotImplementedException();
9698
public virtual uint V4L2_PIX_FMT_JL2005BCD => throw new NotImplementedException();
9799
public virtual uint V4L2_PIX_FMT_JPEG => throw new NotImplementedException();
98100
public virtual uint V4L2_PIX_FMT_JPGL => throw new NotImplementedException();
99101
public virtual uint V4L2_PIX_FMT_KONICA420 => throw new NotImplementedException();
100102
public virtual uint V4L2_PIX_FMT_M420 => throw new NotImplementedException();
101103
public virtual uint V4L2_PIX_FMT_MJPEG => throw new NotImplementedException();
104+
public virtual uint V4L2_PIX_FMT_MM21 => throw new NotImplementedException();
102105
public virtual uint V4L2_PIX_FMT_MPEG => throw new NotImplementedException();
103106
public virtual uint V4L2_PIX_FMT_MPEG1 => throw new NotImplementedException();
104107
public virtual uint V4L2_PIX_FMT_MPEG2 => throw new NotImplementedException();
@@ -107,7 +110,12 @@ internal abstract partial class NativeMethods_V4L2_Interop
107110
public virtual uint V4L2_PIX_FMT_MR97310A => throw new NotImplementedException();
108111
public virtual uint V4L2_PIX_FMT_MT21C => throw new NotImplementedException();
109112
public virtual uint V4L2_PIX_FMT_NV12 => throw new NotImplementedException();
113+
public virtual uint V4L2_PIX_FMT_NV12_16L16 => throw new NotImplementedException();
114+
public virtual uint V4L2_PIX_FMT_NV12_32L32 => throw new NotImplementedException();
115+
public virtual uint V4L2_PIX_FMT_NV12_4L4 => throw new NotImplementedException();
110116
public virtual uint V4L2_PIX_FMT_NV12M => throw new NotImplementedException();
117+
public virtual uint V4L2_PIX_FMT_NV12M_10BE_8L128 => throw new NotImplementedException();
118+
public virtual uint V4L2_PIX_FMT_NV12M_8L128 => throw new NotImplementedException();
111119
public virtual uint V4L2_PIX_FMT_NV12MT => throw new NotImplementedException();
112120
public virtual uint V4L2_PIX_FMT_NV12MT_16X16 => throw new NotImplementedException();
113121
public virtual uint V4L2_PIX_FMT_NV16 => throw new NotImplementedException();
@@ -120,12 +128,16 @@ internal abstract partial class NativeMethods_V4L2_Interop
120128
public virtual uint V4L2_PIX_FMT_NV61M => throw new NotImplementedException();
121129
public virtual uint V4L2_PIX_FMT_OV511 => throw new NotImplementedException();
122130
public virtual uint V4L2_PIX_FMT_OV518 => throw new NotImplementedException();
131+
public virtual uint V4L2_PIX_FMT_P010 => throw new NotImplementedException();
132+
public virtual uint V4L2_PIX_FMT_P010_4L4 => throw new NotImplementedException();
123133
public virtual uint V4L2_PIX_FMT_PAC207 => throw new NotImplementedException();
124134
public virtual uint V4L2_PIX_FMT_PAL8 => throw new NotImplementedException();
125135
public virtual uint V4L2_PIX_FMT_PJPG => throw new NotImplementedException();
126136
public virtual uint V4L2_PIX_FMT_PRIV_MAGIC => throw new NotImplementedException();
127137
public virtual uint V4L2_PIX_FMT_PWC1 => throw new NotImplementedException();
128138
public virtual uint V4L2_PIX_FMT_PWC2 => throw new NotImplementedException();
139+
public virtual uint V4L2_PIX_FMT_QC08C => throw new NotImplementedException();
140+
public virtual uint V4L2_PIX_FMT_QC10C => throw new NotImplementedException();
129141
public virtual uint V4L2_PIX_FMT_RGB24 => throw new NotImplementedException();
130142
public virtual uint V4L2_PIX_FMT_RGB32 => throw new NotImplementedException();
131143
public virtual uint V4L2_PIX_FMT_RGB332 => throw new NotImplementedException();
@@ -200,6 +212,7 @@ internal abstract partial class NativeMethods_V4L2_Interop
200212
public virtual uint V4L2_PIX_FMT_VP8 => throw new NotImplementedException();
201213
public virtual uint V4L2_PIX_FMT_VP8_FRAME => throw new NotImplementedException();
202214
public virtual uint V4L2_PIX_FMT_VP9 => throw new NotImplementedException();
215+
public virtual uint V4L2_PIX_FMT_VP9_FRAME => throw new NotImplementedException();
203216
public virtual uint V4L2_PIX_FMT_VUYA32 => throw new NotImplementedException();
204217
public virtual uint V4L2_PIX_FMT_VUYX32 => throw new NotImplementedException();
205218
public virtual uint V4L2_PIX_FMT_VYUY => throw new NotImplementedException();
@@ -237,6 +250,8 @@ internal abstract partial class NativeMethods_V4L2_Interop
237250
public virtual uint V4L2_PIX_FMT_YUV444M => throw new NotImplementedException();
238251
public virtual uint V4L2_PIX_FMT_YUV555 => throw new NotImplementedException();
239252
public virtual uint V4L2_PIX_FMT_YUV565 => throw new NotImplementedException();
253+
public virtual uint V4L2_PIX_FMT_YUVA32 => throw new NotImplementedException();
254+
public virtual uint V4L2_PIX_FMT_YUVX32 => throw new NotImplementedException();
240255
public virtual uint V4L2_PIX_FMT_YUYV => throw new NotImplementedException();
241256
public virtual uint V4L2_PIX_FMT_YVU410 => throw new NotImplementedException();
242257
public virtual uint V4L2_PIX_FMT_YVU420 => throw new NotImplementedException();
@@ -1198,7 +1213,13 @@ uint capabilities
11981213
set;
11991214
}
12001215

1201-
uint[] reserved
1216+
byte flags
1217+
{
1218+
get;
1219+
set;
1220+
}
1221+
1222+
byte[] reserved
12021223
{
12031224
get;
12041225
set;

0 commit comments

Comments
 (0)