Update ffmpeg-lgpl.yaml

.github/actions/libfdkaac/action.yml

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

.github/actions/libkvazaar/action.yml

@@ -0,0 +1,44 @@
+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 --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 *'
+      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 *'
   - name: Publish artifact
     uses: actions/upload-artifact@v2
     with:

.github/workflows/ffmpeg-lgpl.yaml

@@ -0,0 +1,205 @@
+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: 'release/6.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: "--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: v2023.3.1
+        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 }}
+
+  #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
+    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
+        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 --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 *'
+    - 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

.github/workflows/ffmpeg.yml

@@ -1,4 +1,4 @@
-name: 'Build FFmpeg'
+name: 'Build FFmpeg (GPL)'
 
 on:
   workflow_dispatch:
@@ -32,7 +32,7 @@ on:
       ffmpegRef:
         type: string
         required: true
-        default: 'master' 
+        default: 'release/6.1' 
         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-libopus --enable-libvorbis --enable-libx264 --enable-libx265 --enable-libvpx "
+  COMPONENTS: "--enable-libvpl --enable-libsvtav1 --enable-libsnappy --enable-libmp3lame --enable-libzimg --enable-libvorbis --enable-libopus --enable-libvpx --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: master
+        refId: v2023.4.0
         config: ${{ inputs.config }}
 
   liboggvorbis:
@@ -84,16 +84,16 @@ jobs:
     - uses: actions/checkout@v3
     - uses: ./.github/actions/libsvtav1
       with:
-        refId: v1.4.1
+        refId: v1.7.0
         config: ${{ inputs.config }}
-       
+
   libsnappy:
     runs-on: ${{ inputs.system }}
     steps:
     - uses: actions/checkout@v3
     - uses: ./.github/actions/libsnappy
       with:
-        refId: 1.1.9
+        refId: 1.1.10
         config: ${{ inputs.config }}
 
   libvpx:
@@ -102,7 +102,7 @@ jobs:
     - uses: actions/checkout@v3
     - uses: ./.github/actions/libvpx
       with:
-        refId: v1.12.0
+        refId: v1.13.1
         config: ${{ inputs.config }}
 
   libmp3lame:
@@ -120,7 +120,7 @@ jobs:
     - uses: actions/checkout@v3
     - uses: ./.github/actions/libzimg
       with:
-        refId: release-3.0.4
+        refId: release-3.0.5
         config: ${{ inputs.config }}
 
   libopus:
@@ -129,7 +129,7 @@ jobs:
     - uses: actions/checkout@v3
     - uses: ./.github/actions/libopus
       with:
-        refId: v1.3.1
+        refId: v1.4
         config: ${{ inputs.config }}
 
   libfdkaac:
@@ -180,7 +180,7 @@ jobs:
 
   ffmpeg:
     runs-on: ${{ inputs.system }}
-    needs: [libvpl,libopus,libsvtav1,libsnappy,libmp3lame,libzimg,liboggvorbis,libx264,libx265,libfdkaac,libvpx]
+    needs: [libvpl,libsvtav1,libsnappy,libvpx,libmp3lame,libzimg,liboggvorbis,libopus,libfdkaac,libx264,libx265]
     steps:
     - name: Set up MSYS2
       uses: msys2/setup-msys2@v2
@@ -222,7 +222,7 @@ jobs:
       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 ; 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 *'
+        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:

.github/workflows/test.yml

@@ -14,7 +14,7 @@ on:
       type:
         type: choice
         required: true
-        default: 'static' 
+        default: 'shared' 
         description: Type
         options: 
         - static
@@ -32,7 +32,7 @@ on:
       ffmpegRef:
         type: string
         required: true
-        default: 'release/5.1' 
+        default: 'release/6.1' 
         description: 'FFmpeg refId'
         
   workflow_call:
@@ -52,60 +52,20 @@ on:
         
 env:
   vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
-  COMPONENTS: " "
+  COMPONENTS: "--enable-libvpl --enable-libsvtav1 --enable-libsnappy --enable-libmp3lame --enable-libzimg --enable-libvpx --enable-libopus --enable-libkvazaar"
+  #--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' }}
+  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:
-  ffmpeg:
+  libkvazaar:
     runs-on: ${{ inputs.system }}
-    needs: []
     steps:
-    - name: Set up MSYS2
+    - uses: actions/checkout@v3
-      uses: msys2/setup-msys2@v2
+    - uses: ./.github/actions/libkvazaar
       with:
-        install: base-devel binutils mingw-w64-x86_64-cmake nasm
+        refId: v2.3.0
-        path-type: inherit
+        config: ${{ inputs.config }}
-    - 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

amd-av1-amf.patch

