.github/actions/libkvazaar/action.yml

@@ -1,44 +0,0 @@
-name: libkvazaar
-
-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 KVAZAAR
-    uses: actions/checkout@v3.0.0
-    with:
-      repository: ultravideo/kvazaar
-      ref: ${{ inputs.refId }}
-      path: kvazaar        
-  - 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 KVAZAAR
-    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 kvazaar ; ./autogen.sh ;  CC=cl ./configure --prefix=$(realpath ../build) CPPFLAGS=-DKVZ_STATIC_LIB || true ; make -j ; make install-lib-static ; cd ../build ; tar czf ../dist/libkvazaar.tgz *'
-  - name: Publish artifact
-    uses: actions/upload-artifact@v2
-    with:
-      name: libopus-${{ runner.os }}-${{ inputs.config }}
-      path: dist/libkvazaar.tgz

.github/actions/libvpx/action.yml

@@ -30,7 +30,7 @@ runs:
     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 ; 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 *'
+      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:

.github/workflows/ffmpeg-lgpl.yaml

@@ -32,7 +32,7 @@ on:
       ffmpegRef:
         type: string
         required: true
-        default: 'release/6.1' 
+        default: 'master' 
         description: 'FFmpeg refId'
         
   workflow_call:
@@ -52,7 +52,7 @@ on:
         
 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"
+  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' }}
@@ -66,7 +66,7 @@ jobs:
     - uses: actions/checkout@v3
     - uses: ./.github/actions/libvpl
       with:
-        refId: v2023.3.1
+        refId: master
         config: ${{ inputs.config }}
 
   #liboggvorbis:
@@ -133,35 +133,16 @@ jobs:
         refId: v1.3.1
         config: ${{ inputs.config }}
 
-  #libkvazaar:
-  #  runs-on: ${{ inputs.system }}
-  #  steps:
-  #  - uses: actions/checkout@v3
-  #  - uses: ./.github/actions/libkvazaar
-  #    with:
-  #      refId: v2.3.0
-  #      config: ${{ inputs.config }}
-
   ffmpeg:
     runs-on: ${{ inputs.system }}
     needs: [libvpl,libsvtav1,libsnappy,libvpx,libmp3lame,libzimg,libopus]
-    #libkvazaar,liboggvorbis
+    #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: Create PFX certificate
-      id: create-pfx
-      shell: pwsh
-      env:
-        PFX_CONTENT: ${{ secrets.CODESIGN_PFX }} 
-      run: |
-        $pfxPath = Join-Path -Path $env:RUNNER_TEMP -ChildPath "cert.pfx"; 
-        $encodedBytes = [System.Convert]::FromBase64String($env:PFX_CONTENT); 
-        Set-Content $pfxPath -Value $encodedBytes -AsByteStream;
-        Write-Output "::set-output name=PFX_PATH::$pfxPath";        
     - name: Set up GIT
       run: |
         git config --global core.autocrlf false
@@ -197,7 +178,7 @@ jobs:
       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 --enable-cuda ${{ 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 *'
+        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:

.github/workflows/ffmpeg.yml

@@ -32,7 +32,7 @@ on:
       ffmpegRef:
         type: string
         required: true
-        default: 'release/6.1' 
+        default: 'release/6.0' 
         description: 'FFmpeg refId'
         
   workflow_call:
@@ -52,7 +52,7 @@ on:
         
 env:
   vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
-  COMPONENTS: "--enable-libvpl --enable-libsvtav1 --enable-libsnappy --enable-libmp3lame --enable-libzimg --enable-libvorbis --enable-libopus --enable-libvpx --enable-libx264 --enable-libx265 --enable-libfdk-aac"
+  COMPONENTS: "--enable-libvpl --enable-libsvtav1 --enable-libsnappy --enable-libmp3lame --enable-libzimg --enable-libvorbis --enable-libopus --enable-libx264 --enable-libx265 --enable-libfdk-aac "
   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' }}
@@ -65,7 +65,7 @@ jobs:
     - uses: actions/checkout@v3
     - uses: ./.github/actions/libvpl
       with:
-        refId: v2023.4.0
+        refId: master
         config: ${{ inputs.config }}
 
   liboggvorbis:
@@ -84,7 +84,7 @@ jobs:
     - uses: actions/checkout@v3
     - uses: ./.github/actions/libsvtav1
       with:
-        refId: v1.7.0
+        refId: v1.4.1
         config: ${{ inputs.config }}
 
   libsnappy:
@@ -93,7 +93,7 @@ jobs:
     - uses: actions/checkout@v3
     - uses: ./.github/actions/libsnappy
       with:
-        refId: 1.1.10
+        refId: 1.1.9
         config: ${{ inputs.config }}
 
   libvpx:
@@ -102,7 +102,7 @@ jobs:
     - uses: actions/checkout@v3
     - uses: ./.github/actions/libvpx
       with:
-        refId: v1.13.1
+        refId: v1.13.0
         config: ${{ inputs.config }}
 
   libmp3lame:
@@ -120,7 +120,7 @@ jobs:
     - uses: actions/checkout@v3
     - uses: ./.github/actions/libzimg
       with:
-        refId: release-3.0.5
+        refId: release-3.0.4
         config: ${{ inputs.config }}
 
   libopus:
@@ -129,7 +129,7 @@ jobs:
     - uses: actions/checkout@v3
     - uses: ./.github/actions/libopus
       with:
-        refId: v1.4
+        refId: v1.3.1
         config: ${{ inputs.config }}
 
   libfdkaac:

.github/workflows/test.yml

@@ -14,7 +14,7 @@ on:
       type:
         type: choice
         required: true
-        default: 'shared' 
+        default: 'static' 
         description: Type
         options: 
         - static
@@ -32,7 +32,7 @@ on:
       ffmpegRef:
         type: string
         required: true
-        default: 'release/6.1' 
+        default: 'release/5.1' 
         description: 'FFmpeg refId'
         
   workflow_call:
@@ -52,20 +52,60 @@ on:
         
 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-libkvazaar"
+  COMPONENTS: " "
-  #--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' }}
+  variant: ${{ inputs.type == 'static' && ' --pkg-config-flags="--static" --disable-shared --enable-static' || ' --disable-static --enable-shared' }}
   msbuildConfig: ${{ inputs.config == 'release' && 'Release' || 'Debug' }}
 
 jobs:
-  libkvazaar:
+  ffmpeg:
     runs-on: ${{ inputs.system }}
+    needs: []
     steps:
-    - uses: actions/checkout@v3
+    - name: Set up MSYS2
-    - uses: ./.github/actions/libkvazaar
+      uses: msys2/setup-msys2@v2
       with:
-        refId: v2.3.0
+        install: base-devel binutils mingw-w64-x86_64-cmake nasm
-        config: ${{ inputs.config }}
+        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