Update d3d12va hevc encoder and submodule

Submodule 0732513...f1e34f1 Signed-off-by: Tong Wu <tong1.wu@intel.com>
intel · Mar 25, 2024 · e327b9f · e327b9f
1 parent 4b827e1
commit e327b9f
Show file tree

Hide file tree

Showing 12 changed files with 20 additions and 20 deletions.
diff --git a/ffmpeg b/ffmpeg
diff --git a/patches/0119-avcodec-vaapi_encode-move-pic-input_surface-initiali.patch b/patches/0119-avcodec-vaapi_encode-move-pic-input_surface-initiali.patch
@@ -1,4 +1,4 @@
-From b94c6252e08ec84320d28f96882e6ec6413a5559 Mon Sep 17 00:00:00 2001
+From 77a7132c29e0473acfeade068466c6f9076f7648 Mon Sep 17 00:00:00 2001
 From: Tong Wu <tong1.wu@intel.com>
 Date: Tue, 2 Jan 2024 11:08:46 +0800
 Subject: [PATCH 01/11] avcodec/vaapi_encode: move pic->input_surface

diff --git a/patches/0120-avcodec-vaapi_encode-introduce-a-base-layer-for-vaap.patch b/patches/0120-avcodec-vaapi_encode-introduce-a-base-layer-for-vaap.patch
@@ -1,4 +1,4 @@
-From 068d3f1fd07d6be6d2692ce105859ef851391ff2 Mon Sep 17 00:00:00 2001
+From 0d0f7de8117183c63cf8437a7796f624343259ef Mon Sep 17 00:00:00 2001
 From: Tong Wu <tong1.wu@intel.com>
 Date: Thu, 14 Mar 2024 12:01:48 +0800
 Subject: [PATCH 02/11] avcodec/vaapi_encode: introduce a base layer for vaapi

diff --git a/patches/0121-avcodec-vaapi_encode-move-the-dpb-logic-from-VAAPI-t.patch b/patches/0121-avcodec-vaapi_encode-move-the-dpb-logic-from-VAAPI-t.patch
@@ -1,4 +1,4 @@
-From 172da26014d001fdccb4608bf746b207fad24324 Mon Sep 17 00:00:00 2001
+From a26c4b900d402f2fabf82c53ebd2e9f739d9044f Mon Sep 17 00:00:00 2001
 From: Tong Wu <tong1.wu@intel.com>
 Date: Thu, 14 Mar 2024 13:16:57 +0800
 Subject: [PATCH 03/11] avcodec/vaapi_encode: move the dpb logic from VAAPI to
@@ -26,7 +26,7 @@ Signed-off-by: Tong Wu <tong1.wu@intel.com>
  create mode 100644 libavcodec/hw_base_encode.c
 
 diff --git a/libavcodec/Makefile b/libavcodec/Makefile
-index 708434ac76..cbfae5f182 100644
+index 7ef2e03ca6..79063a6ef4 100644
 --- a/libavcodec/Makefile
 +++ b/libavcodec/Makefile
 @@ -162,7 +162,7 @@ OBJS-$(CONFIG_STARTCODE)               += startcode.o

diff --git a/patches/0122-avcodec-vaapi_encode-extract-a-init-function-to-base.patch b/patches/0122-avcodec-vaapi_encode-extract-a-init-function-to-base.patch
@@ -1,4 +1,4 @@
-From 19591a2671b3bb633ea5493ec672803f347306ec Mon Sep 17 00:00:00 2001
+From 97b2422351e8a322ab224026d01cac82680386fe Mon Sep 17 00:00:00 2001
 From: Tong Wu <tong1.wu@intel.com>
 Date: Thu, 14 Mar 2024 13:57:58 +0800
 Subject: [PATCH 04/11] avcodec/vaapi_encode: extract a init function to base

diff --git a/patches/0123-avcodec-vaapi_encode-extract-a-close-function-for-ba.patch b/patches/0123-avcodec-vaapi_encode-extract-a-close-function-for-ba.patch
@@ -1,4 +1,4 @@
-From 6dc5f0991de24404c0ad9fc14d856f214e9343d5 Mon Sep 17 00:00:00 2001
+From ebdfbeed7973b460074e094372f7cbf996899c02 Mon Sep 17 00:00:00 2001
 From: Tong Wu <tong1.wu@intel.com>
 Date: Thu, 14 Mar 2024 14:17:33 +0800
 Subject: [PATCH 05/11] avcodec/vaapi_encode: extract a close function for base

