220 Commits

Author SHA1 Message Date
a5da390ad5 Update ffmpeg-lgpl.yaml 2023-02-26 19:23:31 +01:00
b96c771c02 Update ffmpeg.yml 2023-02-26 19:22:58 +01:00
a3d59f258f Delete nvidia-av1-nvenc.patch 2023-02-23 13:38:56 +01:00
201ede0b46 Delete libfdkaac-dynlib-5.2.patch 2023-02-23 13:38:49 +01:00
3b64cf60ef Delete libfdkaac-dynlib-5.1.patch 2023-02-23 13:38:41 +01:00
c59743aed1 Delete amd-av1-headers.patch 2023-02-23 13:38:32 +01:00
ce4fef8bf5 Delete amd-av1-amf.patch 2023-02-23 13:38:24 +01:00
4d4388bf62 Update action.yml 2023-02-23 08:35:40 +01:00
5d7ddc217d Update ffmpeg.yml 2023-02-23 08:25:50 +01:00
1f8d08089d Add files via upload 2023-02-23 08:17:56 +01:00
c78e519a2c Update ffmpeg-lgpl.yaml 2023-02-18 16:54:23 +01:00
e4ca060d44 Update ffmpeg-lgpl.yaml 2023-02-18 16:16:06 +01:00
aee86b9b20 Update ffmpeg-lgpl.yaml 2023-02-18 15:41:40 +01:00
d505e5d46c Create ffmpeg-lgpl.yaml 2023-02-18 15:21:45 +01:00
a1f41de31c Update ffmpeg.yml 2023-02-18 15:13:27 +01:00
0f144b81bb Update ffmpeg.yml 2023-02-18 14:51:20 +01:00
6f0a2d7ad6 Update ffmpeg.yml 2023-02-18 14:34:54 +01:00
46ef28c470 Update ffmpeg.yml 2023-02-18 14:30:00 +01:00
270c6fce9c Update ffmpeg.yml 2023-02-18 14:22:34 +01:00
1ac33dab8a Update ffmpeg.yml 2023-02-18 12:10:26 +01:00
a8752554ef Update ffmpeg.yml 2023-01-15 20:34:14 +01:00
da34fb4599 Update ffmpeg.yml 2023-01-15 19:50:50 +01:00
93976e2534 Update ffmpeg.yml 2023-01-15 16:07:42 +01:00
0c82344961 Update ffmpeg.yml 2023-01-15 15:36:33 +01:00
7dd8c987d0 Update ffmpeg.yml 2022-12-15 15:15:56 +01:00
d039a386b7 Update test.yml 2022-12-15 15:05:32 +01:00
873680be3f Update ffmpeg.yml 2022-12-15 13:15:29 +01:00
09f9013713 Update ffmpeg.yml 2022-12-12 17:26:59 +01:00
56f8c998f6 Update amd-av1-amf.patch 2022-11-29 11:25:31 +01:00
349b58eecc Update ffmpeg.yml 2022-11-25 14:53:32 +01:00
b959d27624 Update ffmpeg.yml 2022-11-25 14:53:01 +01:00
10c88876bc Update test.yml 2022-11-25 14:38:12 +01:00
c6b92d2f4e Update test.yml 2022-11-25 14:37:52 +01:00
70bda63e9d Update ffmpeg.yml 2022-11-25 14:36:02 +01:00
1c68c6335a Create nvidia-av1-nvenc.patch 2022-11-25 14:28:13 +01:00
e72bad0214 Create amd-av1-headers.patch 2022-11-25 14:26:44 +01:00
1804b4eb32 Create amd-av1-amf.patch 2022-11-25 14:25:46 +01:00
1d19b49727 Delete .github/actions/libmfx/include/mfx directory 2022-09-27 15:00:54 +02:00
cbd4dc48f7 Delete .github/actions/libmfx/lib directory 2022-09-27 15:00:41 +02:00
9295130beb Delete libmfx.tar.gz 2022-09-27 15:00:31 +02:00
5598d953c3 Update action.yml 2022-09-27 15:00:12 +02:00
396376fd07 Update action.yml 2022-09-27 12:24:35 +02:00
0fe5d095d9 Add files via upload 2022-09-27 12:22:12 +02:00
c760b3218c Add files via upload 2022-09-27 12:20:38 +02:00
c14c227819 Update action.yml 2022-09-27 12:06:36 +02:00
82d140e7d3 Update action.yml 2022-09-27 08:38:23 +02:00
38ecab2019 Update action.yml 2022-09-27 07:21:22 +02:00
38d71e2878 Update action.yml 2022-09-27 07:21:06 +02:00
5db2bab432 Update libmfx.pc 2022-09-27 07:16:02 +02:00
eb230b209c Update action.yml 2022-09-26 19:42:51 +02:00
724ad0736a Update action.yml 2022-09-26 19:22:54 +02:00
8249dc670a Update action.yml 2022-09-26 19:16:56 +02:00
9b3025cd76 Update action.yml 2022-09-26 18:48:51 +02:00
a477f8d2ed Update action.yml 2022-09-26 18:38:34 +02:00
c447171e55 Update action.yml 2022-09-26 18:23:04 +02:00
bf890278c0 Update action.yml 2022-09-26 17:51:55 +02:00
6ebcc05909 Update action.yml 2022-09-26 17:22:50 +02:00
d715a754f1 Update test.yml 2022-09-26 16:23:30 +02:00
d0d8aae880 Update test.yml 2022-09-26 16:20:22 +02:00
b0449badb8 Update test.yml 2022-09-26 16:19:44 +02:00
2ebeb3e9a4 Update action.yml 2022-09-26 16:18:00 +02:00
73b5fc5d98 Update ffmpeg.yml 2022-09-26 11:45:26 +02:00
cef469de9b Update ffmpeg.yml 2022-09-26 11:13:52 +02:00
7c904d18ac Update test.yml 2022-09-26 10:47:16 +02:00
f1f3fb794c Create libfdkaac-dynlib-5.2.patch 2022-09-26 10:45:57 +02:00
737f74db0c Update test.yml 2022-09-26 10:06:50 +02:00
0e1b67f310 Update test.yml 2022-09-26 09:32:54 +02:00
a15bfc298b Update test.yml 2022-09-26 09:11:27 +02:00
ad9364ec80 Update test.yml 2022-09-26 08:55:46 +02:00
c0567694ab Update test.yml 2022-09-26 08:39:54 +02:00
7b6aab919f q 2022-09-26 08:31:14 +02:00
4298e9a94d libmfx 2022-09-25 18:21:08 +02:00
e7df369012 Update test.yml 2022-09-25 17:50:11 +02:00
6786d1fe98 Update test.yml 2022-09-25 17:49:33 +02:00
8046a30542 Update libmfx.pc 2022-09-25 17:31:24 +02:00
702e11e7ad Create libmfx.pc 2022-09-25 17:16:30 +02:00
47aaf438f6 Update test.yml 2022-09-25 16:47:24 +02:00
c5660a2fe3 updating mfx 2022-09-25 16:40:32 +02:00
105f314c8e Update action.yml 2022-09-25 16:37:40 +02:00
949b952ef9 Update action.yml 2022-09-25 16:29:11 +02:00
e517e524cc Update action.yml 2022-09-25 16:24:36 +02:00
70c8c16e55 Update action.yml 2022-09-25 16:14:48 +02:00
4f07e4e84e Update test.yml 2022-09-25 14:46:52 +02:00
6929f42dd6 Update action.yml 2022-09-25 14:45:26 +02:00
20bf845ddf Update action.yml 2022-09-25 14:33:20 +02:00
66bd1fb20d add mfx again 2022-09-25 14:07:09 +02:00
5857c8f7b3 Create action.yml 2022-09-25 14:03:56 +02:00
3662187a26 Update action.yml 2022-09-09 08:49:24 +02:00
2538643d8f Update action.yml 2022-09-09 08:44:40 +02:00
b02d60ae70 Update action.yml 2022-09-09 08:42:08 +02:00
4b2f10e62c Update action.yml 2022-09-09 08:36:29 +02:00
77fa7d0425 Update action.yml 2022-09-09 08:28:15 +02:00
b4843c3c93 Update action.yml 2022-09-09 08:23:59 +02:00
a34f18b836 Create A01-metadata-copy-segfault-fix.patch 2022-09-09 08:22:50 +02:00
037df191bb Update action.yml 2022-09-08 17:51:11 +02:00
011e815b21 Create test.yml 2022-09-08 17:46:19 +02:00
87ee3a9deb Update action.yml 2022-09-08 17:44:54 +02:00
8b1aa0203b Delete .github/actions/libsvtav1/patches directory 2022-09-08 17:42:28 +02:00
c2e11fe458 Create A01-metadata-copy-segfault-fix.patch 2022-09-08 17:28:37 +02:00
f149931d2f Update build.yml 2022-09-06 10:08:54 +02:00
512fe8083a Delete hotfix.patch 2022-08-04 18:51:44 +02:00
f43a71aaa0 Delete 0003-dynamic-loading-of-shared-fdk-aac-library-5.0.patch 2022-08-04 18:51:37 +02:00
1b3becb8d8 Update ffmpeg-cartwheel.yml 2022-08-04 18:50:47 +02:00
cea23c6d3f Update ffmpeg.yml 2022-08-04 18:49:29 +02:00
09afe7f781 Rename 0001-dynamic-loading-of-shared-fdk-aac-library-cw-5.0.patch to libfdkaac-dynlib-5.1.patch 2022-08-04 18:49:06 +02:00
6d8af9bd2a Update ffmpeg.yml 2022-08-04 08:41:38 +02:00
cf5c490ca7 Update ffmpeg.yml 2022-08-03 23:34:44 +02:00
740c0f1443 Update ffmpeg.yml 2022-08-03 23:33:24 +02:00
8e736fc176 Update ffmpeg.yml 2022-08-03 22:17:11 +02:00
0794129eb3 Update ffmpeg.yml 2022-08-03 21:02:31 +02:00
a510ee6450 Update ffmpeg.yml 2022-08-03 20:33:47 +02:00
cadbae2468 Update action.yml 2022-08-03 20:03:46 +02:00
eed4f3bfd2 Update build.yml 2022-08-03 19:35:03 +02:00
1173e86544 Update ffmpeg.yml 2022-08-03 19:34:47 +02:00
e4f69871fa Update ffmpeg-cartwheel.yml 2022-07-28 10:30:13 +02:00
847b88a4b4 Create ffmpeg-cartwheel.yml 2022-07-28 10:01:49 +02:00
beb2862876 Update build.yml 2022-07-27 06:32:25 +02:00
bf9c403d51 Delete test.yml 2022-07-26 15:24:57 +02:00
4fc92a4b53 Delete .github/actions/libvorbis directory 2022-07-26 15:24:17 +02:00
1db41d1069 Delete .github/actions/libogg directory 2022-07-26 15:24:05 +02:00
5fce763b97 Update ffmpeg.yml 2022-07-26 15:23:51 +02:00
8cd96d2a1e Update action.yml 2022-07-26 15:18:26 +02:00
adbbe8b0e2 Create action.yml 2022-07-26 15:12:18 +02:00
8c1377ac0b sss 2022-07-26 15:11:49 +02:00
f6b6de8146 Update ffmpeg.yml 2022-07-26 15:08:26 +02:00
d5c4a80332 Update action.yml 2022-07-26 15:02:09 +02:00
89e2887db4 Update action.yml 2022-07-26 15:00:19 +02:00
df491a68fd Update action.yml 2022-07-26 14:59:46 +02:00
4418828161 Update action.yml 2022-07-26 14:58:42 +02:00
158a3f4219 Update action.yml 2022-07-26 14:49:27 +02:00
02c8f9089f Create action.yml 2022-07-26 14:48:07 +02:00
cf638258b7 Update ffmpeg.yml 2022-07-26 14:42:33 +02:00
ebe0343972 Update action.yml 2022-07-26 14:38:18 +02:00
29d3ae53b9 Update action.yml 2022-07-26 14:36:56 +02:00
2744a17ea0 Update action.yml 2022-07-26 14:36:02 +02:00
649f8542d4 Update action.yml 2022-07-26 14:34:22 +02:00
61b2af2760 Update action.yml 2022-07-26 14:32:46 +02:00
6e5afa8bd5 Update ffmpeg.yml 2022-07-26 14:29:08 +02:00
3e5859259a Update ffmpeg.yml 2022-07-26 14:28:13 +02:00
62166944bf Update ffmpeg.yml 2022-07-26 14:21:38 +02:00
85b34eb0c1 Update action.yml 2022-07-26 14:21:04 +02:00
702d6bda6a Update action.yml 2022-07-26 14:20:20 +02:00
3f9ddde766 Update action.yml 2022-07-26 14:18:59 +02:00
28facf1b5f Update action.yml 2022-07-26 14:18:07 +02:00
c3109dbae1 Update action.yml 2022-07-26 14:17:06 +02:00
6d5c133800 inputs. 2022-07-26 14:12:44 +02:00
e979b4ee9d Update action.yml 2022-07-26 14:10:19 +02:00
a2350f473d Update action.yml 2022-07-26 14:08:35 +02:00
36ddb729c5 Update action.yml 2022-07-26 14:00:30 +02:00
cae9b66875 Delete test.yml 2022-07-25 09:39:43 +02:00
713613ff6f Create test.yml 2022-07-25 09:33:21 +02:00
c9f3103a02 Update action.yml 2022-07-25 09:31:57 +02:00
de055eec1f Update action.yml 2022-07-24 22:01:56 +02:00
42175c4654 Update action.yml 2022-07-24 21:58:46 +02:00
b309463c3d Update action.yml 2022-07-24 21:55:08 +02:00
82d1853964 Update action.yml 2022-07-24 21:50:03 +02:00
3ea263c5fc Update action.yml 2022-07-24 21:46:53 +02:00
76c5a4779f Update action.yml 2022-07-24 21:44:54 +02:00
1fe245034f Update action.yml 2022-07-24 21:42:52 +02:00
4f496673c2 Update action.yml 2022-07-24 21:41:11 +02:00
06b1779fcb Update action.yml 2022-07-24 18:21:28 +02:00
8872ea8748 Update action.yml 2022-07-24 18:03:48 +02:00
55949027f5 Update build.yml 2022-07-14 12:49:13 +02:00
8d121ed665 Update build.yml 2022-07-14 10:41:28 +02:00
024632c2b0 Update ffmpeg.yml 2022-07-14 10:38:58 +02:00
30c24bd34a fixed x264 2022-07-14 10:30:28 +02:00
acf3df4ff3 bla 2022-07-14 10:00:12 +02:00
9ed037f47d migrated to actions 2022-07-14 09:56:54 +02:00
0add715f1d Update ffmpeg.yml 2022-07-14 09:28:34 +02:00
09891f4dab Update action.yml 2022-07-14 09:26:06 +02:00
67ea676a43 Update action.yml 2022-07-14 09:23:30 +02:00
10adcb4b30 Update action.yml 2022-07-14 09:19:31 +02:00
51d04c226a Rename .github/actions/libvpl.yml to .github/actions/libvpl/action.yml 2022-07-14 09:18:16 +02:00
92558ec0fe Update ffmpeg.yml 2022-07-14 09:17:53 +02:00
099bd45b65 Update ffmpeg.yml 2022-07-14 09:01:23 +02:00
30326de759 Update ffmpeg.yml 2022-07-14 08:59:17 +02:00
a0306f7482 Rename .github/workflows/libvpl.yml to .github/actions/libvpl.yml 2022-07-14 08:58:08 +02:00
42ba9ed16a Update libvpl.yml 2022-07-14 08:56:45 +02:00
8a99c8191a Merge branch 'master' of https://github.com/Vouk/voukoder-ffmpeg 2022-07-14 08:51:12 +02:00
287a563a0d composition 2022-07-14 08:50:43 +02:00
64ebdbb558 Delete ffmpeg-static.yml 2022-07-14 08:23:11 +02:00
b79b78022a Delete ffmpeg-shared.yml 2022-07-14 08:23:01 +02:00
f5a74179a5 separate files 2022-07-12 18:59:20 +02:00
bb8dc83221 Update ffmpeg.yml 2022-07-08 09:40:31 +02:00
67c37cd9e2 Update ffmpeg.yml 2022-07-08 08:32:40 +02:00
e9e97ab726 Update build.yml 2022-07-08 07:59:57 +02:00
181af0c684 Update ffmpeg.yml 2022-07-08 07:59:35 +02:00
4adf604017 Update build.yml 2022-07-08 06:53:12 +02:00
5c122f7c9c Update ffmpeg.yml 2022-07-07 19:39:31 +02:00
c490f875e1 Update ffmpeg.yml 2022-07-07 16:34:56 +02:00
99448ba228 Update ffmpeg.yml 2022-07-07 16:17:48 +02:00
4f08126a5b Update build.yml 2022-07-07 16:16:42 +02:00
21c9f2a966 Update ffmpeg.yml 2022-07-07 16:05:07 +02:00
46eb4b8996 Update ffmpeg.yml 2022-07-07 16:04:04 +02:00
bb34f9235d Update ffmpeg.yml 2022-07-07 16:02:51 +02:00
162bd7a657 Update ffmpeg.yml 2022-07-07 15:31:08 +02:00
62b44ac5ed Update ffmpeg.yml 2022-07-07 15:29:25 +02:00
f3e31a5c17 Update ffmpeg.yml 2022-07-07 15:25:09 +02:00
8c1c88860b Update ffmpeg.yml 2022-07-07 14:52:05 +02:00
d976c0a693 Update ffmpeg.yml 2022-07-07 14:32:56 +02:00
fa34f5e06f Update ffmpeg.yml 2022-07-07 14:27:59 +02:00
b7ba32c1cb Update ffmpeg.yml 2022-07-07 14:25:36 +02:00
0ca0001fdc Update ffmpeg.yml 2022-07-07 14:23:31 +02:00
cedfb4f831 Update ffmpeg.yml 2022-07-07 14:02:32 +02:00
721da5031c Update ffmpeg.yml 2022-07-07 13:46:53 +02:00
4cb460ae3a Update ffmpeg.yml 2022-07-07 13:40:23 +02:00
c4552ae9f6 Update ffmpeg.yml 2022-07-07 13:36:26 +02:00
49dbae0739 Update ffmpeg.yml 2022-07-07 11:41:46 +02:00
911b943b8b Update ffmpeg.yml 2022-07-07 11:05:47 +02:00
dd9b7f02f5 Update ffmpeg.yml 2022-07-07 10:41:44 +02:00
39020cb85a Update build.yml 2022-07-07 10:40:00 +02:00
1d71c25774 Update build.yml 2022-07-07 10:38:59 +02:00
c3a854dff1 Update ffmpeg.yml 2022-07-07 10:33:29 +02:00
b4e3a01b9f Create build.yml 2022-07-07 10:28:10 +02:00
4ddec41343 Update ffmpeg.yml 2022-07-07 10:16:22 +02:00
3bbaab4377 Update ffmpeg.yml 2022-07-07 09:56:58 +02:00
11b61948a3 Update ffmpeg.yml 2022-07-07 09:36:13 +02:00
0e943a3418 Update ffmpeg.yml 2022-07-07 09:20:07 +02:00
6dfde52c97 Update ffmpeg.yml 2022-07-07 09:18:11 +02:00
4925f91bc5 Create ffmpeg.yml 2022-07-07 09:07:54 +02:00
26 changed files with 1550 additions and 1403 deletions

