RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavu/hwcontext_qsv: Update after adding support for VAAPI on Windows 

- qsv_internal.h: Remove unnecessary include va_drm.h
- qsv_internal.h: Enable AVCODEC_QSV_LINUX_SESSION_HANDLE on Linux/VA only
- hwcontext_qsv.c: Do not allow child_device_type VAAPI for Windows until
  support is added, keep D3D11/DXVA2 as more prioritary defaults.

Initial review at https://github.com/intel-media-ci/ffmpeg/pull/619/

Signed-off-by: Sil Vilerino <sivileri@microsoft.com>
Reviewed-by: Dmitry Rogozhkin <dmitry.v.rogozhkin@intel.com>
Reviewed-by: Wu, Tong1 <tong1.wu@intel.com>
This commit is contained in:
Sil Vilerino 2023-04-14 10:39:06 -04:00 committed by Haihao Xiang
parent 5ff1430452
commit a9a2ddaea8
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/qsv_internal.h
View File

@ -23,9 +23,9 @@
#include "config.h"
#if CONFIG_VAAPI
#if CONFIG_VAAPI && !defined(_WIN32) // Do not enable for libva-win32 on Windows
#define AVCODEC_QSV_LINUX_SESSION_HANDLE
#endif //CONFIG_VAAPI
#endif //CONFIG_VAAPI && !defined(_WIN32)
#ifdef AVCODEC_QSV_LINUX_SESSION_HANDLE
#include <stdio.h>
@ -35,7 +35,6 @@
#endif
#include <fcntl.h>
#include <va/va.h>
#include <va/va_drm.h>
#include "libavutil/hwcontext_vaapi.h"
#endif

14
libavutil/hwcontext_qsv.c
View File

@ -2126,8 +2126,6 @@ static int qsv_device_create(AVHWDeviceContext *ctx, const char *device,
"\"%s\".\n", e->value);
return AVERROR(EINVAL);
}
} else if (CONFIG_VAAPI) {
child_device_type = AV_HWDEVICE_TYPE_VAAPI;
#if QSV_ONEVPL
} else if (CONFIG_D3D11VA) { // Use D3D11 by default if d3d11va is enabled
av_log(ctx, AV_LOG_VERBOSE,
@ -2147,11 +2145,23 @@ static int qsv_device_create(AVHWDeviceContext *ctx, const char *device,
} else if (CONFIG_D3D11VA) {
child_device_type = AV_HWDEVICE_TYPE_D3D11VA;
#endif
} else if (CONFIG_VAAPI) {
child_device_type = AV_HWDEVICE_TYPE_VAAPI;
} else {
av_log(ctx, AV_LOG_ERROR, "No supported child device type is enabled\n");
return AVERROR(ENOSYS);
}
#if CONFIG_VAAPI && defined(_WIN32)
/* AV_HWDEVICE_TYPE_VAAPI on Windows/Libva-win32 not supported */
/* Reject user specified child_device_type or CONFIG_VAAPI on Windows */
if (child_device_type == AV_HWDEVICE_TYPE_VAAPI) {
av_log(ctx, AV_LOG_ERROR, "VAAPI child device type not supported for oneVPL on Windows"
"\"%s\".\n", e->value);
return AVERROR(EINVAL);
}
#endif
child_device_opts = NULL;
switch (child_device_type) {
#if CONFIG_VAAPI