diff --git a/patches/0124-avcodec-vaapi_encode-extract-set_output_property-to-.patch b/patches/0124-avcodec-vaapi_encode-extract-set_output_property-to-.patch
@@ -1,4 +1,4 @@
-From ece3048fd266e73ae8c632554635881a6e575f1f Mon Sep 17 00:00:00 2001
+From c92b4a08024d6ceccba3c2c6c7f32d5f2067bfb3 Mon Sep 17 00:00:00 2001
 From: Tong Wu <tong1.wu@intel.com>
 Date: Thu, 28 Dec 2023 18:17:33 +0800
 Subject: [PATCH 06/11] avcodec/vaapi_encode: extract set_output_property to

diff --git a/patches/0125-avcodec-vaapi_encode-extract-gop-configuration-to-ba.patch b/patches/0125-avcodec-vaapi_encode-extract-gop-configuration-to-ba.patch
@@ -1,4 +1,4 @@
-From a92d2524269b4f0fc74d118dc51aaf1451de3267 Mon Sep 17 00:00:00 2001
+From 5a91042a3742a8cdaaaea8cb8ecbfc94d12d5f97 Mon Sep 17 00:00:00 2001
 From: Tong Wu <tong1.wu@intel.com>
 Date: Fri, 29 Dec 2023 10:00:02 +0800
 Subject: [PATCH 07/11] avcodec/vaapi_encode: extract gop configuration to base

diff --git a/patches/0126-avcodec-vaapi_encode-extract-a-get_recon_format-func.patch b/patches/0126-avcodec-vaapi_encode-extract-a-get_recon_format-func.patch
@@ -1,4 +1,4 @@
-From 360af894582acf1bcec80535665ac11255eb4cc9 Mon Sep 17 00:00:00 2001
+From 14ade43949df0bf8c81555afc57c092b1c1ca18c Mon Sep 17 00:00:00 2001
 From: Tong Wu <tong1.wu@intel.com>
 Date: Fri, 29 Dec 2023 10:37:42 +0800
 Subject: [PATCH 08/11] avcodec/vaapi_encode: extract a get_recon_format

diff --git a/patches/0127-avcodec-vaapi_encode-extract-a-free-funtion-to-base-.patch b/patches/0127-avcodec-vaapi_encode-extract-a-free-funtion-to-base-.patch
@@ -1,4 +1,4 @@
-From cff93279c8723737e580e6ba92f6e99ac6a8a53c Mon Sep 17 00:00:00 2001
+From 1dacee7ba54f59b88d06e1440b666ba840b00e97 Mon Sep 17 00:00:00 2001
 From: Tong Wu <tong1.wu@intel.com>
 Date: Mon, 19 Feb 2024 22:09:11 +0800
 Subject: [PATCH 09/11] avcodec/vaapi_encode: extract a free funtion to base

diff --git a/patches/0128-avutil-hwcontext_d3d12va-add-Flags-for-resource-crea.patch b/patches/0128-avutil-hwcontext_d3d12va-add-Flags-for-resource-crea.patch
@@ -1,4 +1,4 @@
-From 7542cf7c4a5858596f423555e3e9c495e17d9e9c Mon Sep 17 00:00:00 2001
+From 23dd77e4e6683703588d81a68e910cd73d9edfb8 Mon Sep 17 00:00:00 2001
 From: Tong Wu <tong1.wu@intel.com>
 Date: Tue, 26 Sep 2023 10:11:50 +0800
 Subject: [PATCH 10/11] avutil/hwcontext_d3d12va: add Flags for resource

diff --git a/patches/0129-avcodec-add-D3D12VA-hardware-HEVC-encoder.patch b/patches/0129-avcodec-add-D3D12VA-hardware-HEVC-encoder.patch
@@ -1,4 +1,4 @@
-From 614faeb818071ab4889c0e429c60d82f29cb8434 Mon Sep 17 00:00:00 2001
+From d749489d90062e94ecf5fa6ae0cbdb27dddea56d Mon Sep 17 00:00:00 2001
 From: Tong Wu <tong1.wu@intel.com>
 Date: Tue, 22 Aug 2023 13:26:36 +0800
 Subject: [PATCH 11/11] avcodec: add D3D12VA hardware HEVC encoder