43
.github/actions/libfdkaac/action.yml vendored Normal file
View File

@ -0,0 +1,43 @@
name: libfdkaac
inputs:
refId:
type: string
required: true
config:
type: string
required: true
runs:
using: "composite"
steps:
- name: Set up GIT
shell: cmd
run: |
git config --global core.autocrlf false
git config --global core.eol lf
- name: Checkout FDK AAC
uses: actions/checkout@v3
with:
repository: mstorsjo/fdk-aac
ref: ${{ inputs.refId }}
path: fdkaac
- name: Set up MSYS2
uses: msys2/setup-msys2@v2
with:
install: base-devel binutils autotools automake mingw-w64-x86_64-cmake nasm
path-type: inherit
- name: Build FDK AAC
shell: cmd
env:
vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
cFlags: ${{ inputs.config == 'release' && '-MD' || '-MDd' }}
run: |
call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
md build dist
D:\a\_temp\setup-msys2\msys2.cmd -c 'cd fdkaac ; autoreconf -fiv ; CC=cl.exe CXX=cl.exe CXXFLAGS=${{ env.cFlags }} ./configure --prefix=$(realpath ../build) --disable-shared --disable-static ; make -j 2 ; make install ; cd ../build ; tar czf ../dist/libfdkaac.tgz *'
- name: Publish artifact
uses: actions/upload-artifact@v2
with:
name: libfdkaac-${{ runner.os }}-${{ inputs.config }}
path: dist/libfdkaac.tgz

18
.github/actions/libmfx/action.yml vendored Normal file
View File

@ -0,0 +1,18 @@
name: libmfx
inputs:
refId:
type: string
required: true
config:
type: string
required: true
runs:
using: "composite"
steps:
- name: Publish artifact
uses: actions/upload-artifact@v2
with:
name: libmfx-${{ runner.os }}-${{ inputs.config }}
path: .github/actions/libmfx/libmfx.tgz

BIN
.github/actions/libmfx/libmfx.tgz vendored Normal file

Binary file not shown.

32
.github/actions/libmp3lame/action.yml vendored Normal file
View File

@ -0,0 +1,32 @@
name: libmp3lame
inputs:
refId:
type: string
required: true
config:
type: string
required: true
runs:
using: "composite"
steps:
- name: Set up MSYS2
uses: msys2/setup-msys2@v2
with:
install: base-devel binutils autotools automake mingw-w64-x86_64-cmake nasm svn
path-type: inherit
- name: Build LAME
shell: cmd
env:
vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
cFlags: ${{ inputs.config == 'release' && '-MD' || '-MDd' }}
run: |
call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
md build dist
D:\a\_temp\setup-msys2\msys2.cmd -c 'svn co https://svn.code.sf.net/p/lame/svn/${{ inputs.refId }}/lame lame ; cd lame ; autoreconf -i ; CC=cl.exe CXX=cl.exe CXXFLAGS=${{ env.cFlags }} ./configure --prefix=$(realpath ../build) --enable-nasm --disable-frontend --disable-shared --enable-static ; make -j ; make install ; cd ../build ; tar czf ../dist/libmp3lame.tgz *
- name: Publish artifact
uses: actions/upload-artifact@v2
with:
name: libmp3lame-${{ runner.os }}-${{ inputs.config }}
path: dist/libmp3lame.tgz

61
.github/actions/liboggvorbis/action.yml vendored Normal file
View File

@ -0,0 +1,61 @@
name: liboggvorbis
inputs:
libogg_refId:
type: string
required: true
libvorbis_refId:
type: string
required: true
config:
type: string
required: true
runs:
using: "composite"
steps:
- name: Set up GIT
shell: cmd
run: |
git config --global core.autocrlf false
git config --global core.eol lf
- name: Checkout Ogg
uses: actions/checkout@v3
with:
repository: xiph/ogg
ref: ${{ inputs.libogg_refId }}
path: ogg
- name: Checkout Vorbis
uses: actions/checkout@v3.0.0
with:
repository: xiph/vorbis
ref: ${{ inputs.libvorbis_refId }}
path: vorbis
- name: Set up MSYS2
uses: msys2/setup-msys2@v2
with:
install: base-devel binutils autotools automake
path-type: inherit
- name: Build Ogg
shell: cmd
env:
vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
cFlags: ${{ inputs.config == 'release' && '-MD' || '-MDd' }}
run: |
call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
md build
D:\a\_temp\setup-msys2\msys2.cmd -c 'cd ogg ; autoreconf -i ; CC=cl.exe CXX=cl.exe CXXFLAGS=${{ env.cFlags }} ./configure --prefix=$(realpath ../build) --disable-shared ; make -j ; make install'
- name: Build Vorbis
shell: cmd
env:
vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
cFlags: ${{ inputs.config == 'release' && '-MD' || '-MDd' }}
run: |
call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
md dist
D:\a\_temp\setup-msys2\msys2.cmd -c 'cd vorbis ; autoreconf -i ; CC=cl.exe CXX=cl.exe CXXFLAGS=${{ env.cFlags }} ./configure --prefix=$(realpath ../build) --disable-shared ; make -j ; make install ; sed -i '/^Libs\.private.*/d' ../build/lib/pkgconfig/vorbis.pc ; cd ../build ; tar czf ../dist/liboggvorbis.tgz *'
- name: Publish artifact
uses: actions/upload-artifact@v2
with:
name: liboggvorbis-${{ runner.os }}-${{ inputs.config }}
path: dist/liboggvorbis.tgz

46
.github/actions/libopus/action.yml vendored Normal file
View File

@ -0,0 +1,46 @@
name: libopus
inputs:
refId:
type: string
required: true
config:
type: string
required: true
runs:
using: "composite"
steps:
- name: Set up GIT
shell: cmd
run: |
git config --global core.autocrlf false
git config --global core.eol lf
- name: Checkout OPUS
uses: actions/checkout@v3.0.0
with:
repository: xiph/opus
ref: v1.3.1
path: opus
- name: Set up MSYS2
uses: msys2/setup-msys2@v2
with:
install: base-devel binutils autotools automake mingw-w64-x86_64-cmake nasm
path-type: inherit
- name: Build OPUS
shell: cmd
env:
vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
cFlags: ${{ inputs.config == 'release' && '-MD' || '-MDd' }}
msbuildConfig: ${{ inputs.config == 'release' && 'Release' || 'Debug' }}
run: |
call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
md build build\include build\lib build\lib\pkgconfig dist
cd opus\win32\VS2015
MSBuild.exe /property:Configuration="${{ env.msbuildConfig }}" /property:Platform=x64 /property:PlatformToolset=v143 opus.vcxproj
D:\a\_temp\setup-msys2\msys2.cmd -c 'cp x64/${{ inputs.config }}/opus.lib ../../../build/lib/opus.lib ; cd ../../.. ; cp -r opus/include build/include/opus ; cp opus/opus.pc.in build/lib/pkgconfig/opus.pc ; sed -i "s#@prefix@#$(realpath ../../../build)#g" build/lib/pkgconfig/opus.pc ; sed -i "s/@exec_prefix@/\$\{prefix\}/g" build/lib/pkgconfig/opus.pc ; sed -i "s/@libdir@/\$\{prefix\}\/lib/g" build/lib/pkgconfig/opus.pc ; sed -i "s/@includedir@/\$\{prefix\}\/include/g" build/lib/pkgconfig/opus.pc ; sed -i "s/@LIBM@//g" build/lib/pkgconfig/opus.pc; sed -i "s/@VERSION@/2.0.0/g" build/lib/pkgconfig/opus.pc ; cd build ; tar czf ../dist/libopus.tgz *'
- name: Publish artifact
uses: actions/upload-artifact@v2
with:
name: libopus-${{ runner.os }}-${{ inputs.config }}
path: dist/libopus.tgz

50
.github/actions/libsnappy/action.yml vendored Normal file
View File

@ -0,0 +1,50 @@
name: libsnappy
inputs:
refId:
type: string
required: true
config:
type: string
required: true
runs:
using: "composite"
steps:
- name: Set up GIT
shell: cmd
run: |
git config --global core.autocrlf false
git config --global core.eol lf
- name: Checkout Snappy
uses: actions/checkout@v3
with:
repository: google/snappy
ref: ${{ inputs.refId }}
path: snappy
- name: Set up MSYS2
uses: msys2/setup-msys2@v2
with:
install: base-devel binutils autotools automake mingw-w64-x86_64-cmake nasm
path-type: inherit
- name: Build Snappy
shell: cmd
env:
vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
cFlags: ${{ inputs.config == 'release' && '-MD' || '-MDd' }}
msbuildConfig: ${{ inputs.config == 'release' && 'Release' || 'Debug' }}
run: |
call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
md build build\include build\lib build\lib\pkgconfig dist
cd snappy
git submodule update --init
md work
cd work
cmake -G "Visual Studio 17 2022" .. -DCMAKE_INSTALL_PREFIX=..\..\build -DBUILD_SHARED_LIBS=OFF -DSNAPPY_BUILD_TESTS=OFF
MSBuild.exe /property:Configuration="${{ env.msbuildConfig }}" Snappy.sln
D:\a\_temp\setup-msys2\msys2.cmd -c 'cp ${{ inputs.config }}/snappy.lib ../../build/lib/snappy.lib ; cp ../snappy.h ../snappy-c.h ../../build/include/ ; cd ../../build ; tar czf ../dist/libsnappy.tgz *'
- name: Publish artifact
uses: actions/upload-artifact@v2
with:
name: libsnappy-${{ runner.os }}-${{ inputs.config }}
path: dist/libsnappy.tgz

47
.github/actions/libsvtav1/action.yml vendored Normal file
View File

@ -0,0 +1,47 @@
name: libsvtav1
inputs:
refId:
type: string
required: true
config:
type: string
required: true
runs:
using: "composite"
steps:
- name: Set up GIT
shell: cmd
run: |
git config --global core.autocrlf false
git config --global core.eol lf
git clone -b ${{ inputs.refId }} https://gitlab.com/AOMediaCodec/SVT-AV1 svtav1
cd svtav1
git apply --ignore-whitespace --verbose ..\.github\actions\libsvtav1\patches\A01-metadata-copy-segfault-fix.patch
cd ..
#- name: Checkout SVT AV1
# uses: actions/checkout@v3
# with:
# repository: AOMediaCodec/SVT-AV1
# ref: ${{ inputs.refId }}
# path: svtav1
- name: Set up MSYS2
uses: msys2/setup-msys2@v2
with:
install: base-devel binutils autotools automake mingw-w64-x86_64-cmake nasm
path-type: inherit
- name: Build SVT AV1
shell: cmd
env:
vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
cFlags: ${{ inputs.config == 'release' && '-MD' || '-MDd' }}
run: |
call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
md build build\include build\lib build\lib\pkgconfig dist
D:\a\_temp\setup-msys2\msys2.cmd -c 'cd svtav1/Build/windows ; ./build.bat 2022 ${{ inputs.config }} static ; cp -r ../../Source/API ../../../build/include/svt-av1 ; cp ../../Bin/${{ inputs.config }}/SvtAv1Enc.lib ../../../build/lib/ ; cp SvtAv1Enc.pc ../../../build/lib/pkgconfig/ ; cd ../../../build ; tar czf ../dist/libsvtav1.tgz *'
- name: Publish artifact
uses: actions/upload-artifact@v2
with:
name: libsvtav1-${{ runner.os }}-${{ inputs.config }}
path: dist/libsvtav1.tgz

View File

@ -0,0 +1,37 @@
From 213854249dc8d69653a9f3281cdd4c2063cd3779 Mon Sep 17 00:00:00 2001
From: Christopher Degawa <christopher.degawa@intel.com>
Date: Wed, 10 Aug 2022 13:53:17 -0500
Subject: [PATCH] copy_input_buffer: only copy metadata if a frame was actaully
sent
Fixes a segfault if EOS was send through the library without zeroing
out the metadata array
Signed-off-by: Christopher Degawa <christopher.degawa@intel.com>
---
Source/Lib/Encoder/Globals/EbEncHandle.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/Source/Lib/Encoder/Globals/EbEncHandle.c b/Source/Lib/Encoder/Globals/EbEncHandle.c
index ba5e719a4..fc7a2b1f4 100644
--- a/Source/Lib/Encoder/Globals/EbEncHandle.c
+++ b/Source/Lib/Encoder/Globals/EbEncHandle.c
@@ -4814,11 +4814,12 @@ static void copy_input_buffer(SequenceControlSet* scs, EbBufferHeaderType* dst,
} else if (pass != ENCODE_FIRST_PASS || copy_frame) {
// Bypass copy for the unecessary picture in IPPP pass
// Copy the picture buffer
- if (src->p_buffer != NULL)
+ if (src->p_buffer != NULL) {
copy_frame_buffer(scs, dst->p_buffer, dst_y8b->p_buffer, src->p_buffer, pass);
- // Copy the metadata array
- if (svt_aom_copy_metadata_buffer(dst, src->metadata) != EB_ErrorNone)
- dst->metadata = NULL;
+ // Copy the metadata array
+ if (svt_aom_copy_metadata_buffer(dst, src->metadata) != EB_ErrorNone)
+ dst->metadata = NULL;
+ }
}
// Copy the private data list
--
GitLab

48
.github/actions/libvpl/action.yml vendored Normal file
View File

@ -0,0 +1,48 @@
name: libvpl
inputs:
refId:
type: string
required: true
config:
type: string
required: true
runs:
using: "composite"
steps:
- name: Set up GIT
shell: cmd
run: |
git config --global core.autocrlf false
git config --global core.eol lf
- name: Checkout oneVPL
uses: actions/checkout@v3.0.0
with:
repository: oneapi-src/oneVPL
ref: ${{ inputs.refId }}
path: onevpl
- name: Set up MSYS2
uses: msys2/setup-msys2@v2
with:
install: base-devel binutils autotools automake
path-type: inherit
- name: Build oneVPL
shell: cmd
#env:
# vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
# msbuildConfig: ${{ inputs.config == 'release' && 'Release' || 'Debug' }}
run: |
call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
md temp build dist
cd temp
cmake.exe -G "Visual Studio 17 2022" ..\onevpl -T host=x64 -A x64 -DBUILD_TOOLS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX=..\build -DCMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD=ON
MSBuild.exe -t:VPL,INSTALL -p:Configuration=${{ env.msbuildConfig }} -m vpl.sln
cd ..\build
IF EXIST "lib\vpld.lib" move "lib\vpld.lib" "lib\vpl.lib"
D:\a\_temp\setup-msys2\msys2.cmd -c 'rm -rf bin/cmake ; tar czf ../dist/libvpl.tgz *'
- name: Publish artifact
uses: actions/upload-artifact@v2
with:
name: libvpl-${{ runner.os }}-${{ inputs.config }}
path: dist/libvpl.tgz

38
.github/actions/libvpx/action.yml vendored Normal file
View File

@ -0,0 +1,38 @@
name: libvpx
inputs:
refId:
type: string
required: true
config:
type: string
required: true
runs:
using: "composite"
steps:
- name: Set up GIT
shell: cmd
run: |
git config --global core.autocrlf false
git config --global core.eol lf
git clone --depth 1 -b ${{ inputs.refId }} https://github.com/webmproject/libvpx.git vpx
- name: Set up MSYS2
uses: msys2/setup-msys2@v2
with:
install: base-devel binutils autotools automake mingw-w64-x86_64-cmake nasm
path-type: inherit
- name: Build LibVpx
shell: cmd
env:
vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
cFlags: ${{ inputs.config == 'release' && '-MD' || '-MDd' }}
run: |
call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
md build build\include build\lib build\lib\pkgconfig dist
D:\a\_temp\setup-msys2\msys2.cmd -c 'cd vpx ; ./configure --prefix=../build --target=x86_64-win64-vs17 --enable-vp9-highbitdepth --disable-shared --disable-examples --disable-tools --disable-docs --disable-libyuv --disable-unit_tests --disable-postproc ; make -j ; make install ; mv ../build/lib/x64/vpxmd.lib ../build/lib/vpx.lib ; rm -rf ../build/lib/x64 ; cd ../build ; tar czf ../dist/libvpx.tgz *'
- name: Publish artifact
uses: actions/upload-artifact@v2
with:
name: libvpx-${{ runner.os }}-${{ inputs.config }}
path: dist/libvpx.tgz

43
.github/actions/libx264/action.yml vendored Normal file
View File

@ -0,0 +1,43 @@
name: libx264
inputs:
refId:
type: string
required: true
config:
type: string
required: true
runs:
using: "composite"
steps:
- name: Set up GIT
shell: cmd
run: |
git config --global core.autocrlf false
git config --global core.eol lf
- name: Checkout X264
uses: actions/checkout@v3
with:
repository: mirror/x264
ref: ${{ inputs.refId }}
path: x264
- name: Set up MSYS2
uses: msys2/setup-msys2@v2
with:
install: base-devel binutils autotools automake mingw-w64-x86_64-cmake nasm
path-type: inherit
- name: Build X264
shell: cmd
env:
vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
cFlags: ${{ inputs.config == 'release' && '-MD' || '-MDd' }}
run: |
call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
md build build\include build\lib build\lib\pkgconfig dist
D:\a\_temp\setup-msys2\msys2.cmd -c 'cd x264 ; CC=cl ./configure --prefix=$(realpath ../build) --disable-cli --enable-static --enable-pic --libdir=../build/lib ; make -j ; make install-lib-static ; cd ../build ; tar czf ../dist/libx264.tgz *'
- name: Publish artifact
uses: actions/upload-artifact@v2
with:
name: libx264-${{ runner.os }}-${{ inputs.config }}
path: dist/libx264.tgz

39
.github/actions/libx265-10/action.yml vendored Normal file
View File