@@ -1,462 +0,0 @@
-diff --git a/configure b/configure
-index ba5793b2ff..a7f5642a74 100755
---- a/configure
-+++ b/configure
-@@ -3250,6 +3250,7 @@ vp9_qsv_encoder_select="qsvenc"
- vp9_v4l2m2m_decoder_deps="v4l2_m2m vp9_v4l2_m2m"
- wmv3_crystalhd_decoder_select="crystalhd"
- av1_qsv_decoder_select="qsvdec"
-+av1_amf_encoder_deps="amf"
- 
- # parsers
- aac_parser_select="adts_header mpeg4audio"
-diff --git a/libavcodec/Makefile b/libavcodec/Makefile
-index 457ec58377..4228851b9c 100644
---- a/libavcodec/Makefile
-+++ b/libavcodec/Makefile
-@@ -959,6 +959,7 @@ OBJS-$(CONFIG_AV1_DXVA2_HWACCEL)          += dxva2_av1.o
- OBJS-$(CONFIG_AV1_NVDEC_HWACCEL)          += nvdec_av1.o
- OBJS-$(CONFIG_AV1_VAAPI_HWACCEL)          += vaapi_av1.o
- OBJS-$(CONFIG_AV1_VDPAU_HWACCEL)          += vdpau_av1.o
-+OBJS-$(CONFIG_AV1_AMF_ENCODER)            += amfenc_av1.o
- OBJS-$(CONFIG_H263_VAAPI_HWACCEL)         += vaapi_mpeg4.o
- OBJS-$(CONFIG_H263_VIDEOTOOLBOX_HWACCEL)  += videotoolbox.o
- OBJS-$(CONFIG_H264_D3D11VA_HWACCEL)       += dxva2_h264.o
-diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
-index bdfc2f6f45..f2b44a8d18 100644
---- a/libavcodec/allcodecs.c
-+++ b/libavcodec/allcodecs.c
-@@ -816,6 +816,7 @@ extern const FFCodec ff_libaom_av1_decoder;
- extern const FFCodec ff_av1_decoder;
- extern const FFCodec ff_av1_cuvid_decoder;
- extern const FFCodec ff_av1_qsv_decoder;
-+extern const FFCodec ff_av1_amf_encoder;
- extern const FFCodec ff_libopenh264_encoder;
- extern const FFCodec ff_libopenh264_decoder;
- extern const FFCodec ff_h264_amf_encoder;
-diff --git a/libavcodec/amfenc.c b/libavcodec/amfenc.c
-index a033e1220e..ab75556b6a 100644
---- a/libavcodec/amfenc.c
-+++ b/libavcodec/amfenc.c
-@@ -349,6 +349,9 @@ static int amf_init_encoder(AVCodecContext *avctx)
-         case AV_CODEC_ID_HEVC:
-             codec_id = AMFVideoEncoder_HEVC;
-             break;
-+        case AV_CODEC_ID_AV1:
-+            codec_id = AMFVideoEncoder_AV1;
-+            break;
-         default:
-             break;
-     }
-@@ -460,6 +463,12 @@ static int amf_copy_buffer(AVCodecContext *avctx, AVPacket *pkt, AMFBuffer *buff
-                 pkt->flags = AV_PKT_FLAG_KEY;
-             }
-             break;
-+        case AV_CODEC_ID_AV1:
-+            buffer->pVtbl->GetProperty(buffer, AMF_VIDEO_ENCODER_AV1_OUTPUT_FRAME_TYPE, &var);
-+            if (var.int64Value == AMF_VIDEO_ENCODER_AV1_OUTPUT_FRAME_TYPE_KEY) {
-+                pkt->flags = AV_PKT_FLAG_KEY;
-+            }
-+            break;
-         default:
-             break;
-     }
-@@ -681,6 +690,7 @@ int ff_amf_receive_packet(AVCodecContext *avctx, AVPacket *avpkt)
-         case AV_CODEC_ID_HEVC:
-             AMF_ASSIGN_PROPERTY_INT64(res, surface, AMF_VIDEO_ENCODER_HEVC_INSERT_AUD, !!ctx->aud);
-             break;
-+        //case AV_CODEC_ID_AV1 not supported
-         default:
-             break;
-         }
-diff --git a/libavcodec/amfenc.h b/libavcodec/amfenc.h
-index 1ab98d2f78..96abb58226 100644
---- a/libavcodec/amfenc.h
-+++ b/libavcodec/amfenc.h
-@@ -23,6 +23,7 @@
- 
- #include <AMF/components/VideoEncoderVCE.h>
- #include <AMF/components/VideoEncoderHEVC.h>
-+#include <AMF/components/VideoEncoderAV1.h>
- 
- #include "libavutil/fifo.h"
- 
-@@ -116,6 +117,10 @@ typedef struct AmfContext {
-     int                 min_qp_p;
-     int                 max_qp_p;
-     int                 tier;
-+
-+    // AV1 - specific options
-+
-+    enum AMF_VIDEO_ENCODER_AV1_ALIGNMENT_MODE_ENUM                 align;
- } AmfContext;
- 
- extern const AVCodecHWConfigInternal *const ff_amfenc_hw_configs[];
-diff --git a/libavcodec/amfenc_av1.c b/libavcodec/amfenc_av1.c
-new file mode 100644
-index 0000000000..c0443f90ea
---- /dev/null
-+++ b/libavcodec/amfenc_av1.c
-@@ -0,0 +1,361 @@
-+/*
-+ * 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
-+ */
-+
-+#include "libavutil/internal.h"
-+#include "libavutil/opt.h"
-+#include "amfenc.h"
-+#include "codec_internal.h"
-+#include "internal.h"
-+
-+#define OFFSET(x) offsetof(AmfContext, x)
-+#define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM
-+static const AVOption options[] = {
-+    { "usage",                  "Set the encoding usage",                   OFFSET(usage),                          AV_OPT_TYPE_INT,   {.i64 = AMF_VIDEO_ENCODER_AV1_USAGE_TRANSCODING }, AMF_VIDEO_ENCODER_AV1_USAGE_TRANSCODING, AMF_VIDEO_ENCODER_AV1_USAGE_LOW_LATENCY, VE, "usage" },
-+    { "transcoding",            "", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_USAGE_TRANSCODING }, 0, 0, VE, "usage" },
-+    { "lowlatency",             "", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_USAGE_LOW_LATENCY }, 0, 0, VE, "usage" },
-+
-+    { "profile",                "Set the profile (default main)",           OFFSET(profile),                        AV_OPT_TYPE_INT,{.i64 = AMF_VIDEO_ENCODER_AV1_PROFILE_MAIN }, AMF_VIDEO_ENCODER_AV1_PROFILE_MAIN, AMF_VIDEO_ENCODER_AV1_PROFILE_MAIN, VE, "profile" },
-+    { "main",                   "", 0, AV_OPT_TYPE_CONST,{.i64 = AMF_VIDEO_ENCODER_AV1_PROFILE_MAIN }, 0, 0, VE, "profile" },
-+
-+    { "level",                  "Set the encoding level (default auto)",    OFFSET(level),                          AV_OPT_TYPE_INT,{.i64 = 0 }, 0, AMF_VIDEO_ENCODER_AV1_LEVEL_7_3, VE, "level" },
-+    { "auto",                   "", 0, AV_OPT_TYPE_CONST, {.i64 = 0                               }, 0, 0, VE, "level" },
-+    { "2.0",                    "", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_LEVEL_2_0 }, 0, 0, VE, "level" },
-+    { "2.1",                    "", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_LEVEL_2_1 }, 0, 0, VE, "level" },
-+    { "2.2",                    "", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_LEVEL_2_2 }, 0, 0, VE, "level" },
-+    { "2.3",                    "", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_LEVEL_2_3 }, 0, 0, VE, "level" },
-+    { "3.0",                    "", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_LEVEL_3_0 }, 0, 0, VE, "level" },
-+    { "3.1",                    "", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_LEVEL_3_1 }, 0, 0, VE, "level" },
-+    { "3.2",                    "", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_LEVEL_3_2 }, 0, 0, VE, "level" },
-+    { "3.3",                    "", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_LEVEL_3_3 }, 0, 0, VE, "level" },
-+    { "4.0",                    "", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_LEVEL_4_0 }, 0, 0, VE, "level" },
-+    { "4.1",                    "", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_LEVEL_4_1 }, 0, 0, VE, "level" },
-+    { "4.2",                    "", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_LEVEL_4_2 }, 0, 0, VE, "level" },
-+    { "4.3",                    "", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_LEVEL_4_3 }, 0, 0, VE, "level" },
-+    { "5.0",                    "", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_LEVEL_5_0 }, 0, 0, VE, "level" },
-+    { "5.1",                    "", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_LEVEL_5_1 }, 0, 0, VE, "level" },
-+    { "5.2",                    "", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_LEVEL_5_2 }, 0, 0, VE, "level" },
-+    { "5.3",                    "", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_LEVEL_5_3 }, 0, 0, VE, "level" },
-+    { "6.0",                    "", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_LEVEL_6_0 }, 0, 0, VE, "level" },
-+    { "6.1",                    "", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_LEVEL_6_1 }, 0, 0, VE, "level" },
-+    { "6.2",                    "", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_LEVEL_6_2 }, 0, 0, VE, "level" },
-+    { "6.3",                    "", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_LEVEL_6_3 }, 0, 0, VE, "level" },
-+    { "7.0",                    "", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_LEVEL_7_0 }, 0, 0, VE, "level" },
-+    { "7.1",                    "", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_LEVEL_7_1 }, 0, 0, VE, "level" },
-+    { "7.2",                    "", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_LEVEL_7_2 }, 0, 0, VE, "level" },
-+    { "7.3",                    "", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_LEVEL_7_3 }, 0, 0, VE, "level" },
-+
-+    { "quality",                "Set the encoding quality",                 OFFSET(quality),                        AV_OPT_TYPE_INT,   {.i64 = AMF_VIDEO_ENCODER_AV1_QUALITY_PRESET_SPEED }, AMF_VIDEO_ENCODER_AV1_QUALITY_PRESET_HIGH_QUALITY, AMF_VIDEO_ENCODER_AV1_QUALITY_PRESET_SPEED, VE, "quality" },
-+    { "balanced",               "", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_QUALITY_PRESET_BALANCED      }, 0, 0, VE, "quality" },
-+    { "speed",                  "", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_QUALITY_PRESET_SPEED         }, 0, 0, VE, "quality" },
-+    { "quality",                "", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_QUALITY_PRESET_QUALITY       }, 0, 0, VE, "quality" },
-+    { "high_quality",           "", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_QUALITY_PRESET_HIGH_QUALITY  }, 0, 0, VE, "quality" },
-+
-+    { "rc",                     "Set the rate control mode",                OFFSET(rate_control_mode),              AV_OPT_TYPE_INT, {.i64 = AMF_VIDEO_ENCODER_AV1_RATE_CONTROL_METHOD_UNKNOWN }, AMF_VIDEO_ENCODER_AV1_RATE_CONTROL_METHOD_UNKNOWN, AMF_VIDEO_ENCODER_AV1_RATE_CONTROL_METHOD_CBR, VE, "rc" },
-+    { "cqp",                    "Constant Quantization Parameter",      0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_RATE_CONTROL_METHOD_CONSTANT_QP             }, 0, 0, VE, "rc" },
-+    { "vbr_latency",            "Latency Constrained Variable Bitrate", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_RATE_CONTROL_METHOD_LATENCY_CONSTRAINED_VBR }, 0, 0, VE, "rc" },
-+    { "vbr_peak",               "Peak Contrained Variable Bitrate",     0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_RATE_CONTROL_METHOD_PEAK_CONSTRAINED_VBR    }, 0, 0, VE, "rc" },
-+    { "cbr",                    "Constant Bitrate",                     0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_RATE_CONTROL_METHOD_CBR                     }, 0, 0, VE, "rc" },
-+
-+    { "header_insertion_mode",  "Set header insertion mode",                OFFSET(header_insertion_mode),          AV_OPT_TYPE_INT,{.i64 = AMF_VIDEO_ENCODER_AV1_HEADER_INSERTION_MODE_NONE }, AMF_VIDEO_ENCODER_AV1_HEADER_INSERTION_MODE_NONE, AMF_VIDEO_ENCODER_AV1_HEADER_INSERTION_MODE_KEY_FRAME_ALIGNED, VE, "hdrmode" },
-+    { "none",                   "", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_HEADER_INSERTION_MODE_NONE              }, 0, 0, VE, "hdrmode" },
-+    { "gop",                    "", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_HEADER_INSERTION_MODE_GOP_ALIGNED       }, 0, 0, VE, "hdrmode" },
-+    { "frame",                  "", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_HEADER_INSERTION_MODE_KEY_FRAME_ALIGNED }, 0, 0, VE, "hdrmode" },
-+
-+    { "preanalysis",            "Enable preanalysis",                       OFFSET(preanalysis),                    AV_OPT_TYPE_BOOL, {.i64 = 0  }, 0, 1, VE},
-+    { "enforce_hrd",            "Enforce HRD",                              OFFSET(enforce_hrd),                    AV_OPT_TYPE_BOOL, {.i64 = 0  }, 0, 1, VE},
-+    { "filler_data",            "Filler Data Enable",                       OFFSET(filler_data),                    AV_OPT_TYPE_BOOL, {.i64 = 0  }, 0, 1, VE},
-+
-+    // min_qp_i -> min_qp_intra, min_qp_p -> min_qp_inter
-+    { "min_qp_i",               "min quantization parameter for I-frame",   OFFSET(min_qp_i),                       AV_OPT_TYPE_INT, {.i64 = -1  }, -1, 255, VE },
-+    { "max_qp_i",               "max quantization parameter for I-frame",   OFFSET(max_qp_i),                       AV_OPT_TYPE_INT, {.i64 = -1  }, -1, 255, VE },
-+    { "min_qp_p",               "min quantization parameter for P-frame",   OFFSET(min_qp_p),                       AV_OPT_TYPE_INT, {.i64 = -1  }, -1, 255, VE },
-+    { "max_qp_p",               "max quantization parameter for P-frame",   OFFSET(max_qp_p),                       AV_OPT_TYPE_INT, {.i64 = -1  }, -1, 255, VE },
-+    { "qp_p",                   "quantization parameter for P-frame",       OFFSET(qp_p),                           AV_OPT_TYPE_INT, {.i64 = -1  }, -1, 255, VE },
-+    { "qp_i",                   "quantization parameter for I-frame",       OFFSET(qp_i),                           AV_OPT_TYPE_INT, {.i64 = -1  }, -1, 255, VE },
-+    { "skip_frame",             "Rate Control Based Frame Skip",            OFFSET(skip_frame),                     AV_OPT_TYPE_BOOL,{.i64 = 0   },  0, 1, VE },
-+
-+    { "align",                  "alignment mode",                           OFFSET(align),                          AV_OPT_TYPE_INT,     {.i64 = AMF_VIDEO_ENCODER_AV1_ALIGNMENT_MODE_NO_RESTRICTIONS },         AMF_VIDEO_ENCODER_AV1_ALIGNMENT_MODE_64X16_ONLY, AMF_VIDEO_ENCODER_AV1_ALIGNMENT_MODE_NO_RESTRICTIONS, VE, "align" },
-+    { "64x16",                  "", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_ALIGNMENT_MODE_64X16_ONLY               }, 0, 0, VE, "align" },
-+    { "1080p",                  "", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_ALIGNMENT_MODE_64X16_1080P_CODED_1082   }, 0, 0, VE, "align" },
-+    { "none",                   "", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_ALIGNMENT_MODE_NO_RESTRICTIONS          }, 0, 0, VE, "align" },
-+
-+    { NULL }
-+
-+};
-+
-+static av_cold int amf_encode_init_av1(AVCodecContext* avctx)
-+{
-+    int                 ret = 0;
-+    AMF_RESULT          res = AMF_OK;
-+    AmfContext* ctx = avctx->priv_data;
-+    AMFVariantStruct    var = { 0 };
-+    amf_int64           profile = 0;
-+    amf_int64           profile_level = 0;
-+    AMFBuffer* buffer;
-+    AMFGuid             guid;
-+    AMFRate             framerate;
-+    AMFSize             framesize = AMFConstructSize(avctx->width, avctx->height);
-+
-+
-+
-+    if (avctx->framerate.num > 0 && avctx->framerate.den > 0) {
-+        framerate = AMFConstructRate(avctx->framerate.num, avctx->framerate.den);
-+    }
-+    else {
-+        framerate = AMFConstructRate(avctx->time_base.den, avctx->time_base.num * avctx->ticks_per_frame);
-+    }
-+
-+    if ((ret = ff_amf_encode_init(avctx)) < 0)
-+        return ret;
-+
-+    // init static parameters
-+    AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_USAGE, ctx->usage);
-+
-+    AMF_ASSIGN_PROPERTY_SIZE(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_FRAMESIZE, framesize);
-+
-+    AMF_ASSIGN_PROPERTY_RATE(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_FRAMERATE, framerate);
-+
-+    switch (avctx->profile) {
-+    case FF_PROFILE_AV1_MAIN:
-+        profile = AMF_VIDEO_ENCODER_AV1_PROFILE_MAIN;
-+        break;
-+    default:
-+        break;
-+    }
-+    if (profile == 0) {
-+        profile = ctx->profile;
-+    }
-+    AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_PROFILE, profile);
-+
-+    profile_level = avctx->level;
-+    if (profile_level == FF_LEVEL_UNKNOWN) {
-+        profile_level = ctx->level;
-+    }
-+    if (profile_level != 0) {
-+        AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_LEVEL, profile_level);
-+    }
-+    AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_QUALITY_PRESET, ctx->quality);
-+
-+    // Maximum Reference Frames
-+    if (avctx->refs != -1) {
-+        AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_MAX_NUM_REFRAMES, avctx->refs);
-+    }
-+
-+    // Picture control properties
-+    AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_GOP_SIZE, avctx->gop_size);
-+
-+    AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_HEADER_INSERTION_MODE, ctx->header_insertion_mode);
-+
-+    // Rate control
-+    // autodetect rate control method
-+    if (ctx->rate_control_mode == AMF_VIDEO_ENCODER_AV1_RATE_CONTROL_METHOD_UNKNOWN) {
-+        if (ctx->min_qp_i != -1 || ctx->max_qp_i != -1 ||
-+            ctx->min_qp_p != -1 || ctx->max_qp_p != -1 ||
-+            ctx->qp_i != -1 || ctx->qp_p != -1) {
-+            ctx->rate_control_mode = AMF_VIDEO_ENCODER_AV1_RATE_CONTROL_METHOD_CONSTANT_QP;
-+            av_log(ctx, AV_LOG_DEBUG, "Rate control turned to CQP\n");
-+        }
-+        else if (avctx->rc_max_rate > 0) {
-+            ctx->rate_control_mode = AMF_VIDEO_ENCODER_AV1_RATE_CONTROL_METHOD_PEAK_CONSTRAINED_VBR;
-+            av_log(ctx, AV_LOG_DEBUG, "Rate control turned to Peak VBR\n");
-+        }
-+        else {
-+            ctx->rate_control_mode = AMF_VIDEO_ENCODER_AV1_RATE_CONTROL_METHOD_CBR;
-+            av_log(ctx, AV_LOG_DEBUG, "Rate control turned to CBR\n");
-+        }
-+    }
-+
-+    AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_RATE_CONTROL_METHOD, ctx->rate_control_mode);
-+    if (avctx->rc_buffer_size) {
-+        AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_VBV_BUFFER_SIZE, avctx->rc_buffer_size);
-+
-+        if (avctx->rc_initial_buffer_occupancy != 0) {
-+            int amf_buffer_fullness = avctx->rc_initial_buffer_occupancy * 64 / avctx->rc_buffer_size;
-+            if (amf_buffer_fullness > 64)
-+                amf_buffer_fullness = 64;
-+            AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_INITIAL_VBV_BUFFER_FULLNESS, amf_buffer_fullness);
-+        }
-+    }
-+
-+    // Pre-Pass, Pre-Analysis, Two-Pass
-+    AMF_ASSIGN_PROPERTY_BOOL(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_PRE_ANALYSIS_ENABLE, ctx->preanalysis);
-+
-+    // init dynamic rate control params
-+    if (ctx->max_au_size)
-+        ctx->enforce_hrd = 1;
-+    AMF_ASSIGN_PROPERTY_BOOL(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_ENFORCE_HRD, ctx->enforce_hrd);
-+    AMF_ASSIGN_PROPERTY_BOOL(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_FILLER_DATA, ctx->filler_data);
-+
-+    AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_TARGET_BITRATE, avctx->bit_rate);
-+
-+    if (ctx->rate_control_mode == AMF_VIDEO_ENCODER_AV1_RATE_CONTROL_METHOD_CBR) {
-+        AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_PEAK_BITRATE, avctx->bit_rate);
-+    }
-+    if (avctx->rc_max_rate) {
-+        AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_PEAK_BITRATE, avctx->rc_max_rate);
-+    }
-+    else if (ctx->rate_control_mode == AMF_VIDEO_ENCODER_AV1_RATE_CONTROL_METHOD_PEAK_CONSTRAINED_VBR) {
-+        av_log(ctx, AV_LOG_WARNING, "rate control mode is PEAK_CONSTRAINED_VBR but rc_max_rate is not set\n");
-+    }
-+    if (avctx->bit_rate > 0) {
-+        ctx->rate_control_mode = AMF_VIDEO_ENCODER_AV1_RATE_CONTROL_METHOD_CBR;
-+        av_log(ctx, AV_LOG_DEBUG, "Rate control turned to CBR\n");
-+    }
-+
-+    switch (ctx->align)
-+    {
-+    case AMF_VIDEO_ENCODER_AV1_ALIGNMENT_MODE_64X16_ONLY:
-+        if (avctx->width / 64 * 64 != avctx->width || avctx->height / 16 * 16 != avctx->height)
-+        {
-+            res = AMF_NOT_SUPPORTED;
-+            av_log(ctx, AV_LOG_ERROR, "Resolution incorrect for alignment mode\n");
-+            return AVERROR_EXIT;
-+        }
-+        break;
-+    case AMF_VIDEO_ENCODER_AV1_ALIGNMENT_MODE_64X16_1080P_CODED_1082:
-+        if ((avctx->width / 64 * 64 == avctx->width && avctx->height / 16 * 16 == avctx->height) || (avctx->width == 1920 && avctx->height == 1080))
-+        {
-+            res = AMF_OK;
-+        }
-+        else
-+        {
-+            res = AMF_NOT_SUPPORTED;
-+            av_log(ctx, AV_LOG_ERROR, "Resolution incorrect for alignment mode\n");
-+            return AVERROR_EXIT;
-+        }
-+        break;
-+    case AMF_VIDEO_ENCODER_AV1_ALIGNMENT_MODE_NO_RESTRICTIONS:
-+        res = AMF_OK;
-+        break;
-+    default:
-+        res = AMF_NOT_SUPPORTED;
-+        av_log(ctx, AV_LOG_ERROR, "Invalid alignment mode\n");
-+        return AVERROR_EXIT;
-+    }
-+    AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_ALIGNMENT_MODE, ctx->align);
-+
-+
-+    // init encoder
-+    res = ctx->encoder->pVtbl->Init(ctx->encoder, ctx->format, avctx->width, avctx->height);
-+    AMF_RETURN_IF_FALSE(ctx, res == AMF_OK, AVERROR_BUG, "encoder->Init() failed with error %d\n", res);
-+
-+    // init dynamic picture control params
-+    if (ctx->min_qp_i != -1) {
-+        AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_MIN_Q_INDEX_INTRA, ctx->min_qp_i);
-+    }
-+    else if (avctx->qmin != -1) {
-+        int qval = avctx->qmin > 255 ? 255 : avctx->qmin;
-+        AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_MIN_Q_INDEX_INTRA, qval);
-+    }
-+    if (ctx->max_qp_i != -1) {
-+        AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_MAX_Q_INDEX_INTRA, ctx->max_qp_i);
-+    }
-+    else if (avctx->qmax != -1) {
-+        int qval = avctx->qmax > 255 ? 255 : avctx->qmax;
-+        AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_MAX_Q_INDEX_INTRA, qval);
-+    }
-+    if (ctx->min_qp_p != -1) {
-+        AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_MIN_Q_INDEX_INTER, ctx->min_qp_p);
-+    }
-+    else if (avctx->qmin != -1) {
-+        int qval = avctx->qmin > 255 ? 255 : avctx->qmin;
-+        AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_MIN_Q_INDEX_INTER, qval);
-+    }
-+    if (ctx->max_qp_p != -1) {
-+        AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_MAX_Q_INDEX_INTER, ctx->max_qp_p);
-+    }
-+    else if (avctx->qmax != -1) {
-+        int qval = avctx->qmax > 255 ? 255 : avctx->qmax;
-+        AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_MAX_Q_INDEX_INTER, qval);
-+    }
-+
-+    if (ctx->qp_p != -1) {
-+        AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_Q_INDEX_INTER, ctx->qp_p);
-+    }
-+    if (ctx->qp_i != -1) {
-+        AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_Q_INDEX_INTRA, ctx->qp_i);
-+    }
-+    AMF_ASSIGN_PROPERTY_BOOL(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_RATE_CONTROL_SKIP_FRAME, ctx->skip_frame);
-+
-+
-+    // fill extradata
-+    res = AMFVariantInit(&var);
-+    AMF_RETURN_IF_FALSE(ctx, res == AMF_OK, AVERROR_BUG, "AMFVariantInit() failed with error %d\n", res);
-+
-+    res = ctx->encoder->pVtbl->GetProperty(ctx->encoder, AMF_VIDEO_ENCODER_AV1_EXTRA_DATA, &var);
-+    AMF_RETURN_IF_FALSE(ctx, res == AMF_OK, AVERROR_BUG, "GetProperty(AMF_VIDEO_ENCODER_EXTRADATA) failed with error %d\n", res);
-+    AMF_RETURN_IF_FALSE(ctx, var.pInterface != NULL, AVERROR_BUG, "GetProperty(AMF_VIDEO_ENCODER_EXTRADATA) returned NULL\n");
-+
-+    guid = IID_AMFBuffer();
-+
-+    res = var.pInterface->pVtbl->QueryInterface(var.pInterface, &guid, (void**)&buffer); // query for buffer interface
-+    if (res != AMF_OK) {
-+        var.pInterface->pVtbl->Release(var.pInterface);
-+    }
-+    AMF_RETURN_IF_FALSE(ctx, res == AMF_OK, AVERROR_BUG, "QueryInterface(IID_AMFBuffer) failed with error %d\n", res);
-+
-+    avctx->extradata_size = (int)buffer->pVtbl->GetSize(buffer);
-+    avctx->extradata = av_mallocz(avctx->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE);
-+    if (!avctx->extradata) {
-+        buffer->pVtbl->Release(buffer);
-+        var.pInterface->pVtbl->Release(var.pInterface);
-+        return AVERROR(ENOMEM);
-+    }
-+    memcpy(avctx->extradata, buffer->pVtbl->GetNative(buffer), avctx->extradata_size);
-+
-+    buffer->pVtbl->Release(buffer);
-+    var.pInterface->pVtbl->Release(var.pInterface);
-+
-+    return 0;
-+}
-+
-+static const FFCodecDefault defaults[] = {
-+    { "refs",       "-1"  },
-+    { "aspect",     "0"   },
-+    { "b",          "2M"  },
-+    { "g",          "250" },
-+    { "qmin",       "-1"  },
-+    { "qmax",       "-1"  },
-+    { NULL                },
-+};
-+
-+static const AVClass av1_amf_class = {
-+    .class_name = "av1_amf",
-+    .item_name = av_default_item_name,
-+    .option = options,
-+    .version = LIBAVUTIL_VERSION_INT,
-+};
-+
-+const FFCodec ff_av1_amf_encoder = {
-+    .p.name = "av1_amf",
-+    .p.long_name = NULL_IF_CONFIG_SMALL("AMD AMF AV1 encoder"),
-+    .p.type = AVMEDIA_TYPE_VIDEO,
-+    .p.id = AV_CODEC_ID_AV1,
-+    .init = amf_encode_init_av1,
-+    FF_CODEC_RECEIVE_PACKET_CB(ff_amf_receive_packet),
-+    .close = ff_amf_encode_close,
-+    .priv_data_size = sizeof(AmfContext),
-+    .p.priv_class = &av1_amf_class,
-+    .defaults = defaults,
-+    .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HARDWARE |
-+                      AV_CODEC_CAP_DR1,
-+    .caps_internal = FF_CODEC_CAP_INIT_CLEANUP,
-+    .p.pix_fmts = ff_amf_pix_fmts,
-+    .p.wrapper_name = "amf",
-+    .hw_configs = ff_amfenc_hw_configs,
-+};
-\ No newline at end of file