@@ -24,34 +24,34 @@ Signed-off-by: Tong Wu <tong1.wu@intel.com>
  create mode 100644 libavcodec/d3d12va_encode_hevc.c
 
 diff --git a/configure b/configure
-index b79db56292..b00fd929e5 100755
+index 3c19a73347..b2563a006f 100755
 --- a/configure
 +++ b/configure
-@@ -2575,6 +2575,7 @@ CONFIG_EXTRA="
+@@ -2625,6 +2625,7 @@ CONFIG_EXTRA="
      tpeldsp
      vaapi_1
      vaapi_encode
 +    d3d12va_encode
      vc1dsp
      videodsp
      vp3dsp
-@@ -3219,6 +3220,7 @@ wmv3_vaapi_hwaccel_select="vc1_vaapi_hwaccel"
+@@ -3270,6 +3271,7 @@ wmv3_vaapi_hwaccel_select="vc1_vaapi_hwaccel"
  wmv3_vdpau_hwaccel_select="vc1_vdpau_hwaccel"
 
  # hardware-accelerated codecs
 +d3d12va_encode_deps="d3d12va ID3D12VideoEncoder d3d12_encoder_feature"
  mediafoundation_deps="mftransform_h MFCreateAlignedMemoryBuffer"
  omx_deps="libdl pthreads"
  omx_rpi_select="omx"
-@@ -3285,6 +3287,7 @@ h264_v4l2m2m_encoder_deps="v4l2_m2m h264_v4l2_m2m"
+@@ -3336,6 +3338,7 @@ h264_v4l2m2m_encoder_deps="v4l2_m2m h264_v4l2_m2m"
  hevc_amf_encoder_deps="amf"
  hevc_cuvid_decoder_deps="cuvid"
  hevc_cuvid_decoder_select="hevc_mp4toannexb_bsf"
 +hevc_d3d12va_encoder_select="cbs_h265 d3d12va_encode"
  hevc_mediacodec_decoder_deps="mediacodec"
  hevc_mediacodec_decoder_select="hevc_mp4toannexb_bsf hevc_parser"
  hevc_mediacodec_encoder_deps="mediacodec"
-@@ -6623,6 +6626,9 @@ check_type "windows.h d3d11.h" "ID3D11VideoDecoder"
+@@ -6692,6 +6695,9 @@ check_type "windows.h d3d11.h" "ID3D11VideoDecoder"
  check_type "windows.h d3d11.h" "ID3D11VideoContext"
  check_type "windows.h d3d12.h" "ID3D12Device"
  check_type "windows.h d3d12video.h" "ID3D12VideoDecoder"
@@ -62,7 +62,7 @@ index b79db56292..b00fd929e5 100755
  check_type "d3d9.h dxva2api.h" DXVA2_ConfigPictureDecode -D_WIN32_WINNT=0x0602
  check_func_headers mfapi.h MFCreateAlignedMemoryBuffer -lmfplat
 diff --git a/libavcodec/Makefile b/libavcodec/Makefile
-index cbfae5f182..cdda3f0d0a 100644
+index 79063a6ef4..e497e9c630 100644
 --- a/libavcodec/Makefile
 +++ b/libavcodec/Makefile
 @@ -84,6 +84,7 @@ OBJS-$(CONFIG_CBS_JPEG)                += cbs_jpeg.o
@@ -74,7 +74,7 @@ index cbfae5f182..cdda3f0d0a 100644
  OBJS-$(CONFIG_DOVI_RPU)                += dovi_rpu.o
  OBJS-$(CONFIG_ERROR_RESILIENCE)        += error_resilience.o
 @@ -435,6 +436,7 @@ OBJS-$(CONFIG_HEVC_DECODER)            += hevcdec.o hevc_mvs.o \
-                                           h274.o
+                                           h274.o aom_film_grain.o
  OBJS-$(CONFIG_HEVC_AMF_ENCODER)        += amfenc_hevc.o
  OBJS-$(CONFIG_HEVC_CUVID_DECODER)      += cuviddec.o
 +OBJS-$(CONFIG_HEVC_D3D12VA_ENCODER)    += d3d12va_encode_hevc.o