@ -0,0 +1,39 @@
name: libx265-10
inputs:
refId:
type: string
required: true
config:
type: string
required: true
runs:
using: "composite"
steps:
- name: Checkout X265
shell: cmd
run: |
git config --global core.autocrlf false
git config --global core.eol lf
git clone -b ${{ inputs.refId }} https://github.com/videolan/x265.git x265
- name: Set up MSBuild
uses: microsoft/setup-msbuild@v1.1
- name: Set up NASM
uses: ilammy/setup-nasm@v1.2.1
- name: Build X265 (10 bit)
shell: cmd
run: |
call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
md build dist
cd x265/build/vc15-x86_64
md work
cd work
cmake -G "Visual Studio 17 2022" ..\..\..\source -DHIGH_BIT_DEPTH=ON -DEXPORT_C_API=OFF -DENABLE_SHARED=OFF -DENABLE_CLI=OFF
MSBuild.exe /property:Configuration="${{ env.msbuildConfig }}" x265-static.vcxproj
move ${{ inputs.config }}\x265-static.lib ..\..\..\..\dist\x265_10bit.lib
- name: Publish artifact
uses: actions/upload-artifact@v2
with:
name: x265_10bit-${{ runner.os }}-${{ inputs.config }}
path: dist/x265_10bit.lib

43
.github/actions/libx265-12/action.yml vendored Normal file
View File

@ -0,0 +1,43 @@
name: libx265-12
inputs:
refId:
type: string
required: true
config:
type: string
required: true
runs:
using: "composite"
steps:
- name: Checkout X265
shell: cmd
run: |
git config --global core.autocrlf false
git config --global core.eol lf
git clone -b ${{ inputs.refId }} https://github.com/videolan/x265.git x265
- name: Set up MSBuild
uses: microsoft/setup-msbuild@v1.1
- name: Set up NASM
uses: ilammy/setup-nasm@v1.2.1
- name: Build X265 (12 bit)
shell: cmd
env:
vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
cFlags: ${{ inputs.config == 'release' && '-MD' || '-MDd' }}
msbuildConfig: ${{ inputs.config == 'release' && 'Release' || 'Debug' }}
run: |
call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
md build dist
cd x265/build/vc15-x86_64
md work
cd work
cmake -G "Visual Studio 17 2022" ..\..\..\source -DHIGH_BIT_DEPTH=ON -DEXPORT_C_API=OFF -DENABLE_SHARED=OFF -DENABLE_CLI=OFF -DMAIN12=ON
MSBuild.exe /property:Configuration="${{ env.msbuildConfig }}" x265-static.vcxproj
move ${{ inputs.config }}\x265-static.lib ..\..\..\..\dist\x265_12bit.lib
- name: Publish artifact
uses: actions/upload-artifact@v2
with:
name: x265_12bit-${{ runner.os }}-${{ inputs.config }}
path: dist/x265_12bit.lib

58
.github/actions/libx265/action.yml vendored Normal file
View File

@ -0,0 +1,58 @@
name: libx265
inputs:
refId:
type: string
required: true
config:
type: string
required: true
runs:
using: "composite"
steps:
- name: Checkout X265
shell: cmd
run: |
git config --global core.autocrlf false
git config --global core.eol lf
git clone -b Release_3.5 https://github.com/videolan/x265.git x265
- name: Set up MSYS2
uses: msys2/setup-msys2@v2
with:
install: base-devel binutils autotools automake
path-type: inherit
- name: Set up MSBuild
uses: microsoft/setup-msbuild@v1.1
- name: Set up NASM
uses: ilammy/setup-nasm@v1.2.1
- name: Set up dependant libs
uses: actions/download-artifact@v3
with:
path: build
- name: Build X265
shell: cmd
env:
vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
cFlags: ${{ inputs.config == 'release' && '-MD' || '-MDd' }}
msbuildConfig: ${{ inputs.config == 'release' && 'Release' || 'Debug' }}
run: |
call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
md di dist dist\include dist\lib dist\lib\pkgconfig
cd x265/build/vc15-x86_64
md work
cd work
cmake -G "Visual Studio 17 2022" ..\..\..\source -DCMAKE_INSTALL_PREFIX=..\..\..\..\build -DENABLE_SHARED=OFF -DENABLE_CLI=OFF -DEXTRA_LIB="libx265_10bit.lib;libx265_12bit.lib" -DLINKED_10BIT=ON -DLINKED_12BIT=ON
MSBuild.exe /property:Configuration="${{ env.msbuildConfig }}" x265-static.vcxproj
cp x265.pc ..\..\..\..\dist\lib\pkgconfig\x265.pc
move ${{ inputs.config }}\x265-static.lib ..\..\..\..\build\
move x265_config.h ..\..\..\..\dist\include\
cd ..\..\..\..
"${{ env.vsPath }}VC\Tools\MSVC\14.29.30133\bin\Hostx64\x64\lib.exe" /ignore:4006 /ignore:4221 /OUT:dist\lib\x265.lib build\x265-static.lib build\x265_10bit-${{ runner.os }}-${{ inputs.config }}\x265_10bit.lib build\x265_12bit-${{ runner.os }}-${{ inputs.config }}\x265_12bit.lib
copy x265\source\x265.h dist\include\
D:\a\_temp\setup-msys2\msys2.cmd -c 'cd dist ; tar czf ../di/libx265.tgz *'
- name: Publish artifact
uses: actions/upload-artifact@v2
with:
name: libx265-${{ runner.os }}-${{ inputs.config }}
path: di/libx265.tgz

44
.github/actions/libzimg/action.yml vendored Normal file
View File

@ -0,0 +1,44 @@
name: libzimg
inputs:
refId:
type: string
required: true
config:
type: string
required: true
runs:
using: "composite"
steps:
- name: Set up GIT
shell: cmd
run: |
git config --global core.autocrlf false
git config --global core.eol lf
- name: Checkout ZIMG
uses: actions/checkout@v3.0.0
with:
repository: sekrit-twc/zimg
ref: ${{ inputs.refId }}
path: zimg
- name: Set up MSYS2
uses: msys2/setup-msys2@v2
with:
install: base-devel binutils autotools automake mingw-w64-x86_64-cmake nasm
path-type: inherit
- name: Build ZIMG
shell: cmd
env:
vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
cFlags: ${{ inputs.config == 'release' && '-MD' || '-MDd' }}
msbuildConfig: ${{ inputs.config == 'release' && 'Release' || 'Debug' }}
run: |
call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
md build build\include build\lib build\lib\pkgconfig dist
D:\a\_temp\setup-msys2\msys2.cmd -c 'cd zimg ; ./autogen.sh ; ./configure --prefix=$(realpath ../build) ; cd _msvc/zimg ; MSBuild.exe /property:Configuration="${{ env.msbuildConfig }}" /property:ConfigurationType=StaticLibrary /property:PlatformToolset=v143 /property:Platform=x64 /property:WholeProgramOptimization=false zimg.vcxproj ; cp x64/${{ inputs.config }}/z.lib ../../../build/lib/zimg.lib ; cd ../.. ; cp src/zimg/api/zimg.h ../build/include/zimg.h ; cp zimg.pc ../build/lib/pkgconfig/zimg.pc ; cd ../build ; tar czf ../dist/libzimg.tgz *'
- name: Publish artifact
uses: actions/upload-artifact@v2
with:
name: libzimg-${{ runner.os }}-${{ inputs.config }}
path: dist/libzimg.tgz

23
.github/workflows/build.yml vendored Normal file
View File

@ -0,0 +1,23 @@
name: Build all
on:
workflow_dispatch:
# schedule:
# - cron: "0 1 * * *"
jobs:
ffmpeg-static-debug:
uses: ./.github/workflows/ffmpeg.yml
with:
system: windows-2022
type: static
config: debug
ffmpegRef: release/5.1
ffmpeg-static-release:
uses: ./.github/workflows/ffmpeg.yml
with:
system: windows-2022
type: static
config: release
ffmpegRef: release/5.1

220
.github/workflows/ffmpeg-cartwheel.yml vendored Normal file
View File

@ -0,0 +1,220 @@
name: 'Build FFmpeg from cartwheel'
on:
workflow_dispatch:
inputs:
system:
type: choice
required: true
default: 'windows-2022'
description: 'System'
options:
- windows-2022
type:
type: choice
required: true
default: 'static'
description: Type
options:
- static
- shared
config:
type: choice
required: true
default: 'debug'
description: 'Configuration'
options:
- debug
- release
workflow_call:
inputs:
system:
type: string
required: true
type:
type: string
required: true
config:
type: string
required: true
ffmpegRef:
type: string
required: true
env:
vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
COMPONENTS: "--enable-libvpl --enable-libsvtav1 --enable-libsnappy --enable-libmp3lame --enable-libzimg --enable-libopus --enable-libvorbis --enable-libx264 --enable-libx265 --enable-libfdk-aac --enable-libvpx "
NASM_EXECUTABLE: nasm
cFlags: ${{ inputs.config == 'release' && '-MD' || '-MDd' }}
variant: ${{ inputs.type == 'static' && ' --pkg-config-flags="--static" --disable-shared --enable-static' || ' --disable-static --enable-shared' }}
msbuildConfig: ${{ inputs.config == 'release' && 'Release' || 'Debug' }}
jobs:
libvpl:
runs-on: ${{ inputs.system }}
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/libvpl
with:
refId: master
config: ${{ inputs.config }}
liboggvorbis:
runs-on: ${{ inputs.system }}
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/liboggvorbis
with:
libogg_refId: v1.3.5
libvorbis_refId: v1.3.7
config: ${{ inputs.config }}
libsvtav1:
runs-on: ${{ inputs.system }}
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/libsvtav1
with:
refId: v1.1.0
config: ${{ inputs.config }}
libsnappy:
runs-on: ${{ inputs.system }}
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/libsnappy
with:
refId: 1.1.9
config: ${{ inputs.config }}
libvpx:
runs-on: ${{ inputs.system }}
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/libvpx
with:
refId: v1.12.0
config: ${{ inputs.config }}
libmp3lame:
runs-on: ${{ inputs.system }}
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/libmp3lame
with:
refId: tags/RELEASE__3_100
config: ${{ inputs.config }}
libzimg:
runs-on: ${{ inputs.system }}
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/libzimg
with:
refId: release-3.0.4
config: ${{ inputs.config }}
libopus:
runs-on: ${{ inputs.system }}
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/libopus
with:
refId: v1.3.1
config: ${{ inputs.config }}
libfdkaac:
runs-on: ${{ inputs.system }}
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/libfdkaac
with:
refId: v2.0.2
config: ${{ inputs.config }}
libx264:
runs-on: ${{ inputs.system }}
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/libx264
with:
refId: stable
config: ${{ inputs.config }}
libx265-12:
runs-on: ${{ inputs.system }}
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/libx265-12
with:
refId: Release_3.5
config: ${{ inputs.config }}
libx265-10:
runs-on: ${{ inputs.system }}
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/libx265-10
with:
refId: Release_3.5
config: ${{ inputs.config }}
libx265:
runs-on: ${{ inputs.system }}
needs: [libx265-12,libx265-10]
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/libx265
with:
refId: Release_3.5
config: ${{ inputs.config }}
cartwheel:
runs-on: ${{ inputs.system }}
needs: [libvpl,libopus,libsvtav1,libsnappy,libmp3lame,libzimg,liboggvorbis,libx264,libx265,libfdkaac,libvpx]
steps:
- name: Set up MSYS2
uses: msys2/setup-msys2@v2
with:
install: base-devel binutils mingw-w64-x86_64-cmake nasm
path-type: inherit
- name: Set up GIT
run: |
git config --global core.autocrlf false
git config --global core.eol lf
git config --global user.email "daniel.stankewitz@gmail.com"
git config --global user.name "Daniel Stankewitz"
- name: Checkout patches
uses: actions/checkout@v3.0.0
- name: Checkout NvEnc
uses: actions/checkout@v3.0.0
with:
repository: FFmpeg/nv-codec-headers
ref: master
path: nvenc
- name: Checkout AMF
uses: actions/checkout@v3.0.0
with:
repository: GPUOpen-LibrariesAndSDKs/AMF
ref: master
path: amf
- name: Set up artifacts
uses: actions/download-artifact@v3
with:
path: build_artifacts
- name: Build FFmpeg from Cartwheel
shell: cmd
run: |
call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
md build dist
rem D:\a\_temp\setup-msys2\msys2.cmd -c 'git config --global user.email "daniel.stankewitz@gmail.com" ; git config --global user.name "Daniel Stankewitz" ; git clone https://github.com/intel-media-ci/cartwheel-ffmpeg --recursive cartwheel ; cd cartwheel ; git checkout b3f9843cffd4118e35bb000779444ca2f4196342 ; git submodule update --init --recursive ; cd ffmpeg ; git am ../patches/*.patch ; git apply --ignore-whitespace --verbose ../../0003-dynamic-loading-of-shared-fdk-aac-library-5.0.patch ; sed -i "s/#define X264_API_IMPORTS 1/\/\/#define X264_API_IMPORTS 1/g" libavcodec/libx264.c ; cd ../../build ; for file in `ls ../build_artifacts/**/*.tgz`; do tar -xzf $file; done ; rm -f bin/*.dll ; cd ../nvenc ; make PREFIX=../build install ; cp -a ../amf/amf/public/include ../build/include/AMF ; cd ../cartwheel/ffmpeg ; PKG_CONFIG_PATH=../../build/lib/pkgconfig ./configure --toolchain=msvc --extra-cflags="${{ env.cFlags }} -I../../build/include" --extra-ldflags="-LIBPATH:../../build/lib" --prefix=../../build --pkg-config-flags="--static" --extra-libs=Ole32.lib --extra-libs=Advapi32.lib --disable-doc --disable-shared --enable-static --enable-runtime-cpudetect --disable-devices --disable-demuxers --disable-decoders --disable-network --enable-w32threads --enable-gpl ${{ env.COMPONENTS }} ; make -j 2 ; make install ; cd ../../build/lib ; for file in *.a; do mv "$file" "`basename "$file" .a`.lib" ; done ; rm -rf fdk-aac.lib cmake pkgconfig *.la ../share ; cd .. ; tar czf ../dist/ffmpeg-win64-static-${{ inputs.config }}.tar.gz *'
rem D:\a\_temp\setup-msys2\msys2.cmd -c 'git config --global user.email "daniel.stankewitz@gmail.com" ; git config --global user.name "Daniel Stankewitz" ; git clone https://github.com/intel-media-ci/cartwheel-ffmpeg --recursive cartwheel ; cd cartwheel ; git checkout 2757a1d43ca83a3762b24a7ddd74b3291873f89c ; git submodule update --init --recursive ; cd ffmpeg ; git am ../patches/*.patch ; git apply --ignore-whitespace --verbose ../../0001-dynamic-loading-of-shared-fdk-aac-library-cw-5.0.patch ; sed -i "s/#define X264_API_IMPORTS 1/\/\/#define X264_API_IMPORTS 1/g" libavcodec/libx264.c ; cd ../../build ; for file in `ls ../build_artifacts/**/*.tgz`; do tar -xzf $file; done ; rm -f bin/*.dll ; cd ../nvenc ; make PREFIX=../build install ; cp -a ../amf/amf/public/include ../build/include/AMF ; cd ../cartwheel/ffmpeg ; PKG_CONFIG_PATH=../../build/lib/pkgconfig ./configure --toolchain=msvc --extra-cflags="${{ env.cFlags }} -I../../build/include" --extra-ldflags="-LIBPATH:../../build/lib" --prefix=../../build --pkg-config-flags="--static" --extra-libs=Ole32.lib --extra-libs=Advapi32.lib --disable-doc --disable-shared --enable-static --enable-runtime-cpudetect --enable-w32threads --enable-gpl ${{ env.COMPONENTS }} ; make -j 2 ; make install ; cd ../../build/lib ; for file in *.a; do mv "$file" "`basename "$file" .a`.lib" ; done ; rm -rf fdk-aac.lib cmake pkgconfig *.la ../share ; cd .. ; tar czf ../dist/ffmpeg-win64-static-${{ inputs.config }}.tar.gz *'
D:\a\_temp\setup-msys2\msys2.cmd -c 'git config --global user.email "daniel.stankewitz@gmail.com" ; git config --global user.name "Daniel Stankewitz" ; git clone https://github.com/intel-media-ci/cartwheel-ffmpeg --recursive cartwheel ; cd cartwheel ; git submodule update --init --recursive ; cd ffmpeg ; git am ../patches/*.patch ; git apply --ignore-whitespace --verbose ../../libfdkaac-dynlib-5.1.patch ; sed -i "s/#define X264_API_IMPORTS 1/\/\/#define X264_API_IMPORTS 1/g" libavcodec/libx264.c ; cd ../../build ; for file in `ls ../build_artifacts/**/*.tgz`; do tar -xzf $file; done ; rm -f bin/*.dll ; cd ../nvenc ; make PREFIX=../build install ; cp -a ../amf/amf/public/include ../build/include/AMF ; cd ../cartwheel/ffmpeg ; PKG_CONFIG_PATH=../../build/lib/pkgconfig ./configure --toolchain=msvc --extra-cflags="${{ env.cFlags }} -I../../build/include" --extra-ldflags="-LIBPATH:../../build/lib" --prefix=../../build --extra-libs=Ole32.lib --extra-libs=Advapi32.lib --disable-doc ${{ env.variant }} --enable-runtime-cpudetect --enable-w32threads --enable-gpl ${{ env.COMPONENTS }} ; make -j 2 ; make install ; cd ../../build/lib ; for file in *.a; do mv "$file" "`basename "$file" .a`.lib" ; done ; rm -rf fdk-aac.lib cmake pkgconfig *.la ../share ; cd .. ; tar czf ../dist/ffmpeg-win64-${{ inputs.type }}-${{ inputs.config }}.tar.gz *'
- name: Publish artifacts
uses: actions/upload-artifact@v3
with:
name: FFmpeg ${{ runner.os }} ${{ inputs.type }} ${{ inputs.config }} package build
path: dist/ffmpeg-win64-${{ inputs.type }}-${{ inputs.config }}.tar.gz

186
.github/workflows/ffmpeg-lgpl.yaml vendored Normal file
View File