amd-av1-headers.patch

@@ -1,306 +0,0 @@
-diff --git a/amf/public/include/components/VideoEncoderAV1.h b/amf/public/include/components/VideoEncoderAV1.h
-new file mode 100644
-index 0000000..b672665
---- /dev/null
-+++ b/amf/public/include/components/VideoEncoderAV1.h
-@@ -0,0 +1,300 @@
-+//
-+// Copyright (c) 2021-2022 Advanced Micro Devices, Inc. All rights reserved.
-+//
-+// Permission is hereby granted, free of charge, to any person obtaining a copy
-+// of this software and associated documentation files (the "Software"), to deal
-+// in the Software without restriction, including without limitation the rights
-+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-+// copies of the Software, and to permit persons to whom the Software is
-+// furnished to do so, subject to the following conditions:
-+//
-+// The above copyright notice and this permission notice shall be included in
-+// all copies or substantial portions of the Software.
-+//
-+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-+// THE SOFTWARE.
-+//
-+
-+//-------------------------------------------------------------------------------------------------
-+//  VideoEncoderHW_AV1 interface declaration
-+//-------------------------------------------------------------------------------------------------
-+
-+#ifndef AMF_VideoEncoderAV1_h
-+#define AMF_VideoEncoderAV1_h
-+#pragma once
-+
-+#include "Component.h"
-+#include "ColorSpace.h"
-+#include "PreAnalysis.h"
-+
-+#define AMFVideoEncoder_AV1 L"AMFVideoEncoderHW_AV1"
-+
-+enum AMF_VIDEO_ENCODER_AV1_ENCODING_LATENCY_MODE_ENUM
-+{
-+    AMF_VIDEO_ENCODER_AV1_ENCODING_LATENCY_MODE_NONE                    = 0,    // No encoding latency requirement. Encoder will balance encoding time and power consumption.
-+    AMF_VIDEO_ENCODER_AV1_ENCODING_LATENCY_MODE_POWER_SAVING_REAL_TIME  = 1,    // Try the best to finish encoding a frame within 1/framerate sec. This mode may cause more power consumption
-+    AMF_VIDEO_ENCODER_AV1_ENCODING_LATENCY_MODE_REAL_TIME               = 2,    // Try the best to finish encoding a frame within 1/(2 x framerate) sec. This mode will cause more power consumption than POWER_SAVING_REAL_TIME
-+    AMF_VIDEO_ENCODER_AV1_ENCODING_LATENCY_MODE_LOWEST_LATENCY          = 3     // Encoding as fast as possible. This mode causes highest power consumption.
-+};
-+
-+enum AMF_VIDEO_ENCODER_AV1_USAGE_ENUM
-+{
-+    AMF_VIDEO_ENCODER_AV1_USAGE_TRANSCODING     = 0,
-+    AMF_VIDEO_ENCODER_AV1_USAGE_LOW_LATENCY     = 1
-+};
-+
-+enum AMF_VIDEO_ENCODER_AV1_PROFILE_ENUM
-+{
-+    AMF_VIDEO_ENCODER_AV1_PROFILE_MAIN = 1
-+};
-+
-+enum AMF_VIDEO_ENCODER_AV1_LEVEL_ENUM
-+{
-+    AMF_VIDEO_ENCODER_AV1_LEVEL_2_0 = 0,
-+    AMF_VIDEO_ENCODER_AV1_LEVEL_2_1 = 1,
-+    AMF_VIDEO_ENCODER_AV1_LEVEL_2_2 = 2,
-+    AMF_VIDEO_ENCODER_AV1_LEVEL_2_3 = 3,
-+    AMF_VIDEO_ENCODER_AV1_LEVEL_3_0 = 4,
-+    AMF_VIDEO_ENCODER_AV1_LEVEL_3_1 = 5,
-+    AMF_VIDEO_ENCODER_AV1_LEVEL_3_2 = 6,
-+    AMF_VIDEO_ENCODER_AV1_LEVEL_3_3 = 7,
-+    AMF_VIDEO_ENCODER_AV1_LEVEL_4_0 = 8,
-+    AMF_VIDEO_ENCODER_AV1_LEVEL_4_1 = 9,
-+    AMF_VIDEO_ENCODER_AV1_LEVEL_4_2 = 10,
-+    AMF_VIDEO_ENCODER_AV1_LEVEL_4_3 = 11,
-+    AMF_VIDEO_ENCODER_AV1_LEVEL_5_0 = 12,
-+    AMF_VIDEO_ENCODER_AV1_LEVEL_5_1 = 13,
-+    AMF_VIDEO_ENCODER_AV1_LEVEL_5_2 = 14,
-+    AMF_VIDEO_ENCODER_AV1_LEVEL_5_3 = 15,
-+    AMF_VIDEO_ENCODER_AV1_LEVEL_6_0 = 16,
-+    AMF_VIDEO_ENCODER_AV1_LEVEL_6_1 = 17,
-+    AMF_VIDEO_ENCODER_AV1_LEVEL_6_2 = 18,
-+    AMF_VIDEO_ENCODER_AV1_LEVEL_6_3 = 19,
-+    AMF_VIDEO_ENCODER_AV1_LEVEL_7_0 = 20,
-+    AMF_VIDEO_ENCODER_AV1_LEVEL_7_1 = 21,
-+    AMF_VIDEO_ENCODER_AV1_LEVEL_7_2 = 22,
-+    AMF_VIDEO_ENCODER_AV1_LEVEL_7_3 = 23
-+};
-+
-+enum AMF_VIDEO_ENCODER_AV1_RATE_CONTROL_METHOD_ENUM
-+{
-+    AMF_VIDEO_ENCODER_AV1_RATE_CONTROL_METHOD_UNKNOWN                   = -1,
-+    AMF_VIDEO_ENCODER_AV1_RATE_CONTROL_METHOD_CONSTANT_QP               = 0,
-+    AMF_VIDEO_ENCODER_AV1_RATE_CONTROL_METHOD_LATENCY_CONSTRAINED_VBR   = 1,
-+    AMF_VIDEO_ENCODER_AV1_RATE_CONTROL_METHOD_PEAK_CONSTRAINED_VBR      = 2,
-+    AMF_VIDEO_ENCODER_AV1_RATE_CONTROL_METHOD_CBR                       = 3,
-+    AMF_VIDEO_ENCODER_AV1_RATE_CONTROL_METHOD_QUALITY_VBR               = 4,
-+    AMF_VIDEO_ENCODER_AV1_RATE_CONTROL_METHOD_HIGH_QUALITY_VBR          = 5,
-+    AMF_VIDEO_ENCODER_AV1_RATE_CONTROL_METHOD_HIGH_QUALITY_CBR          = 6
-+};
-+
-+enum AMF_VIDEO_ENCODER_AV1_ALIGNMENT_MODE_ENUM
-+{
-+    AMF_VIDEO_ENCODER_AV1_ALIGNMENT_MODE_64X16_ONLY               = 1,
-+    AMF_VIDEO_ENCODER_AV1_ALIGNMENT_MODE_64X16_1080P_CODED_1082   = 2,
-+    AMF_VIDEO_ENCODER_AV1_ALIGNMENT_MODE_NO_RESTRICTIONS          = 3
-+};
-+
-+enum AMF_VIDEO_ENCODER_AV1_FORCE_FRAME_TYPE_ENUM
-+{
-+    AMF_VIDEO_ENCODER_AV1_FORCE_FRAME_TYPE_NONE             = 0,
-+    AMF_VIDEO_ENCODER_AV1_FORCE_FRAME_TYPE_KEY              = 1,
-+    AMF_VIDEO_ENCODER_AV1_FORCE_FRAME_TYPE_INTRA_ONLY       = 2,
-+    AMF_VIDEO_ENCODER_AV1_FORCE_FRAME_TYPE_SWITCH           = 3,
-+    AMF_VIDEO_ENCODER_AV1_FORCE_FRAME_TYPE_SHOW_EXISTING    = 4
-+};
-+
-+enum AMF_VIDEO_ENCODER_AV1_OUTPUT_FRAME_TYPE_ENUM
-+{
-+    AMF_VIDEO_ENCODER_AV1_OUTPUT_FRAME_TYPE_KEY             = 0,
-+    AMF_VIDEO_ENCODER_AV1_OUTPUT_FRAME_TYPE_INTRA_ONLY      = 1,
-+    AMF_VIDEO_ENCODER_AV1_OUTPUT_FRAME_TYPE_INTER           = 2,
-+    AMF_VIDEO_ENCODER_AV1_OUTPUT_FRAME_TYPE_SWITCH          = 3,
-+    AMF_VIDEO_ENCODER_AV1_OUTPUT_FRAME_TYPE_SHOW_EXISTING   = 4
-+};
-+
-+enum AMF_VIDEO_ENCODER_AV1_QUALITY_PRESET_ENUM
-+{
-+    AMF_VIDEO_ENCODER_AV1_QUALITY_PRESET_HIGH_QUALITY   = 0,    
-+    AMF_VIDEO_ENCODER_AV1_QUALITY_PRESET_QUALITY        = 30,    
-+    AMF_VIDEO_ENCODER_AV1_QUALITY_PRESET_BALANCED       = 70,
-+    AMF_VIDEO_ENCODER_AV1_QUALITY_PRESET_SPEED          = 100
-+};
-+
-+enum AMF_VIDEO_ENCODER_AV1_HEADER_INSERTION_MODE_ENUM
-+{
-+    AMF_VIDEO_ENCODER_AV1_HEADER_INSERTION_MODE_NONE                = 0,
-+    AMF_VIDEO_ENCODER_AV1_HEADER_INSERTION_MODE_GOP_ALIGNED         = 1,
-+    AMF_VIDEO_ENCODER_AV1_HEADER_INSERTION_MODE_KEY_FRAME_ALIGNED   = 2
-+};
-+
-+enum AMF_VIDEO_ENCODER_AV1_SWITCH_FRAME_INSERTION_MODE_ENUM
-+{
-+    AMF_VIDEO_ENCODER_AV1_SWITCH_FRAME_INSERTION_MODE_NONE              = 0,
-+    AMF_VIDEO_ENCODER_AV1_SWITCH_FRAME_INSERTION_MODE_FIXED_INTERVAL    = 1
-+};
-+
-+enum AMF_VIDEO_ENCODER_AV1_CDEF_MODE_ENUM
-+{
-+    AMF_VIDEO_ENCODER_AV1_CDEF_DISABLE          = 0,
-+    AMF_VIDEO_ENCODER_AV1_CDEF_ENABLE_DEFAULT   = 1
-+};
-+
-+enum AMF_VIDEO_ENCODER_AV1_CDF_FRAME_END_UPDATE_MODE_ENUM
-+{
-+    AMF_VIDEO_ENCODER_AV1_CDF_FRAME_END_UPDATE_MODE_DISABLE         = 0,
-+    AMF_VIDEO_ENCODER_AV1_CDF_FRAME_END_UPDATE_MODE_ENABLE_DEFAULT  = 1
-+};
-+
-+enum AMF_VIDEO_ENCODER_AV1_AQ_MODE_ENUM
-+{
-+    AMF_VIDEO_ENCODER_AV1_AQ_MODE_NONE = 0,
-+    AMF_VIDEO_ENCODER_AV1_AQ_MODE_CAQ  = 1              // Content adaptive quantization mode
-+};
-+
-+enum AMF_VIDEO_ENCODER_AV1_INTRA_REFRESH_MODE_ENUM
-+{
-+    AMF_VIDEO_ENCODER_AV1_INTRA_REFRESH_MODE__DISABLED = 0,
-+    AMF_VIDEO_ENCODER_AV1_INTRA_REFRESH_MODE__GOP_ALIGNED = 1,
-+    AMF_VIDEO_ENCODER_AV1_INTRA_REFRESH_MODE__CONTINUOUS = 2
-+};
-+enum AMF_VIDEO_ENCODER_AV1_LTR_MODE_ENUM
-+{
-+    AMF_VIDEO_ENCODER_AV1_LTR_MODE_RESET_UNUSED     = 0,
-+    AMF_VIDEO_ENCODER_AV1_LTR_MODE_KEEP_UNUSED      = 1
-+};
-+
-+
-+// *** Static properties - can be set only before Init() *** 
-+
-+// Encoder Engine Settings
-+#define AMF_VIDEO_ENCODER_AV1_ENCODER_INSTANCE_INDEX                L"Av1EncoderInstanceIndex"          // amf_int64; default = 0; selected HW instance idx. The number of instances is queried by using AMF_VIDEO_ENCODER_AV1_CAP_NUM_OF_HW_INSTANCES
-+#define AMF_VIDEO_ENCODER_AV1_ENCODING_LATENCY_MODE                 L"Av1EncodingLatencyMode"           // amf_int64(AMF_VIDEO_ENCODER_AV1_ENCODING_LATENCY_MODE_ENUM); default = depends on USAGE; The encoding latency mode. 
-+#define AMF_VIDEO_ENCODER_AV1_QUERY_TIMEOUT                         L"Av1QueryTimeout"                  // amf_int64; default = 0 (no wait); timeout for QueryOutput call in ms.
-+
-+// Usage Settings
-+#define AMF_VIDEO_ENCODER_AV1_USAGE                                 L"Av1Usage"                         // amf_int64(AMF_VIDEO_ENCODER_AV1_USAGE_ENUM); default = N/A; Encoder usage. fully configures parameter set.
-+
-+// Session Configuration
-+#define AMF_VIDEO_ENCODER_AV1_FRAMESIZE                             L"Av1FrameSize"                     // AMFSize; default = 0,0; Frame size
-+#define AMF_VIDEO_ENCODER_AV1_COLOR_BIT_DEPTH                       L"Av1ColorBitDepth"                 // amf_int64(AMF_COLOR_BIT_DEPTH_ENUM); default = AMF_COLOR_BIT_DEPTH_8
-+#define AMF_VIDEO_ENCODER_AV1_PROFILE                               L"Av1Profile"                       // amf_int64(AMF_VIDEO_ENCODER_AV1_PROFILE_ENUM) ; default = depends on USAGE; the codec profile of the coded bitstream
-+#define AMF_VIDEO_ENCODER_AV1_LEVEL                                 L"Av1Level"                         // amf_int64 (AMF_VIDEO_ENCODER_AV1_LEVEL_ENUM); default = depends on USAGE; the codec level of the coded bitstream
-+#define AMF_VIDEO_ENCODER_AV1_TILES_PER_FRAME                       L"Av1NumTilesPerFrame"              // amf_int64; default = 1; Number of tiles Per Frame. This is treated as suggestion. The actual number of tiles might be different due to compliance or encoder limitation.
-+#define AMF_VIDEO_ENCODER_AV1_QUALITY_PRESET                        L"Av1QualityPreset"                 // amf_int64(AMF_VIDEO_ENCODER_AV1_QUALITY_PRESET_ENUM); default = depends on USAGE; Quality Preset
-+
-+// Codec Configuration
-+#define AMF_VIDEO_ENCODER_AV1_SCREEN_CONTENT_TOOLS                  L"Av1ScreenContentTools"            // bool; default = depends on USAGE; If true, allow enabling screen content tools by AMF_VIDEO_ENCODER_AV1_PALETTE_MODE and AMF_VIDEO_ENCODER_AV1_FORCE_INTEGER_MV; if false, all screen content tools are disabled.
-+#define AMF_VIDEO_ENCODER_AV1_ORDER_HINT                            L"Av1OrderHint"                     // bool; default = depends on USAGE; If true, code order hint; if false, don't code order hint
-+#define AMF_VIDEO_ENCODER_AV1_FRAME_ID                              L"Av1FrameId"                       // bool; default = depends on USAGE; If true, code frame id; if false, don't code frame id
-+#define AMF_VIDEO_ENCODER_AV1_TILE_GROUP_OBU                        L"Av1TileGroupObu"                  // bool; default = depends on USAGE; If true, code FrameHeaderObu + TileGroupObu and each TileGroupObu contains one tile; if false, code FrameObu.
-+#define AMF_VIDEO_ENCODER_AV1_CDEF_MODE                             L"Av1CdefMode"                      // amd_int64(AMF_VIDEO_ENCODER_AV1_CDEF_MODE_ENUM); default = depends on USAGE; Cdef mode
-+#define AMF_VIDEO_ENCODER_AV1_ERROR_RESILIENT_MODE                  L"Av1ErrorResilientMode"            // bool; default = depends on USAGE; If true, enable error resilient mode; if false, disable error resilient mode
-+
-+// Rate Control and Quality Enhancement
-+#define AMF_VIDEO_ENCODER_AV1_RATE_CONTROL_METHOD                   L"Av1RateControlMethod"             // amf_int64(AMF_VIDEO_ENCODER_AV1_RATE_CONTROL_METHOD_ENUM); default = depends on USAGE; Rate Control Method
-+#define AMF_VIDEO_ENCODER_AV1_QVBR_QUALITY_LEVEL                    L"Av1QvbrQualityLevel"              // amf_int64; default = 23; QVBR quality level; range = 1-51
-+#define AMF_VIDEO_ENCODER_AV1_INITIAL_VBV_BUFFER_FULLNESS           L"Av1InitialVBVBufferFullness"      // amf_int64; default = depends on USAGE; Initial VBV Buffer Fullness 0=0% 64=100%
-+
-+// Alignment Mode Configuration
-+#define AMF_VIDEO_ENCODER_AV1_ALIGNMENT_MODE                        L"Av1AlignmentMode"                 // amf_int64(AMF_VIDEO_ENCODER_AV1_ALIGNMENT_MODE_ENUM); default = AMF_VIDEO_ENCODER_AV1_ALIGNMENT_MODE_64X16_ONLY; Alignment Mode.
-+
-+#define AMF_VIDEO_ENCODER_AV1_PRE_ANALYSIS_ENABLE                   L"Av1EnablePreAnalysis"             // bool; default = depends on USAGE; If true, enables the pre-analysis module. Refer to AMF Video PreAnalysis API reference for more details. If false, disable the pre-analysis module.
-+#define AMF_VIDEO_ENCODER_AV1_RATE_CONTROL_PREENCODE                L"Av1RateControlPreEncode"          // bool; default = depends on USAGE; If true, enables pre-encode assist in rate control; if false, disables pre-encode assist in rate control.
-+#define AMF_VIDEO_ENCODER_AV1_HIGH_MOTION_QUALITY_BOOST             L"Av1HighMotionQualityBoost"        // bool; default = depends on USAGE; If true, enable high motion quality boost mode; if false, disable high motion quality boost mode.
-+#define AMF_VIDEO_ENCODER_AV1_AQ_MODE                               L"Av1AQMode"                        // amd_int64(AMF_VIDEO_ENCODER_AV1_AQ_MODE_ENUM); default = depends on USAGE; AQ mode
-+
-+// Picture Management Configuration
-+#define AMF_VIDEO_ENCODER_AV1_MAX_NUM_TEMPORAL_LAYERS               L"Av1MaxNumOfTemporalLayers"        // amf_int64; default = depends on USAGE; Max number of temporal layers might be enabled. The maximum value can be queried from AMF_VIDEO_ENCODER_AV1_CAP_MAX_NUM_TEMPORAL_LAYERS
-+#define AMF_VIDEO_ENCODER_AV1_MAX_LTR_FRAMES                        L"Av1MaxNumLTRFrames"               // amf_int64; default = depends on USAGE; Max number of LTR frames. The maximum value can be queried from AMF_VIDEO_ENCODER_AV1_CAP_MAX_NUM_LTR_FRAMES
-+#define AMF_VIDEO_ENCODER_AV1_LTR_MODE                              L"Av1LTRMode"                       // amf_int64(AMF_VIDEO_ENCODER_AV1_LTR_MODE_ENUM); default = AMF_VIDEO_ENCODER_AV1_LTR_MODE_RESET_UNUSED; remove/keep unused LTRs (not specified in property AMF_VIDEO_ENCODER_AV1_FORCE_LTR_REFERENCE_BITFIELD)
-+#define AMF_VIDEO_ENCODER_AV1_MAX_NUM_REFRAMES                      L"Av1MaxNumRefFrames"               // amf_int64; default = 1; Maximum number of reference frames
-+
-+// color conversion
-+#define AMF_VIDEO_ENCODER_AV1_INPUT_HDR_METADATA                    L"Av1InHDRMetadata"                 // AMFBuffer containing AMFHDRMetadata; default NULL
-+
-+// Miscellaneous
-+#define AMF_VIDEO_ENCODER_AV1_EXTRA_DATA                            L"Av1ExtraData"                     // AMFInterface* - > AMFBuffer*; buffer to retrieve coded sequence header
-+
-+
-+// *** Dynamic properties - can be set anytime *** 
-+
-+// Codec Configuration
-+#define AMF_VIDEO_ENCODER_AV1_PALETTE_MODE                          L"Av1PaletteMode"                   // bool; default = depends on USAGE; If true, enable palette mode; if false, disable palette mode. Valid only when AMF_VIDEO_ENCODER_AV1_SCREEN_CONTENT_TOOLS is true.
-+#define AMF_VIDEO_ENCODER_AV1_FORCE_INTEGER_MV                      L"Av1ForceIntegerMv"                // bool; default = depends on USAGE; If true, enable force integer MV; if false, disable force integer MV. Valid only when AMF_VIDEO_ENCODER_AV1_SCREEN_CONTENT_TOOLS is true.
-+#define AMF_VIDEO_ENCODER_AV1_CDF_UPDATE                            L"Av1CdfUpdate"                     // bool; default = depends on USAGE; If true, enable CDF update; if false, disable CDF update.
-+#define AMF_VIDEO_ENCODER_AV1_CDF_FRAME_END_UPDATE_MODE             L"Av1CdfFrameEndUpdateMode"         // amd_int64(AMF_VIDEO_ENCODER_AV1_CDF_FRAME_END_UPDATE_MODE_ENUM); default = depends on USAGE; CDF frame end update mode
-+
-+
-+// Rate Control and Quality Enhancement
-+#define AMF_VIDEO_ENCODER_AV1_VBV_BUFFER_SIZE                       L"Av1VBVBufferSize"                 // amf_int64; default = depends on USAGE; VBV Buffer Size in bits
-+#define AMF_VIDEO_ENCODER_AV1_FRAMERATE                             L"Av1FrameRate"                     // AMFRate; default = depends on usage; Frame Rate
-+#define AMF_VIDEO_ENCODER_AV1_ENFORCE_HRD                           L"Av1EnforceHRD"                    // bool; default = depends on USAGE; If true, enforce HRD; if false, HRD is not enforced.
-+#define AMF_VIDEO_ENCODER_AV1_FILLER_DATA                           L"Av1FillerData"                    // bool; default = depends on USAGE; If true, code filler data when needed; if false, don't code filler data.
-+#define AMF_VIDEO_ENCODER_AV1_TARGET_BITRATE                        L"Av1TargetBitrate"                 // amf_int64; default = depends on USAGE; Target bit rate in bits
-+#define AMF_VIDEO_ENCODER_AV1_PEAK_BITRATE                          L"Av1PeakBitrate"                   // amf_int64; default = depends on USAGE; Peak bit rate in bits
-+
-+#define AMF_VIDEO_ENCODER_AV1_MAX_COMPRESSED_FRAME_SIZE             L"Av1MaxCompressedFrameSize"        // amf_int64; default = 0; Max compressed frame Size in bits. 0 - no limit
-+#define AMF_VIDEO_ENCODER_AV1_MIN_Q_INDEX_INTRA                     L"Av1MinQIndex_Intra"               // amf_int64; default = depends on USAGE; Min QIndex for intra frames; range = 0-255
-+#define AMF_VIDEO_ENCODER_AV1_MAX_Q_INDEX_INTRA                     L"Av1MaxQIndex_Intra"               // amf_int64; default = depends on USAGE; Max QIndex for intra frames; range = 0-255
-+#define AMF_VIDEO_ENCODER_AV1_MIN_Q_INDEX_INTER                     L"Av1MinQIndex_Inter"               // amf_int64; default = depends on USAGE; Min QIndex for inter frames; range = 0-255
-+#define AMF_VIDEO_ENCODER_AV1_MAX_Q_INDEX_INTER                     L"Av1MaxQIndex_Inter"               // amf_int64; default = depends on USAGE; Max QIndex for inter frames; range = 0-255
-+
-+#define AMF_VIDEO_ENCODER_AV1_Q_INDEX_INTRA                         L"Av1QIndex_Intra"                  // amf_int64; default = depends on USAGE; intra-frame QIndex; range = 0-255
-+#define AMF_VIDEO_ENCODER_AV1_Q_INDEX_INTER                         L"Av1QIndex_Inter"                  // amf_int64; default = depends on USAGE; inter-frame QIndex; range = 0-255
-+
-+#define AMF_VIDEO_ENCODER_AV1_RATE_CONTROL_SKIP_FRAME               L"Av1RateControlSkipFrameEnable"    // bool; default = depends on USAGE; If true, rate control may code skip frame when needed; if false, rate control will not code skip frame.
-+
-+
-+// Picture Management Configuration
-+#define AMF_VIDEO_ENCODER_AV1_GOP_SIZE                              L"Av1GOPSize"                       // amf_int64; default = depends on USAGE; GOP Size (distance between automatically inserted key frames). If 0, key frame will be inserted at first frame only. Note that GOP may be interrupted by AMF_VIDEO_ENCODER_AV1_FORCE_FRAME_TYPE.
-+#define AMF_VIDEO_ENCODER_AV1_HEADER_INSERTION_MODE                 L"Av1HeaderInsertionMode"           // amf_int64(AMF_VIDEO_ENCODER_AV1_HEADER_INSERTION_MODE_ENUM); default = depends on USAGE; sequence header insertion mode
-+#define AMF_VIDEO_ENCODER_AV1_SWITCH_FRAME_INSERTION_MODE           L"Av1SwitchFrameInsertionMode"      // amf_int64(AMF_VIDEO_ENCODER_AV1_SWITCH_FRAME_INSERTION_MODE_ENUM); default = depends on USAGE; switch frame insertin mode
-+#define AMF_VIDEO_ENCODER_AV1_SWITCH_FRAME_INTERVAL                 L"Av1SwitchFrameInterval"           // amf_int64; default = depends on USAGE; the interval between two inserted switch frames. Valid only when AMF_VIDEO_ENCODER_AV1_SWITCH_FRAME_INSERTION_MODE is AMF_VIDEO_ENCODER_AV1_SWITCH_FRAME_INSERTION_MODE_FIXED_INTERVAL.
-+#define AMF_VIDEO_ENCODER_AV1_NUM_TEMPORAL_LAYERS                   L"Av1NumTemporalLayers"             // amf_int64; default = depends on USAGE; Number of temporal layers. Can be changed at any time but the change is only applied when encoding next base layer frame.
-+
-+#define AMF_VIDEO_ENCODER_AV1_INTRA_REFRESH_MODE					L"Av1IntraRefreshMode"              // amf_int64(AMF_VIDEO_ENCODER_AV1_INTRA_REFRESH_MODE_ENUM); default AMF_VIDEO_ENCODER_AV1_INTRA_REFRESH_MODE__DISABLED
-+#define AMF_VIDEO_ENCODER_AV1_INTRAREFRESH_STRIPES					L"Av1IntraRefreshNumOfStripes"      // amf_int64; default = N/A; Valid only when intra refresh is enabled.
-+
-+// color conversion
-+#define AMF_VIDEO_ENCODER_AV1_INPUT_COLOR_PROFILE                   L"Av1InputColorProfile"             // amf_int64(AMF_VIDEO_CONVERTER_COLOR_PROFILE_ENUM); default = AMF_VIDEO_CONVERTER_COLOR_PROFILE_UNKNOWN - mean AUTO by size
-+#define AMF_VIDEO_ENCODER_AV1_INPUT_TRANSFER_CHARACTERISTIC         L"Av1InputColorTransferChar"        // amf_int64(AMF_COLOR_TRANSFER_CHARACTERISTIC_ENUM); default = AMF_COLOR_TRANSFER_CHARACTERISTIC_UNDEFINED, ISO/IEC 23001-8_2013 section 7.2 See VideoDecoderUVD.h for enum
-+#define AMF_VIDEO_ENCODER_AV1_INPUT_COLOR_PRIMARIES                 L"Av1InputColorPrimaries"           // amf_int64(AMF_COLOR_PRIMARIES_ENUM); default = AMF_COLOR_PRIMARIES_UNDEFINED, ISO/IEC 23001-8_2013 section 7.1 See ColorSpace.h for enum
-+
-+#define AMF_VIDEO_ENCODER_AV1_OUTPUT_COLOR_PROFILE                  L"Av1OutputColorProfile"            // amf_int64(AMF_VIDEO_CONVERTER_COLOR_PROFILE_ENUM); default = AMF_VIDEO_CONVERTER_COLOR_PROFILE_UNKNOWN - mean AUTO by size
-+#define AMF_VIDEO_ENCODER_AV1_OUTPUT_TRANSFER_CHARACTERISTIC        L"Av1OutputColorTransferChar"       // amf_int64(AMF_COLOR_TRANSFER_CHARACTERISTIC_ENUM); default = AMF_COLOR_TRANSFER_CHARACTERISTIC_UNDEFINED, ISO/IEC 23001-8_2013 ?7.2 See VideoDecoderUVD.h for enum
-+#define AMF_VIDEO_ENCODER_AV1_OUTPUT_COLOR_PRIMARIES                L"Av1OutputColorPrimaries"          // amf_int64(AMF_COLOR_PRIMARIES_ENUM); default = AMF_COLOR_PRIMARIES_UNDEFINED, ISO/IEC 23001-8_2013 section 7.1 See ColorSpace.h for enum
-+
-+
-+// Frame encode parameters
-+#define AMF_VIDEO_ENCODER_AV1_FORCE_FRAME_TYPE                      L"Av1ForceFrameType"                // amf_int64(AMF_VIDEO_ENCODER_AV1_FORCE_FRAME_TYPE_ENUM); default = AMF_VIDEO_ENCODER_AV1_FORCE_FRAME_TYPE_NONE; generate particular frame type
-+#define AMF_VIDEO_ENCODER_AV1_FORCE_INSERT_SEQUENCE_HEADER          L"Av1ForceInsertSequenceHeader"     // bool; default = false; If true, force insert sequence header with current frame;
-+#define AMF_VIDEO_ENCODER_AV1_MARK_CURRENT_WITH_LTR_INDEX           L"Av1MarkCurrentWithLTRIndex"       // amf_int64; default = N/A; Mark current frame with LTR index
-+#define AMF_VIDEO_ENCODER_AV1_FORCE_LTR_REFERENCE_BITFIELD          L"Av1ForceLTRReferenceBitfield"     // amf_int64; default = 0; force LTR bit-field
-+#define AMF_VIDEO_ENCODER_AV1_ROI_DATA                              L"Av1ROIData"					    // 2D AMFSurface, surface format: AMF_SURFACE_GRAY32
-+
-+// Encode output parameters
-+#define AMF_VIDEO_ENCODER_AV1_OUTPUT_FRAME_TYPE                     L"Av1OutputFrameType"               // amf_int64(AMF_VIDEO_ENCODER_AV1_OUTPUT_FRAME_TYPE_ENUM); default = N/A
-+#define AMF_VIDEO_ENCODER_AV1_OUTPUT_MARKED_LTR_INDEX               L"Av1MarkedLTRIndex"                // amf_int64; default = N/A; Marked LTR index
-+#define AMF_VIDEO_ENCODER_AV1_OUTPUT_REFERENCED_LTR_INDEX_BITFIELD  L"Av1ReferencedLTRIndexBitfield"    // amf_int64; default = N/A; referenced LTR bit-field
-+
-+// AV1 Encoder capabilities - exposed in AMFCaps interface
-+#define AMF_VIDEO_ENCODER_AV1_CAP_NUM_OF_HW_INSTANCES               L"Av1CapNumOfHwInstances"           // amf_int64; default = N/A; number of HW encoder instances
-+#define AMF_VIDEO_ENCODER_AV1_CAP_MAX_THROUGHPUT                    L"Av1CapMaxThroughput"              // amf_int64; default = N/A; MAX throughput for AV1 encoder in MB (16 x 16 pixel)
-+#define AMF_VIDEO_ENCODER_AV1_CAP_REQUESTED_THROUGHPUT              L"Av1CapRequestedThroughput"        // amf_int64; default = N/A; Currently total requested throughput for AV1 encode in MB (16 x 16 pixel)
-+#define AMF_VIDEO_ENCODER_AV1_CAP_COLOR_CONVERSION                  L"Av1CapColorConversion"            // amf_int64(AMF_ACCELERATION_TYPE); default = N/A; type of supported color conversion. default AMF_ACCEL_GPU
-+#define AMF_VIDEO_ENCODER_AV1_CAP_PRE_ANALYSIS                      L"Av1PreAnalysis"                    // amf_bool - pre analysis module is available for AV1 UVE encoder, n/a for the other encoders
-+#define AMF_VIDEO_ENCODER_AV1_CAP_MAX_BITRATE                       L"Av1MaxBitrate"                    // amf_int64; default = N/A; Maximum bit rate in bits
-+#define AMF_VIDEO_ENCODER_AV1_CAP_MAX_PROFILE                       L"Av1MaxProfile"                    // amf_int64(AMF_VIDEO_ENCODER_AV1_PROFILE_ENUM); default = N/A; max value of code profile
-+#define AMF_VIDEO_ENCODER_AV1_CAP_MAX_LEVEL                         L"Av1MaxLevel"                      // amf_int64(AMF_VIDEO_ENCODER_AV1_LEVEL_ENUM); default = N/A; max value of codec level
-+#define AMF_VIDEO_ENCODER_AV1_CAP_MAX_NUM_TEMPORAL_LAYERS           L"Av1CapMaxNumTemporalLayers"       // amf_int64; default = N/A; The cap of maximum number of temporal layers
-+#define AMF_VIDEO_ENCODER_AV1_CAP_MAX_NUM_LTR_FRAMES                L"Av1CapMaxNumLTRFrames"            // amf_int64; default = N/A; The cap of maximum number of LTR frames. This value is calculated based on current value of AMF_VIDEO_ENCODER_AV1_MAX_NUM_TEMPORAL_LAYERS.
-+
-+#define AMF_VIDEO_ENCODER_AV1_ENABLE_SMART_ACCESS_VIDEO             L"Av1EnableEncoderSmartAccessVideo" // amf_bool; default = false; true = enables smart access video feature
-+
-+#endif //#ifndef AMF_VideoEncoderAV1_h

