obs-studio/patches/remove-ffmpeg-vaapi.patch

70 lines
2.2 KiB
Diff
Raw Normal View History

2023-03-04 19:07:13 +01:00
diff '--color=auto' -ru a/plugins/obs-ffmpeg/CMakeLists.txt b/plugins/obs-ffmpeg/CMakeLists.txt
--- a/plugins/obs-ffmpeg/CMakeLists.txt 2023-02-04 13:17:10.000000000 +0300
+++ b/plugins/obs-ffmpeg/CMakeLists.txt 2023-03-04 21:06:23.506168096 +0300
@@ -121,7 +121,7 @@
elseif(OS_POSIX AND NOT OS_MACOS)
find_package(Libva REQUIRED)
find_package(Libpci REQUIRED)
- target_sources(obs-ffmpeg PRIVATE obs-ffmpeg-vaapi.c vaapi-utils.c
+ target_sources(obs-ffmpeg PRIVATE vaapi-utils.c
vaapi-utils.h)
target_link_libraries(obs-ffmpeg PRIVATE Libva::va Libva::drm LIBPCI::LIBPCI)
endif()
Only in b/plugins/obs-ffmpeg: CMakeLists.txt.orig
diff '--color=auto' -ru a/plugins/obs-ffmpeg/obs-ffmpeg.c b/plugins/obs-ffmpeg/obs-ffmpeg.c
--- a/plugins/obs-ffmpeg/obs-ffmpeg.c 2023-02-04 13:17:10.000000000 +0300
+++ b/plugins/obs-ffmpeg/obs-ffmpeg.c 2023-03-04 21:06:23.506168096 +0300
@@ -43,10 +43,6 @@
2023-03-04 18:33:16 +01:00
extern struct obs_encoder_info svt_av1_encoder_info;
extern struct obs_encoder_info aom_av1_encoder_info;
2023-03-04 19:11:50 +01:00
2023-02-23 21:25:12 +01:00
-#ifdef LIBAVUTIL_VAAPI_AVAILABLE
-extern struct obs_encoder_info vaapi_encoder_info;
-#endif
-
#ifndef __APPLE__
2023-03-04 19:11:50 +01:00
2023-02-23 21:25:12 +01:00
static const char *nvenc_check_name = "nvenc_check";
2023-03-04 19:07:13 +01:00
@@ -322,19 +318,6 @@
2023-03-04 19:11:50 +01:00
2023-02-23 21:25:12 +01:00
#endif
2023-03-04 19:11:50 +01:00
2023-02-23 21:25:12 +01:00
-#ifdef LIBAVUTIL_VAAPI_AVAILABLE
2023-03-04 18:33:16 +01:00
-static bool h264_vaapi_supported(void)
2023-02-23 21:25:12 +01:00
-{
- const AVCodec *vaenc = avcodec_find_encoder_by_name("h264_vaapi");
2023-03-04 18:33:16 +01:00
-
- if (!vaenc)
- return false;
-
- /* NOTE: If default device is NULL, it means there is no device
- * that support H264. */
- return vaapi_get_h264_default_device() != NULL;
2023-02-23 21:25:12 +01:00
-}
-#endif
2023-03-04 19:11:50 +01:00
2023-02-23 21:25:12 +01:00
#ifdef _WIN32
2023-03-04 18:33:16 +01:00
extern void jim_nvenc_load(bool h264, bool hevc, bool av1);
2023-03-04 19:07:13 +01:00
@@ -412,20 +395,6 @@
2023-02-23 21:25:12 +01:00
amf_load();
#endif
2023-03-04 19:11:50 +01:00
2023-03-04 18:33:16 +01:00
-#ifdef LIBAVUTIL_VAAPI_AVAILABLE
- const char *libva_env = getenv("LIBVA_DRIVER_NAME");
- if (!!libva_env)
- blog(LOG_WARNING,
- "LIBVA_DRIVER_NAME variable is set,"
- " this could prevent FFmpeg VAAPI from working correctly");
-
- if (h264_vaapi_supported()) {
- blog(LOG_INFO, "FFmpeg VAAPI H264 encoding supported");
2023-02-23 21:25:12 +01:00
- obs_register_encoder(&vaapi_encoder_info);
2023-03-04 18:33:16 +01:00
- } else {
- blog(LOG_INFO, "FFmpeg VAAPI H264 encoding not supported");
2023-02-23 21:25:12 +01:00
- }
-#endif
#endif
2023-03-04 19:11:50 +01:00
2023-03-04 19:07:13 +01:00
#if ENABLE_FFMPEG_LOGGING
Only in a/plugins/obs-ffmpeg: obs-ffmpeg-vaapi.c