@ -0,0 +1,186 @@
name: 'Build FFmpeg (LGPL)'
on:
workflow_dispatch:
inputs:
system:
type: choice
required: true
default: 'windows-2022'
description: 'System'
options:
- windows-2022
type:
type: choice
required: true
default: 'shared'
description: Type
options:
- static
- shared
config:
type: choice
required: true
default: 'release'
description: 'Configuration'
options:
- debug
- release
ffmpegRef:
type: string
required: true
default: 'master'
description: 'FFmpeg refId'
workflow_call:
inputs:
system:
type: string
required: true
type:
type: string
required: true
config:
type: string
required: true
ffmpegRef:
type: string
required: true
env:
vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
COMPONENTS: "--enable-libvpl --enable-libsvtav1 --enable-libsnappy --enable-libmp3lame --enable-libzimg --enable-libvpx --enable-libopus "
#--enable-libvorbis
NASM_EXECUTABLE: nasm
cFlags: ${{ inputs.config == 'release' && '-MD' || '-MDd' }}
variant: ${{ inputs.type == 'static' && ' --pkg-config-flags="--static" --disable-shared --enable-static' || ' --disable-static --enable-shared --build-suffix=-voukoderpro' }}
msbuildConfig: ${{ inputs.config == 'release' && 'Release' || 'Debug' }}
jobs:
libvpl:
runs-on: ${{ inputs.system }}
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/libvpl
with:
refId: master
config: ${{ inputs.config }}
#liboggvorbis:
# runs-on: ${{ inputs.system }}
# steps:
# - uses: actions/checkout@v3
# - uses: ./.github/actions/liboggvorbis
# with:
# libogg_refId: v1.3.5
# libvorbis_refId: v1.3.7
# config: ${{ inputs.config }}
libsvtav1:
runs-on: ${{ inputs.system }}
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/libsvtav1
with:
refId: v1.4.1
config: ${{ inputs.config }}
libsnappy:
runs-on: ${{ inputs.system }}
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/libsnappy
with:
refId: 1.1.9
config: ${{ inputs.config }}
libvpx:
runs-on: ${{ inputs.system }}
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/libvpx
with:
refId: v1.13.0
config: ${{ inputs.config }}
libmp3lame:
runs-on: ${{ inputs.system }}
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/libmp3lame
with:
refId: tags/RELEASE__3_100
config: ${{ inputs.config }}
libzimg:
runs-on: ${{ inputs.system }}
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/libzimg
with:
refId: release-3.0.4
config: ${{ inputs.config }}
libopus:
runs-on: ${{ inputs.system }}
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/libopus
with:
refId: v1.3.1
config: ${{ inputs.config }}
ffmpeg:
runs-on: ${{ inputs.system }}
needs: [libvpl,libsvtav1,libsnappy,libvpx,libmp3lame,libzimg,libopus]
#liboggvorbis
steps:
- name: Set up MSYS2
uses: msys2/setup-msys2@v2
with:
install: base-devel binutils mingw-w64-x86_64-cmake nasm
path-type: inherit
- name: Set up GIT
run: |
git config --global core.autocrlf false
git config --global core.eol lf
git config --global user.email "daniel.stankewitz@gmail.com"
git config --global user.name "Daniel Stankewitz"
- name: Checkout patches
uses: actions/checkout@v3.0.0
- name: Checkout FFmpeg
uses: actions/checkout@v3.0.0
with:
repository: FFmpeg/FFmpeg.git
ref: ${{ inputs.ffmpegRef }}
path: ffmpeg
- name: Checkout NvEnc
uses: actions/checkout@v3.0.0
with:
repository: FFmpeg/nv-codec-headers
ref: master
path: nvenc
- name: Checkout AMF
uses: actions/checkout@v3.0.0
with:
repository: GPUOpen-LibrariesAndSDKs/AMF
ref: master
path: amf
- name: Set up artifacts
uses: actions/download-artifact@v3
with:
path: build_artifacts
- name: Build FFmpeg
shell: cmd
run: |
call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
md build dist
D:\a\_temp\setup-msys2\msys2.cmd -c 'cd build ; for file in `ls ../build_artifacts/**/*.tgz`; do tar -xzf $file; done ; rm -f bin/*.dll ; cd ../nvenc ; make PREFIX=../build install ; cp -a ../amf/amf/public/include ../build/include/AMF ; cd ../ffmpeg ; PKG_CONFIG_PATH=../build/lib/pkgconfig ./configure --toolchain=msvc --extra-cflags="${{ env.cFlags }} -I../build/include" --extra-ldflags="-LIBPATH:../build/lib" --prefix=../build --extra-libs=Ole32.lib --extra-libs=Advapi32.lib --disable-doc ${{ env.variant }} --enable-runtime-cpudetect --enable-w32threads ${{ env.COMPONENTS }} ; make -j 2 ; make install ; cd ../build/lib ; rm -rf cmake pkgconfig *.la ; cd .. ; tar czf ../dist/ffmpeg-win64-${{ inputs.type }}-${{ inputs.config }}.tar.gz *'
- name: Publish FFmpeg artifacts
uses: actions/upload-artifact@v3
with:
name: FFmpeg ${{ inputs.system }} ${{ inputs.config }}${{ inputs.config }} package build
path: dist/ffmpeg-win64-${{ inputs.type }}-${{ inputs.config }}.tar.gz

View File

@ -1,399 +0,0 @@
name: FFmpeg Shared (v143)
on:
workflow_dispatch:
inputs:
config:
type: choice
description: Configuration
options:
- Debug
- Release
schedule:
- cron: "0 5 * * *"
env:
vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
switches: "--enable-libsvtav1 --enable-libsnappy --enable-libmp3lame --enable-libzimg --enable-libopus --enable-libvorbis --enable-libvpx "
NASM_EXECUTABLE: nasm
msysConfig: release
winConfig: Release
cFlags: -MD
source: "official"
jobs:
liboggvorbis:
runs-on: windows-2022
steps:
- name: Set up GIT
run: |
git config --global core.autocrlf false
git config --global core.eol lf
- name: Checkout Ogg
uses: actions/checkout@v3.0.0
with:
repository: xiph/ogg
ref: master
path: ogg
- name: Checkout Vorbis
uses: actions/checkout@v3.0.0
with:
repository: xiph/vorbis
ref: master
path: vorbis
- name: Check cache
id: liboggvorbis-cache
uses: actions/cache@v3
with:
path: dist
key: liboggvorbis-${{ env.msysConfig }}-${{ hashFiles('ogg') }}-${{ hashFiles('vorbis') }}
- name: Set up MSYS2
if: steps.liboggvorbis-cache.outputs.cache-hit != 'true'
uses: msys2/setup-msys2@v2
with:
install: base-devel binutils autotools automake
path-type: inherit
- name: Build Ogg
if: steps.liboggvorbis-cache.outputs.cache-hit != 'true'
shell: cmd
run: |
call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
md build
D:\a\_temp\setup-msys2\msys2.cmd -c 'cd ogg ; autoreconf -i ; CC=cl.exe CXX=cl.exe CXXFLAGS=${{ env.cFlags }} ./configure --prefix=$(realpath ../build) --disable-shared ; make -j ; make install'
- name: Build Vorbis
if: steps.liboggvorbis-cache.outputs.cache-hit != 'true'
shell: cmd
run: |
call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
md dist
D:\a\_temp\setup-msys2\msys2.cmd -c 'cd vorbis ; autoreconf -i ; CC=cl.exe CXX=cl.exe CXXFLAGS=${{ env.cFlags }} ./configure --prefix=$(realpath ../build) --disable-shared ; make -j ; make install ; sed -i '/^Libs\.private.*/d' ../build/lib/pkgconfig/vorbis.pc ; cd ../build ; tar czf ../dist/liboggvorbis.tgz *'
echo "switches=${{env.switches}} --enable-encoder=libopus --enable-encoder=libvorbis" >> $GITHUB_ENV
- name: Publish artifact
uses: actions/upload-artifact@v2
with:
name: liboggvorbis
path: dist/liboggvorbis.tgz
libvpl:
runs-on: windows-2022
steps:
- name: Set up GIT
run: |
git config --global core.autocrlf false
git config --global core.eol lf
- name: Checkout oneVPL
uses: actions/checkout@v3.0.0
with:
repository: oneapi-src/oneVPL
ref: master
path: onevpl
- name: Check cache
id: libvpl-cache
uses: actions/cache@v3
with:
path: dist
key: libvpl-${{ env.msysConfig }}-${{ hashFiles('onevpl') }}
- name: Set up MSYS2
if: steps.libvpl-cache.outputs.cache-hit != 'true'
uses: msys2/setup-msys2@v2
with:
install: base-devel binutils autotools automake
path-type: inherit
- name: Build oneVPL
if: steps.libvpl-cache.outputs.cache-hit != 'true'
shell: cmd
run: |
call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
md temp build dist
cd temp
cmake.exe -G "Visual Studio 17 2022" ..\onevpl -T host=x64 -A x64 -DBUILD_TOOLS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX=..\build -DCMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD=ON
MSBuild.exe -t:VPL,INSTALL -p:Configuration=${{ env.winConfig }} -m vpl.sln
cd ..\build
IF EXIST "lib\vpld.lib" move "lib\vpld.lib" "lib\vpl.lib"
D:\a\_temp\setup-msys2\msys2.cmd -c 'rm -rf bin/cmake ; tar czf ../dist/libvpl.tgz *'
- name: Publish artifact
uses: actions/upload-artifact@v2
with:
name: libvpl
path: dist/libvpl.tgz
libsvtav1:
runs-on: windows-2022
steps:
- name: Set up GIT
run: |
git config --global core.autocrlf false
git config --global core.eol lf
- name: Checkout SVT AV1
uses: actions/checkout@v3.0.0
with:
repository: AOMediaCodec/SVT-AV1
ref: master
path: svtav1
- name: Check cache
id: libsvtav1-cache
uses: actions/cache@v3
with:
path: dist
key: libsvtav1-${{ env.msysConfig }}-${{ hashFiles('svtav1') }}
- name: Set up MSYS2
if: steps.libsvtav1-cache.outputs.cache-hit != 'true'
uses: msys2/setup-msys2@v2
with:
install: base-devel binutils autotools automake mingw-w64-x86_64-cmake nasm
path-type: inherit
- name: Build SVT AV1
if: steps.libsvtav1-cache.outputs.cache-hit != 'true'
shell: cmd
run: |
call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
md build build\include build\lib build\lib\pkgconfig dist
D:\a\_temp\setup-msys2\msys2.cmd -c 'cd svtav1/Build/windows ; ./build.bat 2022 ${{ env.winConfig }} static ; cp -r ../../Source/API ../../../build/include/svt-av1 ; cp ../../Bin/${{ env.msysConfig }}/SvtAv1Enc.lib ../../../build/lib/ ; cp SvtAv1Enc.pc ../../../build/lib/pkgconfig/ ; cd ../../../build ; tar czf ../dist/libsvtav1.tgz *'
- name: Publish artifact
uses: actions/upload-artifact@v2
with:
name: libsvtav1
path: dist/libsvtav1.tgz
libsnappy:
runs-on: windows-2022
steps:
- name: Set up GIT
run: |
git config --global core.autocrlf false
git config --global core.eol lf
- name: Checkout Snappy
uses: actions/checkout@v3.0.0
with:
repository: google/snappy
ref: "1.1.8"
path: snappy
- name: Check cache
id: libsnappy-cache
uses: actions/cache@v3
with:
path: dist
key: libsnappy-${{ env.msysConfig }}-${{ hashFiles('snappy') }}
- name: Set up MSYS2
if: steps.libsnappy-cache.outputs.cache-hit != 'true'
uses: msys2/setup-msys2@v2
with:
install: base-devel binutils autotools automake mingw-w64-x86_64-cmake nasm
path-type: inherit
- name: Build Snappy
shell: cmd
run: |
call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
md build build\include build\lib build\lib\pkgconfig dist
cd snappy
md work
cd work
cmake -G "Visual Studio 17 2022" .. -DCMAKE_INSTALL_PREFIX=..\..\build -DBUILD_SHARED_LIBS=OFF -DSNAPPY_BUILD_TESTS=OFF
MSBuild.exe /property:Configuration="${{ env.winConfig }}" Snappy.sln
D:\a\_temp\setup-msys2\msys2.cmd -c 'cp ${{ env.winConfig }}/snappy.lib ../../build/lib/snappy.lib ; cp ../snappy.h ../snappy-c.h ../../build/include/ ; cd ../../build ; tar czf ../dist/libsnappy.tgz *'
- name: Publish artifact
uses: actions/upload-artifact@v2
with:
name: libsnappy
path: dist/libsnappy.tgz
libvpx:
runs-on: windows-2022
steps:
- name: Set up GIT
run: |
git config --global core.autocrlf false
git config --global core.eol lf
git clone https://github.com/webmproject/libvpx.git vpx
- name: Check cache
id: libvpx-cache
uses: actions/cache@v3
with:
path: dist
key: libvpx-${{ env.msysConfig }}-${{ hashFiles('vpx') }}
- name: Set up MSYS2
if: steps.libvpx-cache.outputs.cache-hit != 'true'
uses: msys2/setup-msys2@v2
with:
install: base-devel binutils autotools automake mingw-w64-x86_64-cmake nasm
path-type: inherit
- name: Build LibVpx
if: steps.libvpx-cache.outputs.cache-hit != 'true'
shell: cmd
run: |
call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
md build build\include build\lib build\lib\pkgconfig dist
D:\a\_temp\setup-msys2\msys2.cmd -c 'cd vpx ; ./configure --prefix=../build --target=x86_64-win64-vs17 --enable-vp9-highbitdepth --disable-shared --disable-examples --disable-tools --disable-docs --disable-libyuv --disable-unit_tests --disable-postproc ; make -j ; make install ; mv ../build/lib/x64/vpxmd.lib ../build/lib/vpx.lib ; rm -rf ../build/lib/x64 ; cd ../build ; tar czf ../dist/libvpx.tgz *'
- name: Publish artifact
uses: actions/upload-artifact@v2
with:
name: libvpx
path: dist/libvpx.tgz
libmp3lame:
runs-on: windows-2022
steps:
- name: Set up MSYS2
uses: msys2/setup-msys2@v2
with:
install: base-devel binutils autotools automake mingw-w64-x86_64-cmake nasm svn
path-type: inherit
- name: Build LAME
shell: cmd
run: |
call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
md build dist
D:\a\_temp\setup-msys2\msys2.cmd -c 'svn co https://svn.code.sf.net/p/lame/svn/trunk/lame@6474 lame ; cd lame ; autoreconf -i ; CC=cl.exe CXX=cl.exe CXXFLAGS=${{ env.cFlags }} ./configure --prefix=$(realpath ../build) --enable-nasm --disable-frontend --disable-shared --enable-static ; make -j ; make install ; cd ../build ; tar czf ../dist/libmp3lame.tgz *
- name: Publish artifact
uses: actions/upload-artifact@v2
with:
name: libmp3lame
path: dist/libmp3lame.tgz
libzimg:
runs-on: windows-2022
steps:
- name: Set up GIT
run: |
git config --global core.autocrlf false
git config --global core.eol lf
- name: Checkout ZIMG
uses: actions/checkout@v3.0.0
with:
repository: sekrit-twc/zimg
ref: release-2.9.2
path: zimg
- name: Check cache
id: libzimg-cache
uses: actions/cache@v3
with:
path: dist
key: libzimg-${{ env.msysConfig }}-${{ hashFiles('zimg') }}
- name: Set up MSYS2
if: steps.libzimg-cache.outputs.cache-hit != 'true'
uses: msys2/setup-msys2@v2
with:
install: base-devel binutils autotools automake mingw-w64-x86_64-cmake nasm
path-type: inherit
- name: Build ZIMG
if: steps.libzimg-cache.outputs.cache-hit != 'true'
shell: cmd
run: |
call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
md build build\include build\lib build\lib\pkgconfig dist
D:\a\_temp\setup-msys2\msys2.cmd -c 'cd zimg ; ./autogen.sh ; ./configure --prefix=$(realpath ../build) ; cd _msvc/zimg ; MSBuild.exe /property:Configuration="${{ env.winConfig }}" /property:ConfigurationType=StaticLibrary /property:PlatformToolset=v143 /property:Platform=x64 /property:WholeProgramOptimization=false zimg.vcxproj ; cp x64/${{ env.winConfig }}/z.lib ../../../build/lib/zimg.lib ; cd ../.. ; cp src/zimg/api/zimg.h ../build/include/zimg.h ; cp zimg.pc ../build/lib/pkgconfig/zimg.pc ; cd ../build ; tar czf ../dist/libzimg.tgz *'
- name: Publish artifact
uses: actions/upload-artifact@v2
with:
name: libzimg
path: dist/libzimg.tgz
libopus:
runs-on: windows-2022
steps:
- name: Set up GIT
run: |
git config --global core.autocrlf false
git config --global core.eol lf
- name: Checkout OPUS
uses: actions/checkout@v3.0.0
with:
repository: xiph/opus
ref: master
path: opus
- name: Check cache
id: libopus-cache
uses: actions/cache@v3
with:
path: dist
key: libopus-${{ env.msysConfig }}-${{ hashFiles('opus') }}
- name: Set up MSYS2
if: steps.libopus-cache.outputs.cache-hit != 'true'
uses: msys2/setup-msys2@v2
with:
install: base-devel binutils autotools automake mingw-w64-x86_64-cmake nasm
path-type: inherit
- name: Build OPUS
if: steps.libopus-cache.outputs.cache-hit != 'true'
shell: cmd
run: |
call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
md build build\include build\lib build\lib\pkgconfig dist
cd opus\win32\VS2015
MSBuild.exe /property:Configuration="${{ env.winConfig }}" /property:Platform=x64 /property:PlatformToolset=v143 opus.vcxproj
D:\a\_temp\setup-msys2\msys2.cmd -c 'cp x64/${{ env.winConfig }}/opus.lib ../../../build/lib/opus.lib ; cd ../../.. ; cp -r opus/include build/include/opus ; cp opus/opus.pc.in build/lib/pkgconfig/opus.pc ; sed -i "s#@prefix@#$(realpath ../../../build)#g" build/lib/pkgconfig/opus.pc ; sed -i "s/@exec_prefix@/\$\{prefix\}/g" build/lib/pkgconfig/opus.pc ; sed -i "s/@libdir@/\$\{prefix\}\/lib/g" build/lib/pkgconfig/opus.pc ; sed -i "s/@includedir@/\$\{prefix\}\/include/g" build/lib/pkgconfig/opus.pc ; sed -i "s/@LIBM@//g" build/lib/pkgconfig/opus.pc; sed -i "s/@VERSION@/2.0.0/g" build/lib/pkgconfig/opus.pc ; cd build ; tar czf ../dist/libopus.tgz *'
- name: Publish artifact
uses: actions/upload-artifact@v2
with:
name: libopus
path: dist/libopus.tgz
ffmpeg:
runs-on: windows-2022
needs: [libopus,libvpl,libsvtav1,libsnappy,libmp3lame,libzimg,liboggvorbis,libvpx]
steps:
- name: Set up MSYS2
uses: msys2/setup-msys2@v2
with:
install: base-devel binutils mingw-w64-x86_64-cmake nasm
path-type: inherit
- name: Set up GIT
run: |
git config --global core.autocrlf false
git config --global core.eol lf
git config --global user.email "daniel.stankewitz@gmail.com"
git config --global user.name "Daniel Stankewitz"
- name: Checkout patches
uses: actions/checkout@v3.0.0
- name: Checkout FFmpeg
if: ${{env.source == 'official'}}
uses: actions/checkout@v3.0.0
with:
repository: FFmpeg/FFmpeg.git
ref: release/5.0
path: ffmpeg
- name: Checkout NvEnc
uses: actions/checkout@v3.0.0
with:
repository: FFmpeg/nv-codec-headers
ref: sdk/9.1
path: nvenc
- name: Checkout AMF
uses: actions/checkout@v3.0.0
with:
repository: GPUOpen-LibrariesAndSDKs/AMF
ref: master
path: amf
- name: Set up artifacts
uses: actions/download-artifact@v3
with:
path: build_artifacts
- name: Build FFmpeg
if: ${{env.source == 'official'}}
shell: cmd
run: |
call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
md build dist
D:\a\_temp\setup-msys2\msys2.cmd -c 'cd ffmpeg ; git apply --ignore-whitespace --verbose ../0003-dynamic-loading-of-shared-fdk-aac-library-5.0.patch ; cd ../build ; for file in `ls ../build_artifacts/**/*.tgz`; do tar -xzf $file; done ; rm -f bin/*.dll ; cd ../nvenc ; make PREFIX=../build install ; cp -a ../amf/amf/public/include ../build/include/AMF ; cd ../ffmpeg ; PKG_CONFIG_PATH=../build/lib/pkgconfig ./configure --toolchain=msvc --extra-cflags="${{ env.cFlags }} -I../build/include" --extra-ldflags="-LIBPATH:../build/lib" --prefix=../build --pkg-config-flags="--static" --build-suffix=-voukoderpro --disable-doc --disable-static --enable-shared --enable-runtime-cpudetect --enable-w32threads --enable-gpl ${{ env.switches }} ; make ; make install ; cd ../build ; dir ; tar czf ../dist/ffmpeg-win64-shared-${{ env.msysConfig }}.tar.gz *'
- name: Build FFmpeg from Cartwheel
if: ${{env.source == 'cartwheel'}}
shell: cmd
run: |
call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
md build dist
D:\a\_temp\setup-msys2\msys2.cmd -c 'git config --global user.email "daniel.stankewitz@gmail.com" ; git config --global user.name "Daniel Stankewitz" ; git clone https://github.com/intel-media-ci/cartwheel-ffmpeg --recursive cartwheel ; cd cartwheel ; cd patches ; git apply --ignore-whitespace ../../hotfix.patch ; cd .. ; git submodule update --init --recursive ; cd ffmpeg ; git am ../patches/*.patch ; git apply --ignore-whitespace --verbose ../../0001-dynamic-loading-of-shared-fdk-aac-library-cw-5.0.patch ; cd ../../build ; for file in `ls ../build_artifacts/**/*.tgz`; do tar -xzf $file; done ; rm -f bin/*.dll ; cd ../nvenc ; make PREFIX=../build install ; cp -a ../amf/amf/public/include ../build/include/AMF ; cd ../cartwheel/ffmpeg ; PKG_CONFIG_PATH=../../build/lib/pkgconfig ./configure --toolchain=msvc --extra-cflags="${{ env.cFlags }} -I../../build/include" --extra-ldflags="-LIBPATH:../../build/lib" --prefix=../../build --pkg-config-flags="--static" --extra-libs=Ole32.lib --build-suffix=-voukoderpro --extra-libs=Advapi32.lib --disable-doc --disable-static --enable-shared --enable-runtime-cpudetect --enable-w32threads --enable-gpl ${{ env.switches }} ; make ; make install ; cd ../../build ; dir ; tar czf ../dist/ffmpeg-win64-shared-${{ env.msysConfig }}.tar.gz *'
- name: Publish FFmpeg artifacts
uses: actions/upload-artifact@v3
with:
name: ${{ env.winConfig }} package build
path: dist/ffmpeg-win64-shared-${{ env.msysConfig }}.tar.gz