libfdkaac-dynlib-5.1.patch

@@ -1,249 +0,0 @@
-diff --git a/configure b/configure
-index 77facac8c9..ab117fba2c 100755
---- a/configure
-+++ b/configure
-@@ -1785,7 +1785,6 @@ EXTERNAL_LIBRARY_GPL_LIST="
- 
- EXTERNAL_LIBRARY_NONFREE_LIST="
-     decklink
--    libfdk_aac
-     libtls
- "
- 
-@@ -1882,6 +1881,7 @@ EXTERNAL_LIBRARY_LIST="
-     openssl
-     pocketsphinx
-     vapoursynth
-+    libfdk_aac
- "
- 
- HWACCEL_AUTODETECT_LIBRARY_LIST="
-@@ -6524,9 +6524,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-aacdec.c b/libavcodec/libfdk-aacdec.c
-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
-index 0000000000..9bcfdb9aba
---- /dev/null
-+++ b/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 */
-\ No newline at end of file

libfdkaac.patch

@@ -1,8 +1,8 @@
 diff --git a/configure b/configure
-index c157338b1f..8c1e88febe 100755
+index b6616f00b6..d02f5099fe 100755
 --- a/configure
 +++ b/configure
-@@ -1787,7 +1787,6 @@ EXTERNAL_LIBRARY_GPL_LIST="
+@@ -1774,7 +1774,6 @@ EXTERNAL_LIBRARY_GPL_LIST="
  
  EXTERNAL_LIBRARY_NONFREE_LIST="
      decklink
