Merge branch 'main' into ui

Author: whyb

README.md

@@ -30,8 +30,8 @@ The script automatically detect and reports on the following major hardware enco
 | NVEnc                          	       | H.264、H.265、AV1                          |
 | QSV (Quick Sync Video)         	       | H.264、H.265、AV1、MJPEG、MPEG-2、VP9       |
 | AMF (Advanced Media Framework)           | H.264、H.265、AV1                          |
-| Media Foundation               	       | H.264、H.265                               |
-| D3D12VA (Direct3D 12 Video Acceleration) | H.265                                      |
+| Media Foundation               	       | H.264、H.265、AV1                          |
+| D3D12VA (Direct3D 12 Video Acceleration) | H.264、H.265、AV1                          |
 | VAAPI (Video Acceleration API) 	       | H.264、H.265、AV1、MJPEG、MPEG-2、VP8、VP9  |
 | Vulkan                         	       | H.264、H.265                               |
 | Apple VideoToolbox               	       | H.264、H.265                               |

README.zh.md

@@ -28,8 +28,8 @@
 | NVEnc                          	       | H.264、H.265、AV1                          |
 | QSV (Quick Sync Video)         	       | H.264、H.265、AV1、MJPEG、MPEG-2、VP9       |
 | AMF (Advanced Media Framework)           | H.264、H.265、AV1                          |
-| Media Foundation               	       | H.264、H.265                               |
-| D3D12VA (Direct3D 12 Video Acceleration) | H.265                                      |
+| Media Foundation               	       | H.264、H.265、AV1                          |
+| D3D12VA (Direct3D 12 Video Acceleration) | H.264、H.265、AV1                          |
 | VAAPI (Video Acceleration API) 	       | H.264、H.265、AV1、MJPEG、MPEG-2、VP8、VP9  |
 | Vulkan                         	       | H.264、H.265                               |
 | Apple VideoToolbox               	       | H.264、H.265                               |

VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

src/HwCodecDetect/bitdepth_chroma_detect.py

@@ -46,6 +46,7 @@
     ("av1_amf", "av1"): "AMD Hardware AV1 Encoder(AMF)",
     ("h264_mf", "h264"): "Microsoft Hardware H264 Encoder(MediaFoundation)",
     ("hevc_mf", "h265"): "Microsoft Hardware H265 Encoder(MediaFoundation)",
+    ("av1_mf", "av1"): "Microsoft Hardware AV1 Encoder(MediaFoundation)",
     ("h264_d3d12va", "h264"): "Microsoft Direct3D 12 Video Acceleration H264 Encoder(D3D12VA)",
     ("hevc_d3d12va", "h265"): "Microsoft Direct3D 12 Video Acceleration H265 Encoder(D3D12VA)",
     ("av1_d3d12va", "av1"): "Microsoft Direct3D 12 Video Acceleration AV1 Encoder(D3D12VA)",