View File

@ -1,603 +0,0 @@
name: FFmpeg Static (v143)
on:
workflow_dispatch:
inputs:
config:
type: choice
description: Configuration
options:
- Debug
- Release
schedule:
- cron: "0 5 * * *"
env:
vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
switches: "--enable-libvpl --enable-libsvtav1 --enable-libsnappy --enable-libmp3lame --enable-libzimg --enable-libopus --enable-libvorbis --enable-libx264 --enable-libx265 --enable-libfdk-aac --enable-libvpx "
NASM_EXECUTABLE: nasm
msysConfig: release
winConfig: Release
cFlags: -MD
useCartwheel: true
jobs:
liboggvorbis:
runs-on: windows-2022
steps:
- name: Set up GIT
run: |
git config --global core.autocrlf false
git config --global core.eol lf
- name: Checkout Ogg
uses: actions/checkout@v3.0.0
with:
repository: xiph/ogg
ref: master
path: ogg
- name: Checkout Vorbis
uses: actions/checkout@v3.0.0
with:
repository: xiph/vorbis
ref: master
path: vorbis
- name: Check cache
id: liboggvorbis-cache
uses: actions/cache@v3
with:
path: dist
key: liboggvorbis-${{ env.msysConfig }}-${{ hashFiles('ogg') }}-${{ hashFiles('vorbis') }}
- name: Set up MSYS2
if: steps.liboggvorbis-cache.outputs.cache-hit != 'true'
uses: msys2/setup-msys2@v2
with:
install: base-devel binutils autotools automake
path-type: inherit
- name: Build Ogg
if: steps.liboggvorbis-cache.outputs.cache-hit != 'true'
shell: cmd
run: |
call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
md build
D:\a\_temp\setup-msys2\msys2.cmd -c 'cd ogg ; autoreconf -i ; CC=cl.exe CXX=cl.exe CXXFLAGS=${{ env.cFlags }} ./configure --prefix=$(realpath ../build) --disable-shared ; make -j ; make install'
- name: Build Vorbis
if: steps.liboggvorbis-cache.outputs.cache-hit != 'true'
shell: cmd
run: |
call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
md dist
D:\a\_temp\setup-msys2\msys2.cmd -c 'cd vorbis ; autoreconf -i ; CC=cl.exe CXX=cl.exe CXXFLAGS=${{ env.cFlags }} ./configure --prefix=$(realpath ../build) --disable-shared ; make -j ; make install ; sed -i '/^Libs\.private.*/d' ../build/lib/pkgconfig/vorbis.pc ; cd ../build ; tar czf ../dist/liboggvorbis.tgz *'
echo "switches=${{env.switches}} --enable-encoder=libopus --enable-encoder=libvorbis" >> $GITHUB_ENV
- name: Publish artifact
uses: actions/upload-artifact@v2
with:
name: liboggvorbis
path: dist/liboggvorbis.tgz
libvpl:
runs-on: windows-2022
steps:
- name: Set up GIT
run: |
git config --global core.autocrlf false
git config --global core.eol lf
- name: Checkout oneVPL
uses: actions/checkout@v3.0.0
with:
repository: oneapi-src/oneVPL
ref: master
path: onevpl
- name: Check cache
id: libvpl-cache
uses: actions/cache@v3
with:
path: dist
key: libvpl-${{ env.msysConfig }}-${{ hashFiles('onevpl') }}
- name: Set up MSYS2
if: steps.libvpl-cache.outputs.cache-hit != 'true'
uses: msys2/setup-msys2@v2
with:
install: base-devel binutils autotools automake
path-type: inherit
- name: Build oneVPL
if: steps.libvpl-cache.outputs.cache-hit != 'true'
shell: cmd
run: |
call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
md temp build dist
cd temp
cmake.exe -G "Visual Studio 17 2022" ..\onevpl -T host=x64 -A x64 -DBUILD_TOOLS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX=..\build -DCMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD=ON
MSBuild.exe -t:VPL,INSTALL -p:Configuration=${{ env.winConfig }} -m vpl.sln
cd ..\build
IF EXIST "lib\vpld.lib" move "lib\vpld.lib" "lib\vpl.lib"
D:\a\_temp\setup-msys2\msys2.cmd -c 'rm -rf bin/cmake ; tar czf ../dist/libvpl.tgz *'
- name: Publish artifact
uses: actions/upload-artifact@v2
with:
name: libvpl
path: dist/libvpl.tgz
libsvtav1:
runs-on: windows-2022
steps:
- name: Set up GIT
run: |
git config --global core.autocrlf false
git config --global core.eol lf
- name: Checkout SVT AV1
uses: actions/checkout@v3.0.0
with:
repository: AOMediaCodec/SVT-AV1
ref: master
path: svtav1
- name: Check cache
id: libsvtav1-cache
uses: actions/cache@v3
with:
path: dist
key: libsvtav1-${{ env.msysConfig }}-${{ hashFiles('svtav1') }}
- name: Set up MSYS2
if: steps.libsvtav1-cache.outputs.cache-hit != 'true'
uses: msys2/setup-msys2@v2
with:
install: base-devel binutils autotools automake mingw-w64-x86_64-cmake nasm
path-type: inherit
- name: Build SVT AV1
if: steps.libsvtav1-cache.outputs.cache-hit != 'true'
shell: cmd
run: |
call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
md build build\include build\lib build\lib\pkgconfig dist
D:\a\_temp\setup-msys2\msys2.cmd -c 'cd svtav1/Build/windows ; ./build.bat 2022 ${{ env.winConfig }} static ; cp -r ../../Source/API ../../../build/include/svt-av1 ; cp ../../Bin/${{ env.msysConfig }}/SvtAv1Enc.lib ../../../build/lib/ ; cp SvtAv1Enc.pc ../../../build/lib/pkgconfig/ ; cd ../../../build ; tar czf ../dist/libsvtav1.tgz *'
- name: Publish artifact
uses: actions/upload-artifact@v2
with:
name: libsvtav1
path: dist/libsvtav1.tgz
libsnappy:
runs-on: windows-2022
steps:
- name: Set up GIT
run: |
git config --global core.autocrlf false
git config --global core.eol lf
- name: Checkout Snappy
uses: actions/checkout@v3.0.0
with:
repository: google/snappy
ref: "1.1.8"
path: snappy
- name: Check cache
id: libsnappy-cache
uses: actions/cache@v3
with:
path: dist
key: libsnappy-${{ env.msysConfig }}-${{ hashFiles('snappy') }}
- name: Set up MSYS2
if: steps.libsnappy-cache.outputs.cache-hit != 'true'
uses: msys2/setup-msys2@v2
with:
install: base-devel binutils autotools automake mingw-w64-x86_64-cmake nasm
path-type: inherit
- name: Build Snappy
shell: cmd
run: |
call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
md build build\include build\lib build\lib\pkgconfig dist
cd snappy
md work
cd work
cmake -G "Visual Studio 17 2022" .. -DCMAKE_INSTALL_PREFIX=..\..\build -DBUILD_SHARED_LIBS=OFF -DSNAPPY_BUILD_TESTS=OFF
MSBuild.exe /property:Configuration="${{ env.winConfig }}" Snappy.sln
D:\a\_temp\setup-msys2\msys2.cmd -c 'cp ${{ env.winConfig }}/snappy.lib ../../build/lib/snappy.lib ; cp ../snappy.h ../snappy-c.h ../../build/include/ ; cd ../../build ; tar czf ../dist/libsnappy.tgz *'
- name: Publish artifact
uses: actions/upload-artifact@v2
with:
name: libsnappy
path: dist/libsnappy.tgz
libvpx:
runs-on: windows-2022
steps:
- name: Set up GIT
run: |
git config --global core.autocrlf false
git config --global core.eol lf
git clone https://github.com/webmproject/libvpx.git vpx
- name: Check cache
id: libvpx-cache
uses: actions/cache@v3
with:
path: dist
key: libvpx-${{ env.msysConfig }}-${{ hashFiles('vpx') }}
- name: Set up MSYS2
if: steps.libvpx-cache.outputs.cache-hit != 'true'
uses: msys2/setup-msys2@v2
with:
install: base-devel binutils autotools automake mingw-w64-x86_64-cmake nasm
path-type: inherit
- name: Build LibVpx
if: steps.libvpx-cache.outputs.cache-hit != 'true'
shell: cmd
run: |
call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
md build build\include build\lib build\lib\pkgconfig dist
D:\a\_temp\setup-msys2\msys2.cmd -c 'cd vpx ; ./configure --prefix=../build --target=x86_64-win64-vs17 --enable-vp9-highbitdepth --disable-shared --disable-examples --disable-tools --disable-docs --disable-libyuv --disable-unit_tests --disable-postproc ; make -j ; make install ; mv ../build/lib/x64/vpxmd.lib ../build/lib/vpx.lib ; rm -rf ../build/lib/x64 ; cd ../build ; tar czf ../dist/libvpx.tgz *'
- name: Publish artifact
uses: actions/upload-artifact@v2
with:
name: libvpx
path: dist/libvpx.tgz
libmp3lame:
runs-on: windows-2022
steps:
- name: Set up MSYS2
uses: msys2/setup-msys2@v2
with:
install: base-devel binutils autotools automake mingw-w64-x86_64-cmake nasm svn
path-type: inherit
- name: Build LAME
shell: cmd
run: |
call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
md build dist
D:\a\_temp\setup-msys2\msys2.cmd -c 'svn co https://svn.code.sf.net/p/lame/svn/trunk/lame@6474 lame ; cd lame ; autoreconf -i ; CC=cl.exe CXX=cl.exe CXXFLAGS=${{ env.cFlags }} ./configure --prefix=$(realpath ../build) --enable-nasm --disable-frontend --disable-shared --enable-static ; make -j ; make install ; cd ../build ; tar czf ../dist/libmp3lame.tgz *
- name: Publish artifact
uses: actions/upload-artifact@v2
with:
name: libmp3lame
path: dist/libmp3lame.tgz
libzimg:
runs-on: windows-2022
steps:
- name: Set up GIT
run: |
git config --global core.autocrlf false
git config --global core.eol lf
- name: Checkout ZIMG
uses: actions/checkout@v3.0.0
with:
repository: sekrit-twc/zimg
ref: release-2.9.2
path: zimg
- name: Check cache
id: libzimg-cache
uses: actions/cache@v3
with:
path: dist
key: libzimg-${{ env.msysConfig }}-${{ hashFiles('zimg') }}
- name: Set up MSYS2
if: steps.libzimg-cache.outputs.cache-hit != 'true'
uses: msys2/setup-msys2@v2
with:
install: base-devel binutils autotools automake mingw-w64-x86_64-cmake nasm
path-type: inherit
- name: Build ZIMG
if: steps.libzimg-cache.outputs.cache-hit != 'true'
shell: cmd
run: |
call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
md build build\include build\lib build\lib\pkgconfig dist
D:\a\_temp\setup-msys2\msys2.cmd -c 'cd zimg ; ./autogen.sh ; ./configure --prefix=$(realpath ../build) ; cd _msvc/zimg ; MSBuild.exe /property:Configuration="${{ env.winConfig }}" /property:ConfigurationType=StaticLibrary /property:PlatformToolset=v143 /property:Platform=x64 /property:WholeProgramOptimization=false zimg.vcxproj ; cp x64/${{ env.winConfig }}/z.lib ../../../build/lib/zimg.lib ; cd ../.. ; cp src/zimg/api/zimg.h ../build/include/zimg.h ; cp zimg.pc ../build/lib/pkgconfig/zimg.pc ; cd ../build ; tar czf ../dist/libzimg.tgz *'
- name: Publish artifact
uses: actions/upload-artifact@v2
with:
name: libzimg
path: dist/libzimg.tgz
libopus:
runs-on: windows-2022
steps:
- name: Set up GIT
run: |
git config --global core.autocrlf false
git config --global core.eol lf
- name: Checkout OPUS
uses: actions/checkout@v3.0.0
with:
repository: xiph/opus
ref: master
path: opus
- name: Check cache
id: libopus-cache
uses: actions/cache@v3
with:
path: dist
key: libopus-${{ env.msysConfig }}-${{ hashFiles('opus') }}
- name: Set up MSYS2
if: steps.libopus-cache.outputs.cache-hit != 'true'
uses: msys2/setup-msys2@v2
with:
install: base-devel binutils autotools automake mingw-w64-x86_64-cmake nasm
path-type: inherit
- name: Build OPUS
if: steps.libopus-cache.outputs.cache-hit != 'true'
shell: cmd
run: |
call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
md build build\include build\lib build\lib\pkgconfig dist
cd opus\win32\VS2015
MSBuild.exe /property:Configuration="${{ env.winConfig }}" /property:Platform=x64 /property:PlatformToolset=v143 opus.vcxproj
D:\a\_temp\setup-msys2\msys2.cmd -c 'cp x64/${{ env.winConfig }}/opus.lib ../../../build/lib/opus.lib ; cd ../../.. ; cp -r opus/include build/include/opus ; cp opus/opus.pc.in build/lib/pkgconfig/opus.pc ; sed -i "s#@prefix@#$(realpath ../../../build)#g" build/lib/pkgconfig/opus.pc ; sed -i "s/@exec_prefix@/\$\{prefix\}/g" build/lib/pkgconfig/opus.pc ; sed -i "s/@libdir@/\$\{prefix\}\/lib/g" build/lib/pkgconfig/opus.pc ; sed -i "s/@includedir@/\$\{prefix\}\/include/g" build/lib/pkgconfig/opus.pc ; sed -i "s/@LIBM@//g" build/lib/pkgconfig/opus.pc; sed -i "s/@VERSION@/2.0.0/g" build/lib/pkgconfig/opus.pc ; cd build ; tar czf ../dist/libopus.tgz *'
- name: Publish artifact
uses: actions/upload-artifact@v2
with:
name: libopus
path: dist/libopus.tgz
libx264:
runs-on: windows-2022
steps:
- name: Set up GIT
run: |
git config --global core.autocrlf false
git config --global core.eol lf
- name: Checkout X264
uses: actions/checkout@v3.0.0
with:
repository: mirror/x264
ref: master
path: x264
- name: Check cache
id: libx264-cache
uses: actions/cache@v3
with:
path: dist
key: libx264-${{ env.msysConfig }}-${{ hashFiles('x264') }}
- name: Set up MSYS2
if: steps.libx264-cache.outputs.cache-hit != 'true'
uses: msys2/setup-msys2@v2
with:
install: base-devel binutils autotools automake mingw-w64-x86_64-cmake nasm
path-type: inherit
- name: Build X264
if: steps.libx264-cache.outputs.cache-hit != 'true'
shell: cmd
run: |
call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
md build build\include build\lib build\lib\pkgconfig dist
D:\a\_temp\setup-msys2\msys2.cmd -c 'cd x264 ; CC=cl ./configure --prefix=$(realpath ../build) --disable-cli --enable-static --enable-pic --libdir=../build/lib ; make -j ; make install-lib-static ; cd ../build ; tar czf ../dist/libx264.tgz *'
- name: Publish artifact
uses: actions/upload-artifact@v2
with:
name: libx264
path: dist/libx264.tgz
libfdkaac:
runs-on: windows-2022
steps:
- name: Set up GIT
run: |
git config --global core.autocrlf false
git config --global core.eol lf
- name: Checkout FDK AAC
uses: actions/checkout@v3.0.0
with:
repository: mstorsjo/fdk-aac
ref: master
path: fdkaac
- name: Check cache
id: libfdkaac-cache
uses: actions/cache@v3
with:
path: dist
key: libfdkaac-${{ env.msysConfig }}-${{ hashFiles('fdkaac') }}
- name: Set up MSYS2
if: steps.libfdkaac-cache.outputs.cache-hit != 'true'
uses: msys2/setup-msys2@v2
with:
install: base-devel binutils autotools automake mingw-w64-x86_64-cmake nasm
path-type: inherit
- name: Build FDK AAC
if: steps.libfdkaac-cache.outputs.cache-hit != 'true'
shell: cmd
run: |
call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
md build dist
D:\a\_temp\setup-msys2\msys2.cmd -c 'cd fdkaac ; autoreconf -fiv ; CC=cl.exe CXX=cl.exe CXXFLAGS=${{ env.cFlags }} ./configure --prefix=$(realpath ../build) --disable-shared --disable-static ; make ; make install ; cd ../build ; tar czf ../dist/libfdkaac.tgz *'
- name: Publish artifact
uses: actions/upload-artifact@v2
with:
name: libfdkaac
path: dist/libfdkaac.tgz
libx265-12:
runs-on: windows-2022
steps:
- name: Checkout X265
shell: cmd
run: |
git config --global core.autocrlf false
git config --global core.eol lf
git clone -b Release_3.5 https://github.com/videolan/x265.git x265
- name: Check cache
id: libx26512-cache
uses: actions/cache@v3
with:
path: dist
key: libx265-12-${{ env.msysConfig }}-${{ hashFiles('x265') }}
- name: Set up MSBuild
if: steps.libx26512-cache.outputs.cache-hit != 'true'
uses: microsoft/setup-msbuild@v1.1
- name: Set up NASM
if: steps.libx26512-cache.outputs.cache-hit != 'true'
uses: ilammy/setup-nasm@v1.2.1
- name: Build X265 (12 bit)
if: steps.libx26512-cache.outputs.cache-hit != 'true'
shell: cmd
run: |
call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
md build dist
cd x265/build/vc15-x86_64
md work
cd work
cmake -G "Visual Studio 17 2022" ..\..\..\source -DHIGH_BIT_DEPTH=ON -DEXPORT_C_API=OFF -DENABLE_SHARED=OFF -DENABLE_CLI=OFF -DMAIN12=ON
MSBuild.exe /property:Configuration="${{ env.winConfig }}" x265-static.vcxproj
move ${{ env.winConfig }}\x265-static.lib ..\..\..\..\dist\x265_12bit.lib
- name: Publish artifact
uses: actions/upload-artifact@v2
with:
name: x265_12bit
path: dist/x265_12bit.lib
libx265-10:
runs-on: windows-2022
steps:
- name: Checkout X265
shell: cmd
run: |
git config --global core.autocrlf false
git config --global core.eol lf
git clone -b Release_3.5 https://github.com/videolan/x265.git x265
- name: Check cache
id: libx26510-cache
uses: actions/cache@v3
with:
path: dist
key: libx265-10-${{ env.msysConfig }}-${{ hashFiles('x265') }}
- name: Set up MSBuild
if: steps.libx26510-cache.outputs.cache-hit != 'true'
uses: microsoft/setup-msbuild@v1.1
- name: Set up NASM
if: steps.libx26510-cache.outputs.cache-hit != 'true'
uses: ilammy/setup-nasm@v1.2.1
- name: Build X265 (10 bit)
if: steps.libx26510-cache.outputs.cache-hit != 'true'
shell: cmd
run: |
call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
md build dist
cd x265/build/vc15-x86_64
md work
cd work
cmake -G "Visual Studio 17 2022" ..\..\..\source -DHIGH_BIT_DEPTH=ON -DEXPORT_C_API=OFF -DENABLE_SHARED=OFF -DENABLE_CLI=OFF
MSBuild.exe /property:Configuration="${{ env.winConfig }}" x265-static.vcxproj
move ${{ env.winConfig }}\x265-static.lib ..\..\..\..\dist\x265_10bit.lib
- name: Publish artifact
uses: actions/upload-artifact@v2
with:
name: x265_10bit
path: dist/x265_10bit.lib
libx265:
runs-on: windows-2022
needs: [libx265-12,libx265-10]
steps:
- name: Checkout X265
shell: cmd
run: |
git config --global core.autocrlf false
git config --global core.eol lf
git clone -b Release_3.5 https://github.com/videolan/x265.git x265
- name: Check cache
id: libx265-cache
uses: actions/cache@v3
with:
path: di
key: libx265-${{ env.msysConfig }}-${{ hashFiles('x265') }}
- name: Set up MSYS2
if: steps.libx265-cache.outputs.cache-hit != 'true'
uses: msys2/setup-msys2@v2
with:
install: base-devel binutils autotools automake
path-type: inherit
- name: Set up MSBuild
if: steps.libx265-cache.outputs.cache-hit != 'true'
uses: microsoft/setup-msbuild@v1.1
- name: Set up NASM
if: steps.libx265-cache.outputs.cache-hit != 'true'
uses: ilammy/setup-nasm@v1.2.1
- name: Set up dependant libs
if: steps.libx265-cache.outputs.cache-hit != 'true'
uses: actions/download-artifact@v3
with:
path: build
- name: Build X265
if: steps.libx265-cache.outputs.cache-hit != 'true'
shell: cmd
run: |
call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
md di dist dist\include dist\lib dist\lib\pkgconfig
cd x265/build/vc15-x86_64
md work
cd work
cmake -G "Visual Studio 17 2022" ..\..\..\source -DCMAKE_INSTALL_PREFIX=..\..\..\..\build -DENABLE_SHARED=OFF -DENABLE_CLI=OFF -DEXTRA_LIB="libx265_10bit.lib;libx265_12bit.lib" -DLINKED_10BIT=ON -DLINKED_12BIT=ON
MSBuild.exe /property:Configuration="${{ env.winConfig }}" x265-static.vcxproj
cp x265.pc ..\..\..\..\dist\lib\pkgconfig\x265.pc
move ${{ env.winConfig }}\x265-static.lib ..\..\..\..\build\
move x265_config.h ..\..\..\..\dist\include\
cd ..\..\..\..
"${{ env.vsPath }}VC\Tools\MSVC\14.29.30133\bin\Hostx64\x64\lib.exe" /ignore:4006 /ignore:4221 /OUT:dist\lib\x265.lib build\x265-static.lib build\x265_10bit\x265_10bit.lib build\x265_12bit\x265_12bit.lib
copy x265\source\x265.h dist\include\
D:\a\_temp\setup-msys2\msys2.cmd -c 'cd dist ; tar czf ../di/libx265.tgz *'
- name: Publish artifact
uses: actions/upload-artifact@v2
with:
name: libx265
path: di/libx265.tgz
ffmpeg:
runs-on: windows-2022
needs: [libopus,libvpl,libsvtav1,libsnappy,libmp3lame,libzimg,liboggvorbis,libx264,libx265,libfdkaac,libvpx]
steps:
- name: Set up MSYS2
uses: msys2/setup-msys2@v2
with:
install: base-devel binutils mingw-w64-x86_64-cmake nasm
path-type: inherit
- name: Set up GIT
run: |
git config --global core.autocrlf false
git config --global core.eol lf
git config --global user.email "daniel.stankewitz@gmail.com"
git config --global user.name "Daniel Stankewitz"
- name: Checkout patches
uses: actions/checkout@v3.0.0
- name: Checkout FFmpeg
if: ${{!env.useCartwheel}}
uses: actions/checkout@v3.0.0
with:
repository: FFmpeg/FFmpeg.git
ref: release/5.0
path: ffmpeg
- name: Checkout NvEnc
uses: actions/checkout@v3.0.0
with:
repository: FFmpeg/nv-codec-headers
ref: sdk/9.1
path: nvenc
- name: Checkout AMF
uses: actions/checkout@v3.0.0
with:
repository: GPUOpen-LibrariesAndSDKs/AMF
ref: master
path: amf
- name: Set up artifacts
uses: actions/download-artifact@v3
with:
path: build_artifacts
- name: Build FFmpeg
if: ${{!env.useCartwheel}}
shell: cmd
run: |
call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
md build dist
D:\a\_temp\setup-msys2\msys2.cmd -c 'cd ffmpeg ; git apply --ignore-whitespace --verbose ../0003-dynamic-loading-of-shared-fdk-aac-library-5.0.patch ; sed -i "s/#define X264_API_IMPORTS 1/\/\/#define X264_API_IMPORTS 1/g" libavcodec/libx264.c ; cd ../build ; for file in `ls ../build_artifacts/**/*.tgz`; do tar -xzf $file; done ; rm -f bin/*.dll ; cd ../nvenc ; make PREFIX=../build install ; cp -a ../amf/amf/public/include ../build/include/AMF ; cd ../ffmpeg ; PKG_CONFIG_PATH=../build/lib/pkgconfig ./configure --toolchain=msvc --extra-cflags="${{ env.cFlags }} -I../build/include" --extra-ldflags="-LIBPATH:../build/lib" --prefix=../build --pkg-config-flags="--static" --disable-doc --disable-shared --enable-static --enable-runtime-cpudetect --disable-devices --disable-demuxers --disable-decoders --disable-network --enable-w32threads --enable-gpl ${{ env.switches }} ; make ; make install ; cd ../build/lib ; for file in *.a; do mv "$file" "`basename "$file" .a`.lib" ; done ; rm -rf fdk-aac.lib cmake pkgconfig *.la ../share ; cd .. ; tar czf ../dist/ffmpeg-win64-static-${{ env.msysConfig }}.tar.gz *'
- name: Build FFmpeg from Cartwheel
if: ${{env.useCartwheel}}
shell: cmd
run: |
call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
md build dist
rem D:\a\_temp\setup-msys2\msys2.cmd -c 'git config --global user.email "daniel.stankewitz@gmail.com" ; git config --global user.name "Daniel Stankewitz" ; git clone https://github.com/intel-media-ci/cartwheel-ffmpeg --recursive cartwheel ; cd cartwheel ; git checkout b3f9843cffd4118e35bb000779444ca2f4196342 ; git submodule update --init --recursive ; cd ffmpeg ; git am ../patches/*.patch ; git apply --ignore-whitespace --verbose ../../0003-dynamic-loading-of-shared-fdk-aac-library-5.0.patch ; sed -i "s/#define X264_API_IMPORTS 1/\/\/#define X264_API_IMPORTS 1/g" libavcodec/libx264.c ; cd ../../build ; for file in `ls ../build_artifacts/**/*.tgz`; do tar -xzf $file; done ; rm -f bin/*.dll ; cd ../nvenc ; make PREFIX=../build install ; cp -a ../amf/amf/public/include ../build/include/AMF ; cd ../cartwheel/ffmpeg ; PKG_CONFIG_PATH=../../build/lib/pkgconfig ./configure --toolchain=msvc --extra-cflags="${{ env.cFlags }} -I../../build/include" --extra-ldflags="-LIBPATH:../../build/lib" --prefix=../../build --pkg-config-flags="--static" --extra-libs=Ole32.lib --extra-libs=Advapi32.lib --disable-doc --disable-shared --enable-static --enable-runtime-cpudetect --disable-devices --disable-demuxers --disable-decoders --disable-network --enable-w32threads --enable-gpl ${{ env.switches }} ; make ; make install ; cd ../../build/lib ; for file in *.a; do mv "$file" "`basename "$file" .a`.lib" ; done ; rm -rf fdk-aac.lib cmake pkgconfig *.la ../share ; cd .. ; tar czf ../dist/ffmpeg-win64-static-${{ env.msysConfig }}.tar.gz *'
rem D:\a\_temp\setup-msys2\msys2.cmd -c 'git config --global user.email "daniel.stankewitz@gmail.com" ; git config --global user.name "Daniel Stankewitz" ; git clone https://github.com/intel-media-ci/cartwheel-ffmpeg --recursive cartwheel ; cd cartwheel ; git checkout 2757a1d43ca83a3762b24a7ddd74b3291873f89c ; cd patches ; git apply --ignore-whitespace ../../hotfix.patch ; cd .. ; git submodule update --init --recursive ; cd ffmpeg ; git am ../patches/*.patch ; git apply --ignore-whitespace --verbose ../../0001-dynamic-loading-of-shared-fdk-aac-library-cw-5.0.patch ; sed -i "s/#define X264_API_IMPORTS 1/\/\/#define X264_API_IMPORTS 1/g" libavcodec/libx264.c ; cd ../../build ; for file in `ls ../build_artifacts/**/*.tgz`; do tar -xzf $file; done ; rm -f bin/*.dll ; cd ../nvenc ; make PREFIX=../build install ; cp -a ../amf/amf/public/include ../build/include/AMF ; cd ../cartwheel/ffmpeg ; PKG_CONFIG_PATH=../../build/lib/pkgconfig ./configure --toolchain=msvc --extra-cflags="${{ env.cFlags }} -I../../build/include" --extra-ldflags="-LIBPATH:../../build/lib" --prefix=../../build --pkg-config-flags="--static" --extra-libs=Ole32.lib --extra-libs=Advapi32.lib --disable-doc --disable-shared --enable-static --enable-runtime-cpudetect --enable-w32threads --enable-gpl ${{ env.switches }} ; make ; make install ; cd ../../build/lib ; for file in *.a; do mv "$file" "`basename "$file" .a`.lib" ; done ; rm -rf fdk-aac.lib cmake pkgconfig *.la ../share ; cd .. ; tar czf ../dist/ffmpeg-win64-static-${{ env.msysConfig }}.tar.gz *'
D:\a\_temp\setup-msys2\msys2.cmd -c 'git config --global user.email "daniel.stankewitz@gmail.com" ; git config --global user.name "Daniel Stankewitz" ; git clone https://github.com/intel-media-ci/cartwheel-ffmpeg --recursive cartwheel ; cd cartwheel ; cd patches ; git apply --ignore-whitespace ../../hotfix.patch ; cd .. ; git submodule update --init --recursive ; cd ffmpeg ; git am ../patches/*.patch ; git apply --ignore-whitespace --verbose ../../0001-dynamic-loading-of-shared-fdk-aac-library-cw-5.0.patch ; sed -i "s/#define X264_API_IMPORTS 1/\/\/#define X264_API_IMPORTS 1/g" libavcodec/libx264.c ; cd ../../build ; for file in `ls ../build_artifacts/**/*.tgz`; do tar -xzf $file; done ; rm -f bin/*.dll ; cd ../nvenc ; make PREFIX=../build install ; cp -a ../amf/amf/public/include ../build/include/AMF ; cd ../cartwheel/ffmpeg ; PKG_CONFIG_PATH=../../build/lib/pkgconfig ./configure --toolchain=msvc --extra-cflags="${{ env.cFlags }} -I../../build/include" --extra-ldflags="-LIBPATH:../../build/lib" --prefix=../../build --pkg-config-flags="--static" --extra-libs=Ole32.lib --extra-libs=Advapi32.lib --disable-doc --disable-shared --enable-static --enable-runtime-cpudetect --enable-w32threads --enable-gpl ${{ env.switches }} ; make ; make install ; cd ../../build/lib ; for file in *.a; do mv "$file" "`basename "$file" .a`.lib" ; done ; rm -rf fdk-aac.lib cmake pkgconfig *.la ../share ; cd .. ; tar czf ../dist/ffmpeg-win64-static-${{ env.msysConfig }}.tar.gz *'
- name: Publish FFmpeg artifacts
uses: actions/upload-artifact@v3
with:
name: ${{ env.winConfig }} package build
path: dist/ffmpeg-win64-static-${{ env.msysConfig }}.tar.gz