@@ -10,15 +10,15 @@ index c157338b1f..8c1e88febe 100755
      libtls
  "
  
-@@ -1886,6 +1885,7 @@ EXTERNAL_LIBRARY_LIST="
+@@ -1873,6 +1872,7 @@ EXTERNAL_LIBRARY_LIST="
      openssl
      pocketsphinx
      vapoursynth
-+	libfdk_aac
++    libfdk_aac
  "
  
  HWACCEL_AUTODETECT_LIBRARY_LIST="
-@@ -6576,9 +6576,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 libdc1394         && require_pkg_config libdc1394 libdc1394-2 dc1394/dc1394.h dc1394_new
  enabled libdrm            && require_pkg_config libdrm libdrm xf86drm.h drmGetVersion
@@ -121,7 +121,7 @@ index 0000000000..9bcfdb9aba
 +#endif /* AVCODEC_LIBFDK_AAC_INTERNAL_H */
 \ No newline at end of file
 diff --git a/libavcodec/libfdk-aacdec.c b/libavcodec/libfdk-aacdec.c
-index 8c1586e25e..9cf71838a9 100644
+index 8c1586e25e..25f68cdd10 100644
 --- a/libavcodec/libfdk-aacdec.c
 +++ b/libavcodec/libfdk-aacdec.c
 @@ -25,6 +25,7 @@
@@ -163,7 +163,7 @@ index 8c1586e25e..9cf71838a9 100644
      av_freep(&s->decoder_buffer);
      av_freep(&s->anc_buffer);
  