@@ -104,9 +105,9 @@
 
 # Encoder definitions (same as main module)
 ENCODERS = {
-    "h264": {"lib": "libx264", "hw_encoders": ["h264_nvenc", "h264_qsv", "h264_amf", "h264_mf", "h264_vaapi", "h264_vulkan", "h264_videotoolbox"]},
+    "h264": {"lib": "libx264", "hw_encoders": ["h264_nvenc", "h264_qsv", "h264_amf", "h264_mf", "h264_d3d12va", "h264_vaapi", "h264_vulkan", "h264_videotoolbox"]},
     "h265": {"lib": "libx265", "hw_encoders": ["hevc_nvenc", "hevc_qsv", "hevc_amf", "hevc_mf", "hevc_d3d12va", "hevc_vaapi", "hevc_vulkan", "hevc_videotoolbox"]},
-    "av1": {"lib": "librav1e", "hw_encoders": ["av1_nvenc", "av1_qsv", "av1_amf", "av1_vaapi"]},
+    "av1": {"lib": "librav1e", "hw_encoders": ["av1_nvenc", "av1_qsv", "av1_amf", "av1_mf", "av1_d3d12va", "av1_vaapi"]},
     "mpeg2": {"lib": "mpeg2video", "hw_encoders": ["mpeg2_qsv", "mpeg2_vaapi"]},
     "vp8": {"lib": "libvpx", "hw_encoders": ["vp8_vaapi"]},
     "vp9": {"lib": "libvpx-vp9", "hw_encoders": ["vp9_qsv", "vp9_vaapi"]},

src/HwCodecDetect/gui.py

@@ -109,6 +109,7 @@
     ("av1_amf", "av1"): "AMD Hardware AV1 Encoder(AMF)",
     ("h264_mf", "h264"): "Microsoft Hardware H264 Encoder(MediaFoundation)",
     ("hevc_mf", "h265"): "Microsoft Hardware H265 Encoder(MediaFoundation)",
+    ("av1_mf", "av1"): "Microsoft Hardware AV1 Encoder(MediaFoundation)",
     ("h264_d3d12va", "h264"): "Microsoft Direct3D 12 Video Acceleration H264 Encoder(D3D12VA)",
     ("hevc_d3d12va", "h265"): "Microsoft Direct3D 12 Video Acceleration H265 Encoder(D3D12VA)",
     ("av1_d3d12va", "av1"): "Microsoft Direct3D 12 Video Acceleration AV1 Encoder(D3D12VA)",
@@ -128,7 +129,7 @@
 ENCODERS = {
     "h264": {"lib": "libx264", "hw_encoders": ["h264_nvenc", "h264_qsv", "h264_amf", "h264_mf", "h264_d3d12va", "h264_vaapi", "h264_vulkan", "h264_videotoolbox"]},
     "h265": {"lib": "libx265", "hw_encoders": ["hevc_nvenc", "hevc_qsv", "hevc_amf", "hevc_mf", "hevc_d3d12va", "hevc_vaapi", "hevc_vulkan", "hevc_videotoolbox"]},
-    "av1": {"lib": "librav1e", "hw_encoders": ["av1_nvenc", "av1_qsv", "av1_amf", "av1_vaapi", "av1_d3d12va"]},
+    "av1": {"lib": "librav1e", "hw_encoders": ["av1_nvenc", "av1_qsv", "av1_amf", "av1_mf", "av1_d3d12va", "av1_vaapi"]},
     "mjpeg": {"lib": "mjpeg", "hw_encoders": ["mjpeg_qsv", "mjpeg_vaapi"]},
     "mpeg2": {"lib": "mpeg2video", "hw_encoders": ["mpeg2_qsv", "mpeg2_vaapi"]},
     "vp8": {"lib": "libvpx", "hw_encoders": ["vp8_vaapi"]},

src/HwCodecDetect/run_tests.py

@@ -109,6 +109,7 @@
     ("av1_amf", "av1"): "AMD Hardware AV1 Encoder(AMF)",
     ("h264_mf", "h264"): "Microsoft Hardware H264 Encoder(MediaFoundation)",
     ("hevc_mf", "h265"): "Microsoft Hardware H265 Encoder(MediaFoundation)",
+    ("av1_mf", "av1"): "Microsoft Hardware AV1 Encoder(MediaFoundation)",
     ("h264_d3d12va", "h264"): "Microsoft Direct3D 12 Video Acceleration H264 Encoder(D3D12VA)",
     ("hevc_d3d12va", "h265"): "Microsoft Direct3D 12 Video Acceleration H265 Encoder(D3D12VA)",
     ("av1_d3d12va", "av1"): "Microsoft Direct3D 12 Video Acceleration AV1 Encoder(D3D12VA)",
@@ -128,7 +129,7 @@
 ENCODERS = {
     "h264": {"lib": "libx264", "hw_encoders": ["h264_nvenc", "h264_qsv", "h264_amf", "h264_mf", "h264_d3d12va", "h264_vaapi", "h264_vulkan", "h264_videotoolbox"]},
     "h265": {"lib": "libx265", "hw_encoders": ["hevc_nvenc", "hevc_qsv", "hevc_amf", "hevc_mf", "hevc_d3d12va", "hevc_vaapi", "hevc_vulkan", "hevc_videotoolbox"]},
-    "av1": {"lib": "librav1e", "hw_encoders": ["av1_nvenc", "av1_qsv", "av1_amf", "av1_vaapi", "av1_d3d12va"]},
+    "av1": {"lib": "librav1e", "hw_encoders": ["av1_nvenc", "av1_qsv", "av1_amf", "av1_mf", "av1_d3d12va", "av1_vaapi"]},
     "mjpeg": {"lib": "mjpeg", "hw_encoders": ["mjpeg_qsv", "mjpeg_vaapi"]},
     "mpeg2": {"lib": "mpeg2video", "hw_encoders": ["mpeg2_qsv", "mpeg2_vaapi"]},
     "vp8": {"lib": "libvpx", "hw_encoders": ["vp8_vaapi"]},