230
.github/workflows/ffmpeg.yml vendored Normal file
View File

@ -0,0 +1,230 @@
name: 'Build FFmpeg (GPL)'
on:
workflow_dispatch:
inputs:
system:
type: choice
required: true
default: 'windows-2022'
description: 'System'
options:
- windows-2022
type:
type: choice
required: true
default: 'static'
description: Type
options:
- static
- shared
config:
type: choice
required: true
default: 'release'
description: 'Configuration'
options:
- debug
- release
ffmpegRef:
type: string
required: true
default: 'release/6.0'
description: 'FFmpeg refId'
workflow_call:
inputs:
system:
type: string
required: true
type:
type: string
required: true
config:
type: string
required: true
ffmpegRef:
type: string
required: true
env:
vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
COMPONENTS: "--enable-libvpl --enable-libsvtav1 --enable-libsnappy --enable-libmp3lame --enable-libzimg --enable-libvpx --enable-libvorbis --enable-libopus --enable-libx264 --enable-libx265 "
NASM_EXECUTABLE: nasm
cFlags: ${{ inputs.config == 'release' && '-MD' || '-MDd' }}
variant: ${{ inputs.type == 'static' && ' --pkg-config-flags="--static" --disable-shared --enable-static' || ' --disable-static --enable-shared' }}
msbuildConfig: ${{ inputs.config == 'release' && 'Release' || 'Debug' }}
jobs:
libvpl:
runs-on: ${{ inputs.system }}
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/libvpl
with:
refId: master
config: ${{ inputs.config }}
liboggvorbis:
runs-on: ${{ inputs.system }}
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/liboggvorbis
with:
libogg_refId: v1.3.5
libvorbis_refId: v1.3.7
config: ${{ inputs.config }}
libsvtav1:
runs-on: ${{ inputs.system }}
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/libsvtav1
with:
refId: v1.4.1
config: ${{ inputs.config }}
libsnappy:
runs-on: ${{ inputs.system }}
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/libsnappy
with:
refId: 1.1.9
config: ${{ inputs.config }}
libvpx:
runs-on: ${{ inputs.system }}
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/libvpx
with:
refId: v1.13.0
config: ${{ inputs.config }}
libmp3lame:
runs-on: ${{ inputs.system }}
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/libmp3lame
with:
refId: tags/RELEASE__3_100
config: ${{ inputs.config }}
libzimg:
runs-on: ${{ inputs.system }}
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/libzimg
with:
refId: release-3.0.4
config: ${{ inputs.config }}
libopus:
runs-on: ${{ inputs.system }}
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/libopus
with:
refId: v1.3.1
config: ${{ inputs.config }}
libfdkaac:
runs-on: ${{ inputs.system }}
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/libfdkaac
with:
refId: v2.0.2
config: ${{ inputs.config }}
libx264:
runs-on: ${{ inputs.system }}
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/libx264
with:
refId: stable
config: ${{ inputs.config }}
libx265-12:
runs-on: ${{ inputs.system }}
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/libx265-12
with:
refId: Release_3.5
config: ${{ inputs.config }}
libx265-10:
runs-on: ${{ inputs.system }}
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/libx265-10
with:
refId: Release_3.5
config: ${{ inputs.config }}
libx265:
runs-on: ${{ inputs.system }}
needs: [libx265-12,libx265-10]
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/libx265
with:
refId: Release_3.5
config: ${{ inputs.config }}
ffmpeg:
runs-on: ${{ inputs.system }}
needs: [libvpl,libsvtav1,libsnappy,libvpx,libmp3lame,libzimg,liboggvorbis,libopus,libfdkaac,libx264,libx265]
steps:
- name: Set up MSYS2
uses: msys2/setup-msys2@v2
with:
install: base-devel binutils mingw-w64-x86_64-cmake nasm
path-type: inherit
- name: Set up GIT
run: |
git config --global core.autocrlf false
git config --global core.eol lf
git config --global user.email "daniel.stankewitz@gmail.com"
git config --global user.name "Daniel Stankewitz"
- name: Checkout patches
uses: actions/checkout@v3.0.0
- name: Checkout FFmpeg
uses: actions/checkout@v3.0.0
with:
repository: FFmpeg/FFmpeg.git
ref: ${{ inputs.ffmpegRef }}
path: ffmpeg
- name: Checkout NvEnc
uses: actions/checkout@v3.0.0
with:
repository: FFmpeg/nv-codec-headers
ref: master
path: nvenc
- name: Checkout AMF
uses: actions/checkout@v3.0.0
with:
repository: GPUOpen-LibrariesAndSDKs/AMF
ref: master
path: amf
- name: Set up artifacts
uses: actions/download-artifact@v3
with:
path: build_artifacts
- name: Build FFmpeg
shell: cmd
run: |
call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
md build dist
D:\a\_temp\setup-msys2\msys2.cmd -c 'cd ffmpeg ; git apply --ignore-whitespace ../libfdkaac.patch ; cd ../build ; for file in `ls ../build_artifacts/**/*.tgz`; do tar -xzf $file; done ; rm -f bin/*.dll ; cd ../nvenc ; make PREFIX=../build install ; cp -a ../amf/amf/public/include ../build/include/AMF ; cd ../ffmpeg ; PKG_CONFIG_PATH=../build/lib/pkgconfig ./configure --toolchain=msvc --extra-cflags="${{ env.cFlags }} -I../build/include" --extra-ldflags="-LIBPATH:../build/lib" --prefix=../build --extra-libs=Ole32.lib --extra-libs=Advapi32.lib --disable-doc ${{ env.variant }} --enable-runtime-cpudetect --enable-w32threads --enable-gpl ${{ env.COMPONENTS }} ; make -j 2 ; make install ; cd ../build/lib ; for file in *.a; do mv "$file" "`basename "$file" .a`.lib" ; done ; rm -rf fdk-aac.lib cmake pkgconfig *.la ../share ; cd .. ; tar czf ../dist/ffmpeg-win64-${{ inputs.type }}-${{ inputs.config }}.tar.gz *'
- name: Publish FFmpeg artifacts
uses: actions/upload-artifact@v3
with:
name: FFmpeg ${{ inputs.system }} ${{ inputs.config }}${{ inputs.config }} package build
path: dist/ffmpeg-win64-${{ inputs.type }}-${{ inputs.config }}.tar.gz