-@@ -244,6 +249,28 @@ static av_cold int fdk_aac_decode_init(AVCodecContext *avctx)
+@@ -244,6 +249,27 @@ static av_cold int fdk_aac_decode_init(AVCodecContext *avctx)
      FDKAACDecContext *s = avctx->priv_data;
      AAC_DECODER_ERROR err;
  
@@ -187,13 +187,12 @@ index 8c1586e25e..9cf71838a9 100644
 +#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 fc2e71c51f..2083f38824 100644
+index 54549de473..9e93ce092c 100644
 --- a/libavcodec/libfdk-aacenc.c
 +++ b/libavcodec/libfdk-aacenc.c
 @@ -27,6 +27,7 @@
@@ -204,15 +203,15 @@ index fc2e71c51f..2083f38824 100644
  
  #ifdef AACENCODER_LIB_VL0
  #define FDKENC_VER_AT_LEAST(vl0, vl1) \
-@@ -47,6 +48,8 @@ typedef struct AACContext {
+@@ -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;
@@ -226,7 +225,7 @@ index fc2e71c51f..2083f38824 100644
      ff_af_queue_close(&s->afq);
  
      return 0;
-@@ -128,6 +133,22 @@ static av_cold int aac_encode_init(AVCodecContext *avctx)
+@@ -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;
  
@@ -244,7 +243,6 @@ index fc2e71c51f..2083f38824 100644
 +#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",

nvidia-av1-nvenc.patch

@@ -1,558 +0,0 @@
-diff --git a/configure b/configure
-index 957b7fe13e..75639477e7 100755
---- a/configure
-+++ b/configure
-@@ -3181,6 +3181,8 @@ nvenc_deps_any="libdl LoadLibrary"
- aac_mf_encoder_deps="mediafoundation"
- ac3_mf_encoder_deps="mediafoundation"
- av1_cuvid_decoder_deps="cuvid CUVIDAV1PICPARAMS"
-+av1_nvenc_encoder_deps="nvenc"
-+av1_nvenc_encoder_select="atsc_a53"
- h263_v4l2m2m_decoder_deps="v4l2_m2m h263_v4l2_m2m"
- h263_v4l2m2m_encoder_deps="v4l2_m2m h263_v4l2_m2m"
- h264_amf_encoder_deps="amf"
-diff --git a/libavcodec/Makefile b/libavcodec/Makefile
-index 592d9347f6..ca35d72662 100644
---- a/libavcodec/Makefile
-+++ b/libavcodec/Makefile
-@@ -244,6 +244,7 @@ OBJS-$(CONFIG_AURA_DECODER)            += cyuv.o
- OBJS-$(CONFIG_AURA2_DECODER)           += aura.o
- OBJS-$(CONFIG_AV1_DECODER)             += av1dec.o
- OBJS-$(CONFIG_AV1_CUVID_DECODER)       += cuviddec.o
-+OBJS-$(CONFIG_AV1_NVENC_ENCODER)       += nvenc_av1.o nvenc.o
- OBJS-$(CONFIG_AVRN_DECODER)            += avrndec.o
- OBJS-$(CONFIG_AVRP_DECODER)            += r210dec.o
- OBJS-$(CONFIG_AVRP_ENCODER)            += r210enc.o
-diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
-index cfeb01ac1c..62cc449591 100644
---- a/libavcodec/allcodecs.c
-+++ b/libavcodec/allcodecs.c
-@@ -827,6 +827,7 @@ extern const FFCodec ff_libaom_av1_decoder;
- extern const FFCodec ff_av1_cuvid_decoder;
- extern const FFCodec ff_av1_qsv_decoder;
- extern const FFCodec ff_av1_amf_encoder;
-+extern const FFCodec ff_av1_nvenc_encoder;
- extern const FFCodec ff_libopenh264_encoder;
- extern const FFCodec ff_libopenh264_decoder;
- extern const FFCodec ff_h264_amf_encoder;
-diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c
-index 11bd21f365..fcdb6ae33a 100644
---- a/libavcodec/nvenc.c
-+++ b/libavcodec/nvenc.c
-@@ -65,6 +65,26 @@ const enum AVPixelFormat ff_nvenc_pix_fmts[] = {
-     AV_PIX_FMT_NONE
- };
- 
-+const enum AVPixelFormat ff_av1_nvenc_pix_fmts[] = {
-+    AV_PIX_FMT_YUV420P,
-+    AV_PIX_FMT_NV12,
-+    AV_PIX_FMT_P010,
-+    AV_PIX_FMT_P016,      // Truncated to 10bits
-+    AV_PIX_FMT_0RGB32,
-+    AV_PIX_FMT_RGB32,
-+    AV_PIX_FMT_0BGR32,
-+    AV_PIX_FMT_BGR32,
-+    AV_PIX_FMT_X2RGB10,
-+    AV_PIX_FMT_X2BGR10,
-+    AV_PIX_FMT_GBRP,
-+    AV_PIX_FMT_GBRP16,    // Truncated to 10bits
-+    AV_PIX_FMT_CUDA,
-+#if CONFIG_D3D11VA
-+    AV_PIX_FMT_D3D11,
-+#endif
-+    AV_PIX_FMT_NONE
-+};
-+
- const AVCodecHWConfigInternal *const ff_nvenc_hw_configs[] = {
-     HW_CONFIG_ENCODER_FRAMES(CUDA,  CUDA),
-     HW_CONFIG_ENCODER_DEVICE(NONE,  CUDA),
-@@ -222,7 +242,13 @@ static void nvenc_map_preset(NvencContext *ctx)
- 
- static void nvenc_print_driver_requirement(AVCodecContext *avctx, int level)
- {
--#if NVENCAPI_CHECK_VERSION(11, 2)
-+#if NVENCAPI_CHECK_VERSION(12, 0)
-+# if defined(_WIN32) || defined(__CYGWIN__)
-+const char* minver = "520.0";
-+# else
-+const char* minver = "520.0";
-+# endif
-+#elif NVENCAPI_CHECK_VERSION(11, 2)
-     const char *minver = "(unknown)";
- #elif NVENCAPI_CHECK_VERSION(11, 1)
- # if defined(_WIN32) || defined(__CYGWIN__)
-@@ -658,6 +684,11 @@ static av_cold int nvenc_setup_device(AVCodecContext *avctx)
-     case AV_CODEC_ID_HEVC:
-         ctx->init_encode_params.encodeGUID = NV_ENC_CODEC_HEVC_GUID;
-         break;
-+#ifdef NVENC_HAVE_AV1
-+    case AV_CODEC_ID_AV1:
-+        ctx->init_encode_params.encodeGUID = NV_ENC_CODEC_AV1_GUID;
-+        break;
-+#endif
-     default:
-         return AVERROR_BUG;
-     }
-@@ -761,6 +792,10 @@ static av_cold void set_constqp(AVCodecContext *avctx)
- {
-     NvencContext *ctx = avctx->priv_data;
-     NV_ENC_RC_PARAMS *rc = &ctx->encode_config.rcParams;
-+	int qmax = 51;
-+#ifdef NVENC_HAVE_AV1
-+    qmax = avctx->codec->id != AV_CODEC_ID_AV1 ? 51 : 255;
-+#endif
- 
-     rc->rateControlMode = NV_ENC_PARAMS_RC_CONSTQP;
- 
-@@ -771,9 +806,9 @@ static av_cold void set_constqp(AVCodecContext *avctx)
-             rc->constQP.qpInterB = ctx->init_qp_b;
-         } else if (avctx->i_quant_factor != 0.0 && avctx->b_quant_factor != 0.0) {
-             rc->constQP.qpIntra = av_clip(
--                rc->constQP.qpInterP * fabs(avctx->i_quant_factor) + avctx->i_quant_offset + 0.5, 0, 51);
-+                rc->constQP.qpInterP * fabs(avctx->i_quant_factor) + avctx->i_quant_offset + 0.5, 0, qmax);
-             rc->constQP.qpInterB = av_clip(
--                rc->constQP.qpInterP * fabs(avctx->b_quant_factor) + avctx->b_quant_offset + 0.5, 0, 51);
-+                rc->constQP.qpInterP * fabs(avctx->b_quant_factor) + avctx->b_quant_offset + 0.5, 0, qmax);
-         } else {
-             rc->constQP.qpIntra = rc->constQP.qpInterP;
-             rc->constQP.qpInterB = rc->constQP.qpInterP;
-@@ -781,9 +816,9 @@ static av_cold void set_constqp(AVCodecContext *avctx)
-     } else if (ctx->cqp >= 0) {
-         rc->constQP.qpInterP = rc->constQP.qpInterB = rc->constQP.qpIntra = ctx->cqp;
-         if (avctx->b_quant_factor != 0.0)
--            rc->constQP.qpInterB = av_clip(ctx->cqp * fabs(avctx->b_quant_factor) + avctx->b_quant_offset + 0.5, 0, 51);
-+            rc->constQP.qpInterB = av_clip(ctx->cqp * fabs(avctx->b_quant_factor) + avctx->b_quant_offset + 0.5, 0, qmax);
-         if (avctx->i_quant_factor != 0.0)
--            rc->constQP.qpIntra = av_clip(ctx->cqp * fabs(avctx->i_quant_factor) + avctx->i_quant_offset + 0.5, 0, 51);
-+            rc->constQP.qpIntra = av_clip(ctx->cqp * fabs(avctx->i_quant_factor) + avctx->i_quant_offset + 0.5, 0, qmax);
-     }
- 
-     avctx->qmin = -1;
-@@ -1199,7 +1234,8 @@ static av_cold int nvenc_setup_h264_config(AVCodecContext *avctx)
-         h264->entropyCodingMode = ctx->coder;
- 
- #ifdef NVENC_HAVE_BFRAME_REF_MODE
--    h264->useBFramesAsRef = ctx->b_ref_mode;
-+    if (ctx->b_ref_mode >= 0)
-+        h264->useBFramesAsRef = ctx->b_ref_mode;
- #endif
- 
- #ifdef NVENC_HAVE_MULTIPLE_REF_FRAMES
-@@ -1314,7 +1350,8 @@ static av_cold int nvenc_setup_hevc_config(AVCodecContext *avctx)
-     hevc->tier = ctx->tier;
- 
- #ifdef NVENC_HAVE_HEVC_BFRAME_REF_MODE
--    hevc->useBFramesAsRef = ctx->b_ref_mode;
-+    if (ctx->b_ref_mode >= 0)
-+        hevc->useBFramesAsRef = ctx->b_ref_mode;
- #endif
- 
- #ifdef NVENC_HAVE_MULTIPLE_REF_FRAMES
-@@ -1325,6 +1362,106 @@ static av_cold int nvenc_setup_hevc_config(AVCodecContext *avctx)
-     return 0;
- }
- 
-+#ifdef NVENC_HAVE_AV1
-+static av_cold int nvenc_setup_av1_config(AVCodecContext* avctx)
-+{
-+    NvencContext* ctx = avctx->priv_data;
-+    NV_ENC_CONFIG* cc = &ctx->encode_config;
-+    NV_ENC_CONFIG_AV1* av1 = &cc->encodeCodecConfig.av1Config;
-+
-+    const AVPixFmtDescriptor* pixdesc = av_pix_fmt_desc_get(ctx->data_pix_fmt);
-+
-+    if ((pixdesc->flags & AV_PIX_FMT_FLAG_RGB) && !IS_GBRP(ctx->data_pix_fmt)) {
-+        av1->matrixCoefficients = AVCOL_SPC_BT470BG;
-+        av1->colorPrimaries = avctx->color_primaries;
-+        av1->transferCharacteristics = avctx->color_trc;
-+        av1->colorRange = 0;
-+    }
-+    else {
-+        av1->matrixCoefficients = IS_GBRP(ctx->data_pix_fmt) ? AVCOL_SPC_RGB : avctx->colorspace;
-+        av1->colorPrimaries = avctx->color_primaries;
-+        av1->transferCharacteristics = avctx->color_trc;
-+        av1->colorRange = (avctx->color_range == AVCOL_RANGE_JPEG
-+            || ctx->data_pix_fmt == AV_PIX_FMT_YUVJ420P || ctx->data_pix_fmt == AV_PIX_FMT_YUVJ422P || ctx->data_pix_fmt == AV_PIX_FMT_YUVJ444P);
-+    }
-+
-+    if (ctx->intra_refresh) {
-+        av1->enableIntraRefresh = 1;
-+        av1->intraRefreshPeriod = avctx->gop_size;
-+        av1->intraRefreshCnt = avctx->gop_size - 1;
-+    }
-+
-+    av1->disableSeqHdr = 0;
-+    av1->repeatSeqHdr = 1;
-+
-+    if (ctx->dpb_size >= 0) {
-+        /* 0 means "let the hardware decide" */
-+        av1->maxNumRefFramesInDPB = ctx->dpb_size;
-+    }
-+
-+    if (ctx->intra_refresh) {
-+        av1->idrPeriod = NVENC_INFINITE_GOPLENGTH;
-+    }
-+    else if (avctx->gop_size >= 0) {
-+        av1->idrPeriod = avctx->gop_size;
-+    }
-+
-+    av1->enableTimingInfo = 1;
-+
-+    switch (ctx->profile) {
-+    case NV_ENC_AV1_PROFILE_MAIN:
-+        cc->profileGUID = NV_ENC_AV1_PROFILE_MAIN_GUID;
-+        avctx->profile = FF_PROFILE_AV1_MAIN;
-+        break;
-+    }
-+
-+    av1->chromaFormatIDC = 1;
-+
-+    av1->inputPixelBitDepthMinus8 = IS_10BIT(ctx->data_pix_fmt) ? 2 : 0;
-+    av1->pixelBitDepthMinus8 = ctx->highbitdepth ? 2 : av1->inputPixelBitDepthMinus8;
-+
-+    av1->level = ctx->level;
-+
-+    av1->tier = ctx->tier;
-+
-+    if (ctx->b_ref_mode >= 0)
-+        av1->useBFramesAsRef = ctx->b_ref_mode;
-+
-+    av1->numFwdRefs = avctx->refs;
-+    av1->numBwdRefs = avctx->refs;
-+
-+    if (ctx->highbitdepth)
-+        av1->pixelBitDepthMinus8 = 2;
-+
-+    if (ctx->tilecolumns > 1 || ctx->tilerows > 1)
-+    {
-+        av1->enableCustomTileConfig = 1;
-+        av1->numTileColumns = ctx->tilecolumns;
-+        av1->numTileRows = ctx->tilerows;
-+        int smb_w = (avctx->width + 63) >> 6;
-+        int smb_h = (avctx->height + 63) >> 6;
-+        int sum = 0;
-+        for (int i = 0; i < av1->numTileColumns - 1; i++)
-+        {
-+            ctx->tileWidths[i] = (smb_w + av1->numTileColumns - 1) / av1->numTileColumns;
-+            sum += ctx->tileWidths[i];
-+        }
-+        ctx->tileWidths[av1->numTileColumns - 1] = smb_w  - sum;
-+        sum = 0;
-+        for (int i = 0; i < av1->numTileRows - 1; i++)
-+        {
-+            ctx->tileHeights[i] = (smb_h + av1->numTileRows - 1) / av1->numTileRows;
-+            sum += ctx->tileHeights[i];
-+        }
-+        ctx->tileHeights[av1->numTileRows - 1] = smb_h - sum;
-+        av1->tileWidths = ctx->tileWidths;
-+        av1->tileHeights = ctx->tileHeights;
-+    }
-+
-+    return 0;
-+}
-+#endif
-+
- static av_cold int nvenc_setup_codec_config(AVCodecContext *avctx)
- {
-     switch (avctx->codec->id) {
-@@ -1332,6 +1469,10 @@ static av_cold int nvenc_setup_codec_config(AVCodecContext *avctx)
-         return nvenc_setup_h264_config(avctx);
-     case AV_CODEC_ID_HEVC:
-         return nvenc_setup_hevc_config(avctx);
-+#ifdef NVENC_HAVE_AV1
-+    case AV_CODEC_ID_AV1:
-+        return nvenc_setup_av1_config(avctx);
-+#endif
-     /* Earlier switch/case will return if unknown codec is passed. */
-     }
- 
-@@ -1344,12 +1485,22 @@ static void compute_dar(AVCodecContext *avctx, int *dw, int *dh) {
-     sw = avctx->width;
-     sh = avctx->height;
- 
--    if (avctx->sample_aspect_ratio.num > 0 && avctx->sample_aspect_ratio.den > 0) {
--        sw *= avctx->sample_aspect_ratio.num;
--        sh *= avctx->sample_aspect_ratio.den;
-+    switch (avctx->codec->id) {
-+    case AV_CODEC_ID_H264:
-+    case AV_CODEC_ID_HEVC:
-+        if (avctx->sample_aspect_ratio.num > 0 && avctx->sample_aspect_ratio.den > 0) {
-+            sw *= avctx->sample_aspect_ratio.num;
-+            sh *= avctx->sample_aspect_ratio.den;
-+        }
-+        av_reduce(dw, dh, sw, sh, 1024 * 1024);
-+        break;
-+#ifdef NVENC_HAVE_AV1
-+    case AV_CODEC_ID_AV1:
-+        *dw = sw;
-+        *dh = sh;
-+        break;
-+#endif
-     }
--
--    av_reduce(dw, dh, sw, sh, 1024 * 1024);
- }
- 
- static av_cold int nvenc_setup_encoder(AVCodecContext *avctx)
-@@ -2075,6 +2226,10 @@ static int process_output_surface(AVCodecContext *avctx, AVPacket *pkt, NvencSur
-     case AV_CODEC_ID_H265:
-       slice_mode_data = ctx->encode_config.encodeCodecConfig.hevcConfig.sliceModeData;
-       break;
-+#ifdef NVENC_HAVE_AV1
-+    case AV_CODEC_ID_AV1:
-+      break;
-+#endif
-     default:
-       av_log(avctx, AV_LOG_ERROR, "Unknown codec name\n");
-       res = AVERROR(EINVAL);
-diff --git a/libavcodec/nvenc.h b/libavcodec/nvenc.h
-index 9eb129952e..18d1e8381b 100644
---- a/libavcodec/nvenc.h
-+++ b/libavcodec/nvenc.h
-@@ -77,6 +77,11 @@ typedef void ID3D11Device;
- #define NVENC_HAVE_SINGLE_SLICE_INTRA_REFRESH
- #endif
- 
-+// SDK 12.0 compile time feature checks
-+#if NVENCAPI_CHECK_VERSION(12, 0)
-+#define NVENC_HAVE_AV1
-+#endif
-+
- typedef struct NvencSurface
- {
-     NV_ENC_INPUT_PTR input_surface;
-@@ -136,6 +141,13 @@ enum {
-     NV_ENC_HEVC_PROFILE_REXT,
- };
- 
-+#ifdef NVENC_HAVE_AV1
-+enum {
-+    NV_ENC_AV1_PROFILE_MAIN,
-+    NV_ENC_AV1_PROFILE_HIGH,
-+};
-+#endif
-+
- enum {
-     NVENC_LOWLATENCY = 1,
-     NVENC_LOSSLESS   = 2,
-@@ -236,6 +248,11 @@ typedef struct NvencContext
-     int single_slice_intra_refresh;
-     int constrained_encoding;
-     int udu_sei;
-+    int highbitdepth;
-+    int tilecolumns;
-+    int tilerows;
-+    unsigned int tileWidths[256];
-+    unsigned int tileHeights[256];
- } NvencContext;
- 
- int ff_nvenc_encode_init(AVCodecContext *avctx);
-@@ -247,6 +264,7 @@ int ff_nvenc_receive_packet(AVCodecContext *avctx, AVPacket *pkt);
- void ff_nvenc_encode_flush(AVCodecContext *avctx);
- 
- extern const enum AVPixelFormat ff_nvenc_pix_fmts[];
-+extern const enum AVPixelFormat ff_av1_nvenc_pix_fmts[];
- extern const AVCodecHWConfigInternal *const ff_nvenc_hw_configs[];
- 
- #endif /* AVCODEC_NVENC_H */
-diff --git a/libavcodec/nvenc_av1.c b/libavcodec/nvenc_av1.c
-new file mode 100644
-index 0000000000..1f51ad057e
---- /dev/null
-+++ b/libavcodec/nvenc_av1.c
-@@ -0,0 +1,169 @@
-+/*
-+ * 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
-+ */
-+
-+#include "libavutil/internal.h"
-+
-+#include "avcodec.h"
-+#include "codec_internal.h"
-+
-+#include "nvenc.h"
-+
-+#define OFFSET(x) offsetof(NvencContext, x)
-+#define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM
-+static const AVOption options[] = {
-+    { "preset",       "Set the encoding preset",            OFFSET(preset),       AV_OPT_TYPE_INT,   { .i64 = PRESET_P4 },     PRESET_P1, PRESET_P7,          VE, "preset" },
-+    { "p1",          "fastest (lowest quality)",            0,                    AV_OPT_TYPE_CONST, { .i64 = PRESET_P1 },                  0, 0, VE, "preset" },
-+    { "p2",          "faster (lower quality)",              0,                    AV_OPT_TYPE_CONST, { .i64 = PRESET_P2 },                  0, 0, VE, "preset" },
-+    { "p3",          "fast (low quality)",                  0,                    AV_OPT_TYPE_CONST, { .i64 = PRESET_P3 },                  0, 0, VE, "preset" },
-+    { "p4",          "medium (default)",                    0,                    AV_OPT_TYPE_CONST, { .i64 = PRESET_P4 },                  0, 0, VE, "preset" },
-+    { "p5",          "slow (good quality)",                 0,                    AV_OPT_TYPE_CONST, { .i64 = PRESET_P5 },                  0, 0, VE, "preset" },
-+    { "p6",          "slower (better quality)",             0,                    AV_OPT_TYPE_CONST, { .i64 = PRESET_P6 },                  0, 0, VE, "preset" },
-+    { "p7",          "slowest (best quality)",              0,                    AV_OPT_TYPE_CONST, { .i64 = PRESET_P7 },                  0, 0, VE, "preset" },
-+    { "tune",        "Set the encoding tuning info",        OFFSET(tuning_info),  AV_OPT_TYPE_INT,   { .i64 = NV_ENC_TUNING_INFO_HIGH_QUALITY }, NV_ENC_TUNING_INFO_HIGH_QUALITY, NV_ENC_TUNING_INFO_ULTRA_LOW_LATENCY,  VE, "tune" },
-+    { "hq",          "High quality",                        0,                    AV_OPT_TYPE_CONST, { .i64 = NV_ENC_TUNING_INFO_HIGH_QUALITY },             0, 0, VE, "tune" },
-+    { "ll",          "Low latency",                         0,                    AV_OPT_TYPE_CONST, { .i64 = NV_ENC_TUNING_INFO_LOW_LATENCY },              0, 0, VE, "tune" },
-+    { "ull",         "Ultra low latency",                   0,                    AV_OPT_TYPE_CONST, { .i64 = NV_ENC_TUNING_INFO_ULTRA_LOW_LATENCY },        0, 0, VE, "tune" },
-+    { "profile",      "Set the encoding profile",           OFFSET(profile),      AV_OPT_TYPE_INT,   { .i64 = NV_ENC_AV1_PROFILE_MAIN }, NV_ENC_AV1_PROFILE_MAIN, NV_ENC_AV1_PROFILE_MAIN, VE, "profile" },
-+    { "main",         "",                                   0,                    AV_OPT_TYPE_CONST, { .i64 = NV_ENC_AV1_PROFILE_MAIN },      0, 0, VE, "profile" },
-+    { "level",        "Set the encoding level restriction", OFFSET(level),        AV_OPT_TYPE_INT,   { .i64 = NV_ENC_LEVEL_AV1_AUTOSELECT }, NV_ENC_LEVEL_AV1_2, NV_ENC_LEVEL_AV1_AUTOSELECT, VE, "level" },
-+    { "2",            "",                                   0,                    AV_OPT_TYPE_CONST, { .i64 = NV_ENC_LEVEL_AV1_2 },        0, 0, VE, "level" },
-+    { "2.0",          "",                                   0,                    AV_OPT_TYPE_CONST, { .i64 = NV_ENC_LEVEL_AV1_2 },        0, 0, VE, "level" },
-+    { "2.1",          "",                                   0,                    AV_OPT_TYPE_CONST, { .i64 = NV_ENC_LEVEL_AV1_21 },       0, 0, VE, "level" },
-+    { "3",            "",                                   0,                    AV_OPT_TYPE_CONST, { .i64 = NV_ENC_LEVEL_AV1_3 },        0, 0, VE, "level" },
-+    { "3.0",          "",                                   0,                    AV_OPT_TYPE_CONST, { .i64 = NV_ENC_LEVEL_AV1_3 },        0, 0, VE, "level" },
-+    { "3.1",          "",                                   0,                    AV_OPT_TYPE_CONST, { .i64 = NV_ENC_LEVEL_AV1_31 },       0, 0, VE, "level" },
-+    { "4",            "",                                   0,                    AV_OPT_TYPE_CONST, { .i64 = NV_ENC_LEVEL_AV1_4 },        0, 0, VE, "level" },
-+    { "4.0",          "",                                   0,                    AV_OPT_TYPE_CONST, { .i64 = NV_ENC_LEVEL_AV1_4 },        0, 0, VE, "level" },
-+    { "4.1",          "",                                   0,                    AV_OPT_TYPE_CONST, { .i64 = NV_ENC_LEVEL_AV1_41 },       0, 0, VE, "level" },
-+    { "5",            "",                                   0,                    AV_OPT_TYPE_CONST, { .i64 = NV_ENC_LEVEL_AV1_5 },        0, 0, VE, "level" },
-+    { "5.0",          "",                                   0,                    AV_OPT_TYPE_CONST, { .i64 = NV_ENC_LEVEL_AV1_5 },        0, 0, VE, "level" },
-+    { "5.1",          "",                                   0,                    AV_OPT_TYPE_CONST, { .i64 = NV_ENC_LEVEL_AV1_51 },       0, 0, VE, "level" },
-+    { "5.2",          "",                                   0,                    AV_OPT_TYPE_CONST, { .i64 = NV_ENC_LEVEL_AV1_52 },       0, 0, VE, "level" },
-+    { "5.3",          "",                                   0,                    AV_OPT_TYPE_CONST, { .i64 = NV_ENC_LEVEL_AV1_53 },       0, 0, VE, "level" },
-+    { "6",            "",                                   0,                    AV_OPT_TYPE_CONST, { .i64 = NV_ENC_LEVEL_AV1_6 },        0, 0, VE, "level" },
-+    { "6.0",          "",                                   0,                    AV_OPT_TYPE_CONST, { .i64 = NV_ENC_LEVEL_AV1_6 },        0, 0, VE, "level" },
-+    { "6.1",          "",                                   0,                    AV_OPT_TYPE_CONST, { .i64 = NV_ENC_LEVEL_AV1_61 },       0, 0, VE, "level" },
-+    { "6.2",          "",                                   0,                    AV_OPT_TYPE_CONST, { .i64 = NV_ENC_LEVEL_AV1_62 },       0, 0, VE, "level" },
-+    { "6.3",          "",                                   0,                    AV_OPT_TYPE_CONST, { .i64 = NV_ENC_LEVEL_AV1_63 },       0, 0, VE, "level" },
-+    { "auto",         "",                                   0,                    AV_OPT_TYPE_CONST, {.i64 = NV_ENC_LEVEL_AV1_AUTOSELECT },0, 0, VE, "level" },
-+    { "rc",           "Override the preset rate-control",   OFFSET(rc),           AV_OPT_TYPE_INT,   { .i64 = -1 },                                  -1, INT_MAX, VE, "rc" },
-+    { "constqp",      "Constant QP mode",                   0,                    AV_OPT_TYPE_CONST, { .i64 = NV_ENC_PARAMS_RC_CONSTQP },                   0, 0, VE, "rc" },
-+    { "vbr",          "Variable bitrate mode",              0,                    AV_OPT_TYPE_CONST, { .i64 = NV_ENC_PARAMS_RC_VBR },                       0, 0, VE, "rc" },
-+    { "cbr",          "Constant bitrate mode",              0,                    AV_OPT_TYPE_CONST, { .i64 = NV_ENC_PARAMS_RC_CBR },                       0, 0, VE, "rc" },
-+    { "rc-lookahead", "Number of frames to look ahead for rate-control",
-+                                                            OFFSET(rc_lookahead), AV_OPT_TYPE_INT,   { .i64 = 0 }, 0, INT_MAX, VE },
-+    { "surfaces",     "Number of concurrent surfaces",      OFFSET(nb_surfaces),  AV_OPT_TYPE_INT,   { .i64 = 0 }, 0, MAX_REGISTERED_FRAMES, VE },
-+    { "cbr",          "Use cbr encoding mode",              OFFSET(cbr),          AV_OPT_TYPE_BOOL,  { .i64 = 0 },   0, 1, VE },
-+    { "2pass",        "Use 2pass encoding mode",            OFFSET(twopass),      AV_OPT_TYPE_BOOL,  { .i64 = -1 }, -1, 1, VE },
-+    { "gpu",          "Selects which NVENC capable GPU to use. First GPU is 0, second is 1, and so on.",
-+                                                            OFFSET(device),       AV_OPT_TYPE_INT,   { .i64 = ANY_DEVICE },   -2, INT_MAX, VE, "gpu" },
-+    { "any",          "Pick the first device available",    0,                    AV_OPT_TYPE_CONST, { .i64 = ANY_DEVICE },          0, 0, VE, "gpu" },
-+    { "list",         "List the available devices",         0,                    AV_OPT_TYPE_CONST, { .i64 = LIST_DEVICES },        0, 0, VE, "gpu" },
-+    { "delay",        "Delay frame output by the given amount of frames",
-+                                                            OFFSET(async_depth),  AV_OPT_TYPE_INT,   { .i64 = INT_MAX }, 0, INT_MAX, VE },
-+    { "no-scenecut",  "When lookahead is enabled, set this to 1 to disable adaptive I-frame insertion at scene cuts",
-+                                                            OFFSET(no_scenecut),  AV_OPT_TYPE_BOOL,  { .i64 = 0 }, 0,  1, VE },
-+    { "forced-idr",   "If forcing keyframes, force them as IDR frames.",
-+                                                            OFFSET(forced_idr),   AV_OPT_TYPE_BOOL,  { .i64 = 0 }, -1, 1, VE },
-+    { "b_adapt",      "When lookahead is enabled, set this to 0 to disable adaptive B-frame decision",
-+                                                            OFFSET(b_adapt),      AV_OPT_TYPE_BOOL,  { .i64 = 1 }, 0,  1, VE },
-+    { "spatial-aq",   "set to 1 to enable Spatial AQ",      OFFSET(aq),           AV_OPT_TYPE_BOOL,  { .i64 = 0 }, 0,  1, VE },
-+    { "spatial_aq",   "set to 1 to enable Spatial AQ",      OFFSET(aq),           AV_OPT_TYPE_BOOL,  { .i64 = 0 }, 0,  1, VE },
-+    { "temporal-aq",  "set to 1 to enable Temporal AQ",     OFFSET(temporal_aq),  AV_OPT_TYPE_BOOL,  { .i64 = 0 }, 0,  1, VE },
-+    { "temporal_aq",  "set to 1 to enable Temporal AQ",     OFFSET(temporal_aq),  AV_OPT_TYPE_BOOL,  { .i64 = 0 }, 0,  1, VE },
-+    { "zerolatency",  "Set 1 to indicate zero latency operation (no reordering delay)",
-+                                                            OFFSET(zerolatency),  AV_OPT_TYPE_BOOL,  { .i64 = 0 }, 0,  1, VE },
-+    { "nonref_p",     "Set this to 1 to enable automatic insertion of non-reference P-frames",
-+                                                            OFFSET(nonref_p),     AV_OPT_TYPE_BOOL,  { .i64 = 0 }, 0,  1, VE },
-+    { "strict_gop",   "Set 1 to minimize GOP-to-GOP rate fluctuations",
-+                                                            OFFSET(strict_gop),   AV_OPT_TYPE_BOOL,  { .i64 = 0 }, 0,  1, VE },
-+    { "aq-strength",  "When Spatial AQ is enabled, this field is used to specify AQ strength. AQ strength scale is from 1 (low) - 15 (aggressive)",
-+                                                            OFFSET(aq_strength),  AV_OPT_TYPE_INT,   { .i64 = 8 }, 1, 15, VE },
-+    { "cq",           "Set target quality level (0 to 51, 0 means automatic) for constant quality mode in VBR rate control",
-+                                                            OFFSET(quality),      AV_OPT_TYPE_FLOAT, { .dbl = 0.}, 0., 51., VE },
-+    { "init_qpP",     "Initial QP value for P frame",       OFFSET(init_qp_p),    AV_OPT_TYPE_INT,   { .i64 = -1 }, -1, 255, VE },
-+    { "init_qpB",     "Initial QP value for B frame",       OFFSET(init_qp_b),    AV_OPT_TYPE_INT,   { .i64 = -1 }, -1, 255, VE },
-+    { "init_qpI",     "Initial QP value for I frame",       OFFSET(init_qp_i),    AV_OPT_TYPE_INT,   { .i64 = -1 }, -1, 255, VE },
-+    { "qp",           "Constant quantization parameter rate control method",
-+                                                            OFFSET(cqp),          AV_OPT_TYPE_INT,   { .i64 = -1 }, -1, 255, VE },
-+    { "qp_cb_offset", "Quantization parameter offset for cb channel",
-+                                                            OFFSET(qp_cb_offset), AV_OPT_TYPE_INT,   { .i64 = 0 }, -12, 12, VE },
-+    { "qp_cr_offset", "Quantization parameter offset for cr channel",
-+                                                            OFFSET(qp_cr_offset), AV_OPT_TYPE_INT,   { .i64 = 0 }, -12, 12, VE },
-+    { "b_ref_mode",   "Use B frames as references",         OFFSET(b_ref_mode),   AV_OPT_TYPE_INT,   { .i64 = -1 }, -1, NV_ENC_BFRAME_REF_MODE_MIDDLE, VE, "b_ref_mode" },
-+    { "disabled",     "B frames will not be used for reference", 0,               AV_OPT_TYPE_CONST, { .i64 = NV_ENC_BFRAME_REF_MODE_DISABLED }, 0, 0, VE, "b_ref_mode" },
-+    { "each",         "Each B frame will be used for reference", 0,               AV_OPT_TYPE_CONST, { .i64 = NV_ENC_BFRAME_REF_MODE_EACH }, 0, 0, VE, "b_ref_mode" },
-+    { "middle",       "Only (number of B frames)/2 will be used for reference", 0,AV_OPT_TYPE_CONST, { .i64 = NV_ENC_BFRAME_REF_MODE_MIDDLE }, 0, 0, VE, "b_ref_mode" },
-+    { "dpb_size",     "Specifies the DPB size used for encoding (0 means automatic)",
-+                                                            OFFSET(dpb_size),     AV_OPT_TYPE_INT,   { .i64 = 0 }, 0, INT_MAX, VE },
-+    { "multipass",    "Set the multipass encoding",         OFFSET(multipass),    AV_OPT_TYPE_INT,   { .i64 = NV_ENC_MULTI_PASS_DISABLED },         NV_ENC_MULTI_PASS_DISABLED, NV_ENC_TWO_PASS_FULL_RESOLUTION, VE, "multipass" },
-+    { "disabled",     "Single Pass",                        0,                    AV_OPT_TYPE_CONST, { .i64 = NV_ENC_MULTI_PASS_DISABLED },         0,                          0,                               VE, "multipass" },
-+    { "qres",         "Two Pass encoding is enabled where first Pass is quarter resolution",
-+                                                            0,                    AV_OPT_TYPE_CONST, { .i64 = NV_ENC_TWO_PASS_QUARTER_RESOLUTION }, 0,                          0,                               VE, "multipass" },
-+    { "fullres",      "Two Pass encoding is enabled where first Pass is full resolution",
-+                                                            0,                    AV_OPT_TYPE_CONST, { .i64 = NV_ENC_TWO_PASS_FULL_RESOLUTION },    0,                          0,                               VE, "multipass" },
-+    { "ldkfs",        "Low delay key frame scale; Specifies the Scene Change frame size increase allowed in case of single frame VBV and CBR",
-+                                                            OFFSET(ldkfs),        AV_OPT_TYPE_INT,   { .i64 = 0 }, 0, UCHAR_MAX, VE },
-+    { "intra-refresh","Use Periodic Intra Refresh instead of IDR frames",
-+                                                            OFFSET(intra_refresh),AV_OPT_TYPE_BOOL,  { .i64 = 0 }, 0, 1, VE },
-+    { "highbitdepth",  "set to 1 to enable 10 bit encodes for 8 bit input",
-+                                                            OFFSET(highbitdepth), AV_OPT_TYPE_BOOL,  {.i64 = 0 }, 0,  1, VE },
-+    { "tilecolumns",  "tile columns",                       OFFSET(tilecolumns),  AV_OPT_TYPE_INT,   {.i64 = 1 }, 1,  256, VE },
-+    { "tilerows",     "tile rows",                          OFFSET(tilerows),     AV_OPT_TYPE_INT,   {.i64 = 1 }, 1,  256, VE },
-+    { NULL }
-+};
-+
-+static const FFCodecDefault defaults[] = {
-+    { "b", "2M" },
-+    { "qmin", "-1" },
-+    { "qmax", "-1" },
-+    { "qdiff", "-1" },
-+    { "qblur", "-1" },
-+    { "qcomp", "-1" },
-+    { "g", "250" },
-+    { "bf", "-1" },
-+    { "refs", "0" },
-+    { NULL },
-+};
-+
-+static const AVClass av1_nvenc_class = {
-+    .class_name = "av1_nvenc",
-+    .item_name = av_default_item_name,
-+    .option = options,
-+    .version = LIBAVUTIL_VERSION_INT,
-+};
-+
-+const FFCodec ff_av1_nvenc_encoder = {
-+    .p.name         = "av1_nvenc",
-+    .p.long_name    = NULL_IF_CONFIG_SMALL("NVIDIA NVENC AV1 encoder"),
-+    .p.type         = AVMEDIA_TYPE_VIDEO,
-+    .p.id           = AV_CODEC_ID_AV1,
-+    .init           = ff_nvenc_encode_init,
-+     FF_CODEC_RECEIVE_PACKET_CB(ff_nvenc_receive_packet),
-+    .close          = ff_nvenc_encode_close,
-+    .flush          = ff_nvenc_encode_flush,
-+    .priv_data_size = sizeof(NvencContext),
-+    .p.priv_class   = &av1_nvenc_class,
-+    .defaults       = defaults,
-+    .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HARDWARE |
-+                      AV_CODEC_CAP_ENCODER_FLUSH | AV_CODEC_CAP_DR1,
-+    .caps_internal  = FF_CODEC_CAP_INIT_CLEANUP,
-+    .p.pix_fmts     = ff_av1_nvenc_pix_fmts,
-+    .p.wrapper_name = "nvenc",
-+    .hw_configs     = ff_nvenc_hw_configs,
-+};
-diff --git a/libavcodec/nvenc_h264.c b/libavcodec/nvenc_h264.c
-index a178827291..347ba2a33c 100644
---- a/libavcodec/nvenc_h264.c
-+++ b/libavcodec/nvenc_h264.c
-@@ -166,7 +166,7 @@ static const AVOption options[] = {
-     { "each",         "Each B frame will be used for reference", 0,               AV_OPT_TYPE_CONST, { .i64 = NV_ENC_BFRAME_REF_MODE_EACH }, 0, 0, VE, "b_ref_mode" },
-     { "middle",       "Only (number of B frames)/2 will be used for reference", 0,AV_OPT_TYPE_CONST, { .i64 = NV_ENC_BFRAME_REF_MODE_MIDDLE }, 0, 0, VE, "b_ref_mode" },
- #else
--    { "b_ref_mode",   "(not supported)",                    OFFSET(b_ref_mode),   AV_OPT_TYPE_INT,   { .i64 = 0 }, 0, INT_MAX, VE, "b_ref_mode" },
-+    { "b_ref_mode",   "(not supported)",                    OFFSET(b_ref_mode),   AV_OPT_TYPE_INT,   { .i64 = -1 }, -1, INT_MAX, VE, "b_ref_mode" },
-     { "disabled",     "",                                   0,                    AV_OPT_TYPE_CONST, { .i64 = 0 }, 0, 0,       VE, "b_ref_mode" },
-     { "each",         "",                                   0,                    AV_OPT_TYPE_CONST, { .i64 = 1 }, 0, 0,       VE, "b_ref_mode" },
-     { "middle",       "",                                   0,                    AV_OPT_TYPE_CONST, { .i64 = 2 }, 0, 0,       VE, "b_ref_mode" },
-diff --git a/libavcodec/nvenc_hevc.c b/libavcodec/nvenc_hevc.c
-index ae4d73e497..1938de6b91 100644
---- a/libavcodec/nvenc_hevc.c
-+++ b/libavcodec/nvenc_hevc.c
-@@ -146,7 +146,7 @@ static const AVOption options[] = {
-     { "each",         "Each B frame will be used for reference", 0,               AV_OPT_TYPE_CONST, { .i64 = NV_ENC_BFRAME_REF_MODE_EACH }, 0, 0, VE, "b_ref_mode" },
-     { "middle",       "Only (number of B frames)/2 will be used for reference", 0,AV_OPT_TYPE_CONST, { .i64 = NV_ENC_BFRAME_REF_MODE_MIDDLE }, 0, 0, VE, "b_ref_mode" },
- #else
--    { "b_ref_mode",   "(not supported)",                    OFFSET(b_ref_mode),   AV_OPT_TYPE_INT,   { .i64 = 0 }, 0, INT_MAX, VE, "b_ref_mode" },
-+    { "b_ref_mode",   "(not supported)",                    OFFSET(b_ref_mode),   AV_OPT_TYPE_INT,   { .i64 = -1 }, -1, INT_MAX, VE, "b_ref_mode" },
-     { "disabled",     "",                                   0,                    AV_OPT_TYPE_CONST, { .i64 = 0 }, 0, 0,       VE, "b_ref_mode" },
-     { "each",         "",                                   0,                    AV_OPT_TYPE_CONST, { .i64 = 1 }, 0, 0,       VE, "b_ref_mode" },
-     { "middle",       "",                                   0,                    AV_OPT_TYPE_CONST, { .i64 = 2 }, 0, 0,       VE, "b_ref_mode" },