111
.github/workflows/test.yml vendored Normal file
View File

@ -0,0 +1,111 @@
name: 'Test'
on:
workflow_dispatch:
inputs:
system:
type: choice
required: true
default: 'windows-2022'
description: 'System'
options:
- windows-2022
type:
type: choice
required: true
default: 'static'
description: Type
options:
- static
- shared
config:
type: choice
required: true
default: 'release'
description: 'Configuration'
options:
- debug
- release
ffmpegRef:
type: string
required: true
default: 'release/5.1'
description: 'FFmpeg refId'
workflow_call:
inputs:
system:
type: string
required: true
type:
type: string
required: true
config:
type: string
required: true
ffmpegRef:
type: string
required: true
env:
vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
COMPONENTS: " "
NASM_EXECUTABLE: nasm
cFlags: ${{ inputs.config == 'release' && '-MD' || '-MDd' }}
variant: ${{ inputs.type == 'static' && ' --pkg-config-flags="--static" --disable-shared --enable-static' || ' --disable-static --enable-shared' }}
msbuildConfig: ${{ inputs.config == 'release' && 'Release' || 'Debug' }}
jobs:
ffmpeg:
runs-on: ${{ inputs.system }}
needs: []
steps:
- name: Set up MSYS2
uses: msys2/setup-msys2@v2
with:
install: base-devel binutils mingw-w64-x86_64-cmake nasm
path-type: inherit
- name: Set up GIT
run: |
git config --global core.autocrlf false
git config --global core.eol lf
git config --global user.email "daniel.stankewitz@gmail.com"
git config --global user.name "Daniel Stankewitz"
- name: Checkout patches
uses: actions/checkout@v3.0.0
- name: Checkout FFmpeg
uses: actions/checkout@v3.0.0
with:
repository: FFmpeg/FFmpeg.git
ref: ${{ inputs.ffmpegRef }}
path: ffmpeg
- name: Checkout NvEnc
uses: actions/checkout@v3.0.0
with:
repository: FFmpeg/nv-codec-headers
ref: master
path: nvenc
- name: Checkout AMF
uses: actions/checkout@v3.0.0
with:
repository: GPUOpen-LibrariesAndSDKs/AMF
ref: master
path: amf
- name: Set up artifacts
uses: actions/download-artifact@v3
with:
path: build_artifacts
- name: Build FFmpeg
shell: cmd
run: |
call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
md build dist
D:\a\_temp\setup-msys2\msys2.cmd -c 'cd ffmpeg ; git apply --ignore-whitespace ../amd-av1-amf.patch ; git apply --ignore-whitespace ../nvidia-av1-nvenc.patch ; git apply --ignore-whitespace --verbose ../libfdkaac-dynlib-5.1.patch ; sed -i "s/#define X264_API_IMPORTS 1/\/\/#define X264_API_IMPORTS 1/g" libavcodec/libx264.c ; cd ../build ; for file in `ls ../build_artifacts/**/*.tgz`; do tar -xzf $file; done ; rm -f bin/*.dll ; cd ../nvenc ; make PREFIX=../build install ; cp -a ../amf/amf/public/include ../build/include/AMF ; cd ../ffmpeg ; PKG_CONFIG_PATH=../build/lib/pkgconfig ./configure --toolchain=msvc --extra-cflags="${{ env.cFlags }} -I../build/include" --extra-ldflags="-LIBPATH:../build/lib" --prefix=../build --extra-libs=Ole32.lib --extra-libs=Advapi32.lib --disable-doc ${{ env.variant }} --enable-runtime-cpudetect --enable-w32threads --enable-gpl ${{ env.COMPONENTS }} ; make -j 2 ; make install ; cd ../build/lib ; for file in *.a; do mv "$file" "`basename "$file" .a`.lib" ; done ; rm -rf fdk-aac.lib cmake pkgconfig *.la ../share ; cd .. ; tar czf ../dist/ffmpeg-win64-${{ inputs.type }}-${{ inputs.config }}.tar.gz *'
- name: Publish FFmpeg artifacts
uses: actions/upload-artifact@v3
with:
name: FFmpeg ${{ inputs.system }} ${{ inputs.config }}${{ inputs.config }} package build
path: dist/ffmpeg-win64-${{ inputs.type }}-${{ inputs.config }}.tar.gz

View File

@ -1,248 +0,0 @@
diff --git a/configure b/configure
index 7a62f0c248..73078ffa60 100755
--- a/configure
+++ b/configure
@@ -1783,7 +1783,6 @@ EXTERNAL_LIBRARY_GPL_LIST="
EXTERNAL_LIBRARY_NONFREE_LIST="
decklink
- libfdk_aac
libtls
"
@@ -1880,6 +1879,7 @@ EXTERNAL_LIBRARY_LIST="
openssl
pocketsphinx
vapoursynth
+ libfdk_aac
"
HWACCEL_AUTODETECT_LIBRARY_LIST="
@@ -6532,9 +6532,7 @@ enabled libdav1d && require_pkg_config libdav1d "dav1d >= 0.5.0" "dav1d
enabled libdavs2 && require_pkg_config libdavs2 "davs2 >= 1.6.0" davs2.h davs2_decoder_open
enabled libdc1394 && require_pkg_config libdc1394 libdc1394-2 dc1394/dc1394.h dc1394_new
enabled libdrm && require_pkg_config libdrm libdrm xf86drm.h drmGetVersion
-enabled libfdk_aac && { check_pkg_config libfdk_aac fdk-aac "fdk-aac/aacenc_lib.h" aacEncOpen ||
- { require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac &&
- warn "using libfdk without pkg-config"; } }
+enabled libfdk_aac && require_headers fdk-aac/aacenc_lib.h
flite_extralibs="-lflite_cmu_time_awb -lflite_cmu_us_awb -lflite_cmu_us_kal -lflite_cmu_us_kal16 -lflite_cmu_us_rms -lflite_cmu_us_slt -lflite_usenglish -lflite_cmulex -lflite"
enabled libflite && require libflite "flite/flite.h" flite_init $flite_extralibs
enabled fontconfig && enable libfontconfig
diff --git a/libavcodec/libfdk-aac_internal.h b/libavcodec/libfdk-aac_internal.h
new file mode 100644
index 0000000000..cd1e6e3340
--- /dev/null
+++ b/libavcodec/libfdk-aac_internal.h
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2018 Gianluigi Tiesi
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_LIBFDK_AAC_INTERNAL_H
+#define AVCODEC_LIBFDK_AAC_INTERNAL_H
+
+#ifdef _WIN32
+#include <windows.h>
+#define LIBNAME "libfdk-aac-2.dll"
+#define dlopen(fname, f) ((void *) LoadLibraryA(fname))
+#define dlclose(handle) FreeLibrary((HMODULE) handle)
+#define dlsym(handle, name) GetProcAddress((HMODULE) handle, name)
+#else
+#include <dlfcn.h>
+#define LIBNAME "libfdk-aac.so.2"
+#endif
+
+#define DLSYM(x) \
+ do \
+ { \
+ s->pfn.x = ( imp_##x ) dlsym(s->hLib, AV_STRINGIFY(x)); \
+ if (!s->pfn.x ) \
+ { \
+ av_log(avctx, AV_LOG_ERROR, "Unable to find symbol " AV_STRINGIFY(x) " in dynamic " LIBNAME "\n"); \
+ return -1; \
+ } \
+ } while (0)
+
+
+#include <fdk-aac/aacenc_lib.h>
+#include <fdk-aac/aacdecoder_lib.h>
+
+typedef AACENC_ERROR (*imp_aacEncOpen)(HANDLE_AACENCODER *phAacEncoder, const UINT encModules, const UINT maxChannels);
+typedef AACENC_ERROR (*imp_aacEncClose)(HANDLE_AACENCODER *phAacEncoder);
+typedef AACENC_ERROR (*imp_aacEncEncode)(const HANDLE_AACENCODER hAacEncoder, const AACENC_BufDesc *inBufDesc, const AACENC_BufDesc *outBufDesc, const AACENC_InArgs *inargs, AACENC_OutArgs *outargs);
+typedef AACENC_ERROR (*imp_aacEncInfo)(const HANDLE_AACENCODER hAacEncoder, AACENC_InfoStruct *pInfo);
+typedef AACENC_ERROR (*imp_aacEncoder_SetParam)(const HANDLE_AACENCODER hAacEncoder, const AACENC_PARAM param, const UINT value);
+
+typedef struct _aacEncLib {
+ imp_aacEncOpen aacEncOpen;
+ imp_aacEncClose aacEncClose;
+ imp_aacEncEncode aacEncEncode;
+ imp_aacEncInfo aacEncInfo;
+ imp_aacEncoder_SetParam aacEncoder_SetParam;
+} aacEncLib;
+
+typedef LINKSPEC_H HANDLE_AACDECODER (*imp_aacDecoder_Open)(TRANSPORT_TYPE transportFmt, UINT nrOfLayers);
+typedef LINKSPEC_H void (*imp_aacDecoder_Close)(HANDLE_AACDECODER self);
+typedef LINKSPEC_H AAC_DECODER_ERROR (*imp_aacDecoder_Fill)(HANDLE_AACDECODER self, UCHAR *pBuffer[], const UINT bufferSize[], UINT *bytesValid);
+typedef LINKSPEC_H AAC_DECODER_ERROR (*imp_aacDecoder_DecodeFrame)(HANDLE_AACDECODER self, INT_PCM *pTimeData, const INT timeDataSize, const UINT flags);
+typedef LINKSPEC_H CStreamInfo* (*imp_aacDecoder_GetStreamInfo)(HANDLE_AACDECODER self);
+typedef LINKSPEC_H AAC_DECODER_ERROR (*imp_aacDecoder_ConfigRaw)(HANDLE_AACDECODER self, UCHAR *conf[], const UINT length[]);
+typedef LINKSPEC_H AAC_DECODER_ERROR (*imp_aacDecoder_SetParam)(const HANDLE_AACDECODER self, const AACDEC_PARAM param, const INT value);
+typedef LINKSPEC_H AAC_DECODER_ERROR (*imp_aacDecoder_AncDataInit)(HANDLE_AACDECODER self, UCHAR *buffer, int size);
+
+typedef struct _aacDecLib {
+ imp_aacDecoder_Open aacDecoder_Open;
+ imp_aacDecoder_Close aacDecoder_Close;
+ imp_aacDecoder_Fill aacDecoder_Fill;
+ imp_aacDecoder_DecodeFrame aacDecoder_DecodeFrame;
+ imp_aacDecoder_ConfigRaw aacDecoder_ConfigRaw;
+ imp_aacDecoder_GetStreamInfo aacDecoder_GetStreamInfo;
+ imp_aacDecoder_SetParam aacDecoder_SetParam;
+ imp_aacDecoder_AncDataInit aacDecoder_AncDataInit;
+} aacDecLib;
+
+#endif /* AVCODEC_LIBFDK_AAC_INTERNAL_H */
diff --git a/libavcodec/libfdk-aacdec.c b/libavcodec/libfdk-aacdec.c
index ffa1fdcce3..b3ee1248ed 100644
--- a/libavcodec/libfdk-aacdec.c
+++ b/libavcodec/libfdk-aacdec.c
@@ -24,6 +24,7 @@
#include "libavutil/opt.h"
#include "avcodec.h"
#include "internal.h"
+#include "libfdk-aac_internal.h"
#ifdef AACDECODER_LIB_VL0
#define FDKDEC_VER_AT_LEAST(vl0, vl1) \
@@ -47,6 +48,8 @@ enum ConcealMethod {
typedef struct FDKAACDecContext {
const AVClass *class;
HANDLE_AACDECODER handle;
+ void *hLib;
+ aacDecLib pfn;
uint8_t *decoder_buffer;
int decoder_buffer_size;
uint8_t *anc_buffer;
@@ -101,7 +104,7 @@ static const AVClass fdk_aac_dec_class = {
static int get_stream_info(AVCodecContext *avctx)
{
FDKAACDecContext *s = avctx->priv_data;
- CStreamInfo *info = aacDecoder_GetStreamInfo(s->handle);
+ CStreamInfo *info = s->pfn.aacDecoder_GetStreamInfo(s->handle);
int channel_counts[0x24] = { 0 };
int i, ch_error = 0;
uint64_t ch_layout = 0;
@@ -216,8 +219,10 @@ static av_cold int fdk_aac_decode_close(AVCodecContext *avctx)
{
FDKAACDecContext *s = avctx->priv_data;
- if (s->handle)
- aacDecoder_Close(s->handle);
+ if (s->hLib && s->handle) {
+ s->pfn.aacDecoder_Close(s->handle);
+ dlclose(s->hLib);
+ }
av_freep(&s->decoder_buffer);
av_freep(&s->anc_buffer);
@@ -229,6 +234,27 @@ static av_cold int fdk_aac_decode_init(AVCodecContext *avctx)
FDKAACDecContext *s = avctx->priv_data;
AAC_DECODER_ERROR err;
+ if (!(s->hLib = dlopen(LIBNAME, RTLD_NOW))) {
+ av_log(avctx, AV_LOG_ERROR, "Unable to load " LIBNAME "\n");
+ return -1;
+ }
+
+ DLSYM(aacDecoder_Open);
+#define aacDecoder_Open s->pfn.aacDecoder_Open
+ DLSYM(aacDecoder_Close);
+ DLSYM(aacDecoder_Fill);
+#define aacDecoder_Fill s->pfn.aacDecoder_Fill
+ DLSYM(aacDecoder_DecodeFrame);
+#define aacDecoder_DecodeFrame s->pfn.aacDecoder_DecodeFrame
+ DLSYM(aacDecoder_GetStreamInfo);
+#define aacDecoder_GetStreamInfo s->pfn.aacDecoder_GetStreamInfo
+ DLSYM(aacDecoder_ConfigRaw);
+#define aacDecoder_ConfigRaw s->pfn.aacDecoder_ConfigRaw
+ DLSYM(aacDecoder_SetParam);
+#define aacDecoder_SetParam s->pfn.aacDecoder_SetParam
+ DLSYM(aacDecoder_AncDataInit);
+#define aacDecoder_AncDataInit s->pfn.aacDecoder_AncDataInit
+
s->handle = aacDecoder_Open(avctx->extradata_size ? TT_MP4_RAW : TT_MP4_ADTS, 1);
if (!s->handle) {
av_log(avctx, AV_LOG_ERROR, "Error opening decoder\n");
diff --git a/libavcodec/libfdk-aacenc.c b/libavcodec/libfdk-aacenc.c
index 7ee2f13ac7..2a91d02c7f 100644
--- a/libavcodec/libfdk-aacenc.c
+++ b/libavcodec/libfdk-aacenc.c
@@ -26,6 +26,7 @@
#include "audio_frame_queue.h"
#include "encode.h"
#include "internal.h"
+#include "libfdk-aac_internal.h"
#include "profiles.h"
#ifdef AACENCODER_LIB_VL0
@@ -47,6 +48,8 @@ typedef struct AACContext {
int header_period;
int vbr;
+ void *hLib;
+ aacEncLib pfn;
AudioFrameQueue afq;
} AACContext;
@@ -111,8 +114,10 @@ static int aac_encode_close(AVCodecContext *avctx)
{
AACContext *s = avctx->priv_data;
- if (s->handle)
- aacEncClose(&s->handle);
+ if (s->hLib && s->handle) {
+ s->pfn.aacEncClose(&s->handle);
+ dlclose(s->hLib);
+ }
ff_af_queue_close(&s->afq);
return 0;
@@ -128,6 +133,21 @@ static av_cold int aac_encode_init(AVCodecContext *avctx)
int aot = FF_PROFILE_AAC_LOW + 1;
int sce = 0, cpe = 0;
+ if (!(s->hLib = dlopen(LIBNAME, RTLD_NOW))) {
+ av_log(avctx, AV_LOG_ERROR, "Unable to load " LIBNAME "\n");
+ return -1;
+ }
+
+ DLSYM(aacEncOpen);
+#define aacEncOpen s->pfn.aacEncOpen
+ DLSYM(aacEncClose);
+ DLSYM(aacEncEncode);
+#define aacEncEncode s->pfn.aacEncEncode
+ DLSYM(aacEncInfo);
+#define aacEncInfo s->pfn.aacEncInfo
+ DLSYM(aacEncoder_SetParam);
+#define aacEncoder_SetParam s->pfn.aacEncoder_SetParam
+
if ((err = aacEncOpen(&s->handle, 0, avctx->channels)) != AACENC_OK) {
av_log(avctx, AV_LOG_ERROR, "Unable to open the encoder: %s\n",
aac_get_error(err));

View File

@ -1,20 +0,0 @@
diff --git a/ffmpeg b/ffmpeg
index 3721aae..336fe22 160000
--- a/ffmpeg
+++ b/ffmpeg
@@ -1 +1 @@
-Subproject commit 3721aaeaaae9f817abb843117ae8dae1dc280a7f
+Subproject commit 336fe225a6a0e12d2ba701c641df63d36151f6fb-dirty
diff --git a/patches/0075-qsv-use-a-new-method-to-create-mfx-session-when-usin.patch b/patches/0075-qsv-use-a-new-method-to-create-mfx-session-when-usin.patch
index d1a787a..6a53eb0 100644
--- a/patches/0075-qsv-use-a-new-method-to-create-mfx-session-when-usin.patch
+++ b/patches/0075-qsv-use-a-new-method-to-create-mfx-session-when-usin.patch
@@ -908,7 +908,7 @@ index 1e8ac56eed..500cf4c0bc 100644
+ break;
+ else if (sts != MFX_ERR_NONE) {
+ impl_idx++;
-+ continue;
++ break;
+ }
+
+ sts = MFXCreateSession(loader, impl_idx, &session);

View File

@ -1,8 +1,8 @@
diff --git a/configure b/configure diff --git a/configure b/configure
index 77facac8c9..ab117fba2c 100755 index b6616f00b6..d02f5099fe 100755
--- a/configure --- a/configure
+++ b/configure +++ b/configure
@@ -1785,7 +1785,6 @@ EXTERNAL_LIBRARY_GPL_LIST=" @@ -1774,7 +1774,6 @@ EXTERNAL_LIBRARY_GPL_LIST="
EXTERNAL_LIBRARY_NONFREE_LIST=" EXTERNAL_LIBRARY_NONFREE_LIST="
decklink decklink
@ -10,7 +10,7 @@ index 77facac8c9..ab117fba2c 100755
libtls libtls
" "
@@ -1882,6 +1881,7 @@ EXTERNAL_LIBRARY_LIST=" @@ -1873,6 +1872,7 @@ EXTERNAL_LIBRARY_LIST="
openssl openssl
pocketsphinx pocketsphinx
vapoursynth vapoursynth
@ -18,7 +18,7 @@ index 77facac8c9..ab117fba2c 100755
" "
HWACCEL_AUTODETECT_LIBRARY_LIST=" HWACCEL_AUTODETECT_LIBRARY_LIST="
@@ -6524,9 +6524,7 @@ enabled libdav1d && require_pkg_config libdav1d "dav1d >= 0.5.0" "dav1d @@ -6581,9 +6581,7 @@ enabled libdav1d && require_pkg_config libdav1d "dav1d >= 0.5.0" "dav1d
enabled libdavs2 && require_pkg_config libdavs2 "davs2 >= 1.6.0" davs2.h davs2_decoder_open enabled libdavs2 && require_pkg_config libdavs2 "davs2 >= 1.6.0" davs2.h davs2_decoder_open
enabled libdc1394 && require_pkg_config libdc1394 libdc1394-2 dc1394/dc1394.h dc1394_new enabled libdc1394 && require_pkg_config libdc1394 libdc1394-2 dc1394/dc1394.h dc1394_new
enabled libdrm && require_pkg_config libdrm libdrm xf86drm.h drmGetVersion enabled libdrm && require_pkg_config libdrm libdrm xf86drm.h drmGetVersion
@ -29,138 +29,11 @@ index 77facac8c9..ab117fba2c 100755
flite_extralibs="-lflite_cmu_time_awb -lflite_cmu_us_awb -lflite_cmu_us_kal -lflite_cmu_us_kal16 -lflite_cmu_us_rms -lflite_cmu_us_slt -lflite_usenglish -lflite_cmulex -lflite" flite_extralibs="-lflite_cmu_time_awb -lflite_cmu_us_awb -lflite_cmu_us_kal -lflite_cmu_us_kal16 -lflite_cmu_us_rms -lflite_cmu_us_slt -lflite_usenglish -lflite_cmulex -lflite"
enabled libflite && require libflite "flite/flite.h" flite_init $flite_extralibs enabled libflite && require libflite "flite/flite.h" flite_init $flite_extralibs
enabled fontconfig && enable libfontconfig enabled fontconfig && enable libfontconfig
diff --git a/libavcodec/libfdk-aacdec.c b/libavcodec/libfdk-aacdec.c diff --git a/libavcodec/libfdk-aac_internal.h b/libavcodec/libfdk-aac_internal.h
index e9096a08e6..cc4d79c651 100644
--- a/libavcodec/libfdk-aacdec.c
+++ b/libavcodec/libfdk-aacdec.c
@@ -25,6 +25,7 @@
#include "avcodec.h"
#include "codec_internal.h"
#include "internal.h"
+#include "libfdk-aac_internal.h"
#ifdef AACDECODER_LIB_VL0
#define FDKDEC_VER_AT_LEAST(vl0, vl1) \
@@ -48,6 +49,8 @@ enum ConcealMethod {
typedef struct FDKAACDecContext {
const AVClass *class;
HANDLE_AACDECODER handle;
+ void *hLib;
+ aacDecLib pfn;
uint8_t *decoder_buffer;
int decoder_buffer_size;
uint8_t *anc_buffer;
@@ -113,7 +116,7 @@ static const AVClass fdk_aac_dec_class = {
static int get_stream_info(AVCodecContext *avctx)
{
FDKAACDecContext *s = avctx->priv_data;
- CStreamInfo *info = aacDecoder_GetStreamInfo(s->handle);
+ CStreamInfo *info = s->pfn.aacDecoder_GetStreamInfo(s->handle);
int channel_counts[0x24] = { 0 };
int i, ch_error = 0;
uint64_t ch_layout = 0;
@@ -231,8 +234,10 @@ static av_cold int fdk_aac_decode_close(AVCodecContext *avctx)
{
FDKAACDecContext *s = avctx->priv_data;
- if (s->handle)
- aacDecoder_Close(s->handle);
+ if (s->hLib && s->handle) {
+ s->pfn.aacDecoder_Close(s->handle);
+ dlclose(s->hLib);
+ }
av_freep(&s->decoder_buffer);
av_freep(&s->anc_buffer);
@@ -244,6 +249,27 @@ static av_cold int fdk_aac_decode_init(AVCodecContext *avctx)
FDKAACDecContext *s = avctx->priv_data;
AAC_DECODER_ERROR err;
+ if (!(s->hLib = dlopen(LIBNAME, RTLD_NOW))) {
+ av_log(avctx, AV_LOG_ERROR, "Unable to load " LIBNAME "\n");
+ return -1;
+ }
+
+ DLSYM(aacDecoder_Open);
+#define aacDecoder_Open s->pfn.aacDecoder_Open
+ DLSYM(aacDecoder_Close);
+ DLSYM(aacDecoder_Fill);
+#define aacDecoder_Fill s->pfn.aacDecoder_Fill
+ DLSYM(aacDecoder_DecodeFrame);
+#define aacDecoder_DecodeFrame s->pfn.aacDecoder_DecodeFrame
+ DLSYM(aacDecoder_GetStreamInfo);
+#define aacDecoder_GetStreamInfo s->pfn.aacDecoder_GetStreamInfo
+ DLSYM(aacDecoder_ConfigRaw);
+#define aacDecoder_ConfigRaw s->pfn.aacDecoder_ConfigRaw
+ DLSYM(aacDecoder_SetParam);
+#define aacDecoder_SetParam s->pfn.aacDecoder_SetParam
+ DLSYM(aacDecoder_AncDataInit);
+#define aacDecoder_AncDataInit s->pfn.aacDecoder_AncDataInit
+
s->handle = aacDecoder_Open(avctx->extradata_size ? TT_MP4_RAW : TT_MP4_ADTS, 1);
if (!s->handle) {
av_log(avctx, AV_LOG_ERROR, "Error opening decoder\n");
diff --git a/libavcodec/libfdk-aacenc.c b/libavcodec/libfdk-aacenc.c
index d004ae00c3..902dddb365 100644
--- a/libavcodec/libfdk-aacenc.c
+++ b/libavcodec/libfdk-aacenc.c
@@ -27,6 +27,7 @@
#include "codec_internal.h"
#include "encode.h"
#include "profiles.h"
+#include "libfdk-aac_internal.h"
#ifdef AACENCODER_LIB_VL0
#define FDKENC_VER_AT_LEAST(vl0, vl1) \
@@ -47,6 +48,8 @@ typedef struct AACContext {
int header_period;
int vbr;
+ void *hLib;
+ aacEncLib pfn;
AudioFrameQueue afq;
} AACContext;
@@ -111,8 +114,10 @@ static int aac_encode_close(AVCodecContext *avctx)
{
AACContext *s = avctx->priv_data;
- if (s->handle)
- aacEncClose(&s->handle);
+ if (s->hLib && s->handle) {
+ s->pfn.aacEncClose(&s->handle);
+ dlclose(s->hLib);
+ }
ff_af_queue_close(&s->afq);
return 0;
@@ -128,6 +133,21 @@ static av_cold int aac_encode_init(AVCodecContext *avctx)
int aot = FF_PROFILE_AAC_LOW + 1;
int sce = 0, cpe = 0;
+ if (!(s->hLib = dlopen(LIBNAME, RTLD_NOW))) {
+ av_log(avctx, AV_LOG_ERROR, "Unable to load " LIBNAME "\n");
+ return -1;
+ }
+
+ DLSYM(aacEncOpen);
+#define aacEncOpen s->pfn.aacEncOpen
+ DLSYM(aacEncClose);
+ DLSYM(aacEncEncode);
+#define aacEncEncode s->pfn.aacEncEncode
+ DLSYM(aacEncInfo);
+#define aacEncInfo s->pfn.aacEncInfo
+ DLSYM(aacEncoder_SetParam);
+#define aacEncoder_SetParam s->pfn.aacEncoder_SetParam
+
if ((err = aacEncOpen(&s->handle, 0, avctx->ch_layout.nb_channels)) != AACENC_OK) {
av_log(avctx, AV_LOG_ERROR, "Unable to open the encoder: %s\n",
aac_get_error(err));
diff --git a/libfdk-aac_internal.h b/libfdk-aac_internal.h
new file mode 100644 new file mode 100644
index 0000000000..9bcfdb9aba index 0000000000..9bcfdb9aba
--- /dev/null --- /dev/null
+++ b/libfdk-aac_internal.h +++ b/libavcodec/libfdk-aac_internal.h
@@ -0,0 +1,84 @@ @@ -0,0 +1,84 @@
+/* +/*
+ * Copyright (c) 2018 Gianluigi Tiesi + * Copyright (c) 2018 Gianluigi Tiesi
@ -247,3 +120,130 @@ index 0000000000..9bcfdb9aba
+ +
+#endif /* AVCODEC_LIBFDK_AAC_INTERNAL_H */ +#endif /* AVCODEC_LIBFDK_AAC_INTERNAL_H */
\ No newline at end of file \ No newline at end of file
diff --git a/libavcodec/libfdk-aacdec.c b/libavcodec/libfdk-aacdec.c
index 8c1586e25e..25f68cdd10 100644
--- a/libavcodec/libfdk-aacdec.c
+++ b/libavcodec/libfdk-aacdec.c
@@ -25,6 +25,7 @@
#include "avcodec.h"
#include "codec_internal.h"
#include "decode.h"
+#include "libfdk-aac_internal.h"
#ifdef AACDECODER_LIB_VL0
#define FDKDEC_VER_AT_LEAST(vl0, vl1) \
@@ -48,6 +49,8 @@ enum ConcealMethod {
typedef struct FDKAACDecContext {
const AVClass *class;
HANDLE_AACDECODER handle;
+ void *hLib;
+ aacDecLib pfn;
uint8_t *decoder_buffer;
int decoder_buffer_size;
uint8_t *anc_buffer;
@@ -113,7 +116,7 @@ static const AVClass fdk_aac_dec_class = {
static int get_stream_info(AVCodecContext *avctx)
{
FDKAACDecContext *s = avctx->priv_data;
- CStreamInfo *info = aacDecoder_GetStreamInfo(s->handle);
+ CStreamInfo *info = s->pfn.aacDecoder_GetStreamInfo(s->handle);
int channel_counts[0x24] = { 0 };
int i, ch_error = 0;
uint64_t ch_layout = 0;
@@ -231,8 +234,10 @@ static av_cold int fdk_aac_decode_close(AVCodecContext *avctx)
{
FDKAACDecContext *s = avctx->priv_data;
- if (s->handle)
- aacDecoder_Close(s->handle);
+ if (s->hLib && s->handle) {
+ s->pfn.aacDecoder_Close(s->handle);
+ dlclose(s->hLib);
+ }
av_freep(&s->decoder_buffer);
av_freep(&s->anc_buffer);
@@ -244,6 +249,27 @@ static av_cold int fdk_aac_decode_init(AVCodecContext *avctx)
FDKAACDecContext *s = avctx->priv_data;
AAC_DECODER_ERROR err;
+ if (!(s->hLib = dlopen(LIBNAME, RTLD_NOW))) {
+ av_log(avctx, AV_LOG_ERROR, "Unable to load " LIBNAME "\n");
+ return -1;
+ }
+
+ DLSYM(aacDecoder_Open);
+#define aacDecoder_Open s->pfn.aacDecoder_Open
+ DLSYM(aacDecoder_Close);
+ DLSYM(aacDecoder_Fill);
+#define aacDecoder_Fill s->pfn.aacDecoder_Fill
+ DLSYM(aacDecoder_DecodeFrame);
+#define aacDecoder_DecodeFrame s->pfn.aacDecoder_DecodeFrame
+ DLSYM(aacDecoder_GetStreamInfo);
+#define aacDecoder_GetStreamInfo s->pfn.aacDecoder_GetStreamInfo
+ DLSYM(aacDecoder_ConfigRaw);
+#define aacDecoder_ConfigRaw s->pfn.aacDecoder_ConfigRaw
+ DLSYM(aacDecoder_SetParam);
+#define aacDecoder_SetParam s->pfn.aacDecoder_SetParam
+ DLSYM(aacDecoder_AncDataInit);
+#define aacDecoder_AncDataInit s->pfn.aacDecoder_AncDataInit
+
s->handle = aacDecoder_Open(avctx->extradata_size ? TT_MP4_RAW : TT_MP4_ADTS, 1);
if (!s->handle) {
av_log(avctx, AV_LOG_ERROR, "Error opening decoder\n");
diff --git a/libavcodec/libfdk-aacenc.c b/libavcodec/libfdk-aacenc.c
index 54549de473..9e93ce092c 100644
--- a/libavcodec/libfdk-aacenc.c
+++ b/libavcodec/libfdk-aacenc.c
@@ -27,6 +27,7 @@
#include "codec_internal.h"
#include "encode.h"
#include "profiles.h"
+#include "libfdk-aac_internal.h"
#ifdef AACENCODER_LIB_VL0
#define FDKENC_VER_AT_LEAST(vl0, vl1) \
@@ -46,6 +47,8 @@ typedef struct AACContext {
int latm;
int header_period;
int vbr;
+ void *hLib;
+ aacEncLib pfn;
AudioFrameQueue afq;
} AACContext;
@@ -111,8 +114,10 @@ static int aac_encode_close(AVCodecContext *avctx)
{
AACContext *s = avctx->priv_data;
- if (s->handle)
- aacEncClose(&s->handle);
+ if (s->hLib && s->handle) {
+ s->pfn.aacEncClose(&s->handle);
+ dlclose(s->hLib);
+ }
ff_af_queue_close(&s->afq);
return 0;
@@ -128,6 +133,21 @@ static av_cold int aac_encode_init(AVCodecContext *avctx)
int aot = FF_PROFILE_AAC_LOW + 1;
int sce = 0, cpe = 0;
+ if (!(s->hLib = dlopen(LIBNAME, RTLD_NOW))) {
+ av_log(avctx, AV_LOG_ERROR, "Unable to load " LIBNAME "\n");
+ return -1;
+ }
+
+ DLSYM(aacEncOpen);
+#define aacEncOpen s->pfn.aacEncOpen
+ DLSYM(aacEncClose);
+ DLSYM(aacEncEncode);
+#define aacEncEncode s->pfn.aacEncEncode
+ DLSYM(aacEncInfo);
+#define aacEncInfo s->pfn.aacEncInfo
+ DLSYM(aacEncoder_SetParam);
+#define aacEncoder_SetParam s->pfn.aacEncoder_SetParam
+
if ((err = aacEncOpen(&s->handle, 0, avctx->ch_layout.nb_channels)) != AACENC_OK) {
av_log(avctx, AV_LOG_ERROR, "Unable to open the encoder: %s\n",
aac_get_error(err));