* [FFmpeg-devel] [PATCH v2 1/3] lavu/hwcontext_d3d11va: Add option vendor_id
@ 2023-11-28 4:42 Xiang, Haihao
2023-11-28 4:42 ` [FFmpeg-devel] [PATCH v2 2/3] doc/ffmpeg: Update the description about d3d11va Xiang, Haihao
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Xiang, Haihao @ 2023-11-28 4:42 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Haihao Xiang, Artem Galin
From: Artem Galin <artem.galin@intel.com>
User may choose the hardware via option vendor_id when multiple
hardwares are available.
Signed-off-by: Artem Galin <artem.galin@intel.com>
Signed-off-by: Haihao Xiang <haihao.xiang@intel.com>
---
libavutil/hwcontext_d3d11va.c | 59 ++++++++++++++++++++++++++++++++++-
1 file changed, 58 insertions(+), 1 deletion(-)
diff --git a/libavutil/hwcontext_d3d11va.c b/libavutil/hwcontext_d3d11va.c
index cc8c97d2b6..2fd3561c88 100644
--- a/libavutil/hwcontext_d3d11va.c
+++ b/libavutil/hwcontext_d3d11va.c
@@ -552,6 +552,47 @@ static void d3d11va_device_uninit(AVHWDeviceContext *hwdev)
}
}
+static int d3d11va_device_find_adapter_by_vendor_id(AVHWDeviceContext *ctx, uint32_t flags, const char *vendor_id)
+{
+ HRESULT hr;
+ IDXGIAdapter *adapter = NULL;
+ IDXGIFactory2 *factory;
+ int adapter_id = 0;
+ long int id = strtol(vendor_id, NULL, 0);
+
+ hr = mCreateDXGIFactory(&IID_IDXGIFactory2, (void **)&factory);
+ if (FAILED(hr)) {
+ av_log(ctx, AV_LOG_ERROR, "CreateDXGIFactory returned error\n");
+ return -1;
+ }
+
+ while (IDXGIFactory2_EnumAdapters(factory, adapter_id++, &adapter) != DXGI_ERROR_NOT_FOUND) {
+ ID3D11Device* device = NULL;
+ DXGI_ADAPTER_DESC adapter_desc;
+
+ hr = mD3D11CreateDevice(adapter, D3D_DRIVER_TYPE_UNKNOWN, NULL, flags, NULL, 0, D3D11_SDK_VERSION, &device, NULL, NULL);
+ if (FAILED(hr)) {
+ av_log(ctx, AV_LOG_DEBUG, "D3D11CreateDevice returned error, try next adapter\n");
+ IDXGIAdapter_Release(adapter);
+ continue;
+ }
+
+ hr = IDXGIAdapter2_GetDesc(adapter, &adapter_desc);
+ ID3D11Device_Release(device);
+ IDXGIAdapter_Release(adapter);
+ if (FAILED(hr)) {
+ av_log(ctx, AV_LOG_DEBUG, "IDXGIAdapter2_GetDesc returned error, try next adapter\n");
+ continue;
+ } else if (adapter_desc.VendorId == id) {
+ IDXGIFactory2_Release(factory);
+ return adapter_id - 1;
+ }
+ }
+
+ IDXGIFactory2_Release(factory);
+ return -1;
+}
+
static int d3d11va_device_create(AVHWDeviceContext *ctx, const char *device,
AVDictionary *opts, int flags)
{
@@ -563,6 +604,7 @@ static int d3d11va_device_create(AVHWDeviceContext *ctx, const char *device,
UINT creationFlags = D3D11_CREATE_DEVICE_VIDEO_SUPPORT;
int is_debug = !!av_dict_get(opts, "debug", NULL, 0);
int ret;
+ int adapter = -1;
// (On UWP we can't check this.)
#if !HAVE_UWP
@@ -581,10 +623,25 @@ static int d3d11va_device_create(AVHWDeviceContext *ctx, const char *device,
}
if (device) {
+ adapter = atoi(device);
+ } else {
+ AVDictionaryEntry *e = av_dict_get(opts, "vendor_id", NULL, 0);
+ if (e && e->value) {
+ adapter = d3d11va_device_find_adapter_by_vendor_id(ctx, creationFlags, e->value);
+ if (adapter < 0) {
+ av_log(ctx, AV_LOG_ERROR, "Failed to find d3d11va adapter by "
+ "vendor id %s\n", e->value);
+ return AVERROR_UNKNOWN;
+ }
+ }
+ }
+
+ if (adapter >= 0) {
IDXGIFactory2 *pDXGIFactory;
+
+ av_log(ctx, AV_LOG_VERBOSE, "Selecting d3d11va adapter %d\n", adapter);
hr = mCreateDXGIFactory(&IID_IDXGIFactory2, (void **)&pDXGIFactory);
if (SUCCEEDED(hr)) {
- int adapter = atoi(device);
if (FAILED(IDXGIFactory2_EnumAdapters(pDXGIFactory, adapter, &pAdapter)))
pAdapter = NULL;
IDXGIFactory2_Release(pDXGIFactory);
--
2.34.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 5+ messages in thread* [FFmpeg-devel] [PATCH v2 2/3] doc/ffmpeg: Update the description about d3d11va
2023-11-28 4:42 [FFmpeg-devel] [PATCH v2 1/3] lavu/hwcontext_d3d11va: Add option vendor_id Xiang, Haihao
@ 2023-11-28 4:42 ` Xiang, Haihao
2023-11-28 4:42 ` [FFmpeg-devel] [PATCH v2 3/3] lavu/hwcontext_qsv: Make sure hardware vendor is Intel for qsv on d3d11va Xiang, Haihao
2023-12-05 8:18 ` [FFmpeg-devel] [PATCH v2 1/3] lavu/hwcontext_d3d11va: Add option vendor_id Xiang, Haihao
2 siblings, 0 replies; 5+ messages in thread
From: Xiang, Haihao @ 2023-11-28 4:42 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Haihao Xiang
From: Haihao Xiang <haihao.xiang@intel.com>
Signed-off-by: Haihao Xiang <haihao.xiang@intel.com>
---
doc/ffmpeg.texi | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
index 68363ae045..145cbb1032 100644
--- a/doc/ffmpeg.texi
+++ b/doc/ffmpeg.texi
@@ -1165,6 +1165,21 @@ Choose the first device and use the primary device context.
@item d3d11va
@var{device} is the number of the Direct3D 11 display adapter.
+If not specified, it will attempt to use the default Direct3D 11 display adapter
+or the first Direct3D 11 display adapter whose hardware VendorId is specified
+by @samp{vendor_id}.
+
+Examples:
+@table @emph
+@item -init_hw_device d3d11va
+Create a d3d11va device on the default Direct3D 11 display adapter.
+
+@item -init_hw_device d3d11va:1
+Create a d3d11va device on the Direct3D 11 display adapter specified by index 1.
+
+@item -init_hw_device d3d11va:,vendor_id=0x8086
+Create a d3d11va device on the first Direct3D 11 display adapter whose hardware VendorId is 0x8086.
+@end table
@item vaapi
@var{device} is either an X11 display name, a DRM render node or a DirectX adapter index.
--
2.34.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 5+ messages in thread* [FFmpeg-devel] [PATCH v2 3/3] lavu/hwcontext_qsv: Make sure hardware vendor is Intel for qsv on d3d11va
2023-11-28 4:42 [FFmpeg-devel] [PATCH v2 1/3] lavu/hwcontext_d3d11va: Add option vendor_id Xiang, Haihao
2023-11-28 4:42 ` [FFmpeg-devel] [PATCH v2 2/3] doc/ffmpeg: Update the description about d3d11va Xiang, Haihao
@ 2023-11-28 4:42 ` Xiang, Haihao
2023-12-05 8:18 ` [FFmpeg-devel] [PATCH v2 1/3] lavu/hwcontext_d3d11va: Add option vendor_id Xiang, Haihao
2 siblings, 0 replies; 5+ messages in thread
From: Xiang, Haihao @ 2023-11-28 4:42 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Haihao Xiang, Artem Galin
From: Haihao Xiang <haihao.xiang@intel.com>
When multiple hardwares are available, the default one might not be
Intel Hardware. We can use option vendor_id to choose the required
vendor.
Tested-by: Artem Galin <artem.galin@intel.com>
Signed-off-by: Haihao Xiang <haihao.xiang@intel.com>
---
libavutil/hwcontext_qsv.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c
index 1bfda9e69b..7a9cd0cc37 100644
--- a/libavutil/hwcontext_qsv.c
+++ b/libavutil/hwcontext_qsv.c
@@ -2200,6 +2200,12 @@ static int qsv_device_create(AVHWDeviceContext *ctx, const char *device,
#endif
#if CONFIG_D3D11VA
case AV_HWDEVICE_TYPE_D3D11VA:
+ {
+ // Make sure the hardware vendor is Intel when multiple devices are
+ // available, it will be ignored if user specifies the child device
+ // explicitly
+ av_dict_set(&child_device_opts, "vendor_id", "0x8086", 0);
+ }
break;
#endif
#if CONFIG_DXVA2
--
2.34.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [FFmpeg-devel] [PATCH v2 1/3] lavu/hwcontext_d3d11va: Add option vendor_id
2023-11-28 4:42 [FFmpeg-devel] [PATCH v2 1/3] lavu/hwcontext_d3d11va: Add option vendor_id Xiang, Haihao
2023-11-28 4:42 ` [FFmpeg-devel] [PATCH v2 2/3] doc/ffmpeg: Update the description about d3d11va Xiang, Haihao
2023-11-28 4:42 ` [FFmpeg-devel] [PATCH v2 3/3] lavu/hwcontext_qsv: Make sure hardware vendor is Intel for qsv on d3d11va Xiang, Haihao
@ 2023-12-05 8:18 ` Xiang, Haihao
2023-12-07 2:33 ` Xiang, Haihao
2 siblings, 1 reply; 5+ messages in thread
From: Xiang, Haihao @ 2023-12-05 8:18 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Galin, Artem
On Di, 2023-11-28 at 12:42 +0800, Xiang, Haihao wrote:
> From: Artem Galin <artem.galin@intel.com>
>
> User may choose the hardware via option vendor_id when multiple
> hardwares are available.
>
> Signed-off-by: Artem Galin <artem.galin@intel.com>
> Signed-off-by: Haihao Xiang <haihao.xiang@intel.com>
> ---
> libavutil/hwcontext_d3d11va.c | 59 ++++++++++++++++++++++++++++++++++-
> 1 file changed, 58 insertions(+), 1 deletion(-)
>
> diff --git a/libavutil/hwcontext_d3d11va.c b/libavutil/hwcontext_d3d11va.c
> index cc8c97d2b6..2fd3561c88 100644
> --- a/libavutil/hwcontext_d3d11va.c
> +++ b/libavutil/hwcontext_d3d11va.c
> @@ -552,6 +552,47 @@ static void d3d11va_device_uninit(AVHWDeviceContext
> *hwdev)
> }
> }
>
> +static int d3d11va_device_find_adapter_by_vendor_id(AVHWDeviceContext *ctx,
> uint32_t flags, const char *vendor_id)
> +{
> + HRESULT hr;
> + IDXGIAdapter *adapter = NULL;
> + IDXGIFactory2 *factory;
> + int adapter_id = 0;
> + long int id = strtol(vendor_id, NULL, 0);
> +
> + hr = mCreateDXGIFactory(&IID_IDXGIFactory2, (void **)&factory);
> + if (FAILED(hr)) {
> + av_log(ctx, AV_LOG_ERROR, "CreateDXGIFactory returned error\n");
> + return -1;
> + }
> +
> + while (IDXGIFactory2_EnumAdapters(factory, adapter_id++, &adapter) !=
> DXGI_ERROR_NOT_FOUND) {
> + ID3D11Device* device = NULL;
> + DXGI_ADAPTER_DESC adapter_desc;
> +
> + hr = mD3D11CreateDevice(adapter, D3D_DRIVER_TYPE_UNKNOWN, NULL,
> flags, NULL, 0, D3D11_SDK_VERSION, &device, NULL, NULL);
> + if (FAILED(hr)) {
> + av_log(ctx, AV_LOG_DEBUG, "D3D11CreateDevice returned error, try
> next adapter\n");
> + IDXGIAdapter_Release(adapter);
> + continue;
> + }
> +
> + hr = IDXGIAdapter2_GetDesc(adapter, &adapter_desc);
> + ID3D11Device_Release(device);
> + IDXGIAdapter_Release(adapter);
> + if (FAILED(hr)) {
> + av_log(ctx, AV_LOG_DEBUG, "IDXGIAdapter2_GetDesc returned error,
> try next adapter\n");
> + continue;
> + } else if (adapter_desc.VendorId == id) {
> + IDXGIFactory2_Release(factory);
> + return adapter_id - 1;
> + }
> + }
> +
> + IDXGIFactory2_Release(factory);
> + return -1;
> +}
> +
> static int d3d11va_device_create(AVHWDeviceContext *ctx, const char *device,
> AVDictionary *opts, int flags)
> {
> @@ -563,6 +604,7 @@ static int d3d11va_device_create(AVHWDeviceContext *ctx,
> const char *device,
> UINT creationFlags = D3D11_CREATE_DEVICE_VIDEO_SUPPORT;
> int is_debug = !!av_dict_get(opts, "debug", NULL, 0);
> int ret;
> + int adapter = -1;
>
> // (On UWP we can't check this.)
> #if !HAVE_UWP
> @@ -581,10 +623,25 @@ static int d3d11va_device_create(AVHWDeviceContext *ctx,
> const char *device,
> }
>
> if (device) {
> + adapter = atoi(device);
> + } else {
> + AVDictionaryEntry *e = av_dict_get(opts, "vendor_id", NULL, 0);
> + if (e && e->value) {
> + adapter = d3d11va_device_find_adapter_by_vendor_id(ctx,
> creationFlags, e->value);
> + if (adapter < 0) {
> + av_log(ctx, AV_LOG_ERROR, "Failed to find d3d11va adapter by
> "
> + "vendor id %s\n", e->value);
> + return AVERROR_UNKNOWN;
> + }
> + }
> + }
> +
> + if (adapter >= 0) {
> IDXGIFactory2 *pDXGIFactory;
> +
> + av_log(ctx, AV_LOG_VERBOSE, "Selecting d3d11va adapter %d\n",
> adapter);
> hr = mCreateDXGIFactory(&IID_IDXGIFactory2, (void **)&pDXGIFactory);
> if (SUCCEEDED(hr)) {
> - int adapter = atoi(device);
> if (FAILED(IDXGIFactory2_EnumAdapters(pDXGIFactory, adapter,
> &pAdapter)))
> pAdapter = NULL;
> IDXGIFactory2_Release(pDXGIFactory);
I'll merge this patchset if there are no more comments for v2
Thanks
Haihao
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [FFmpeg-devel] [PATCH v2 1/3] lavu/hwcontext_d3d11va: Add option vendor_id
2023-12-05 8:18 ` [FFmpeg-devel] [PATCH v2 1/3] lavu/hwcontext_d3d11va: Add option vendor_id Xiang, Haihao
@ 2023-12-07 2:33 ` Xiang, Haihao
0 siblings, 0 replies; 5+ messages in thread
From: Xiang, Haihao @ 2023-12-07 2:33 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Galin, Artem
On Di, 2023-12-05 at 08:18 +0000, Xiang, Haihao wrote:
> On Di, 2023-11-28 at 12:42 +0800, Xiang, Haihao wrote:
> > From: Artem Galin <artem.galin@intel.com>
> >
> > User may choose the hardware via option vendor_id when multiple
> > hardwares are available.
> >
> > Signed-off-by: Artem Galin <artem.galin@intel.com>
> > Signed-off-by: Haihao Xiang <haihao.xiang@intel.com>
> > ---
> > libavutil/hwcontext_d3d11va.c | 59 ++++++++++++++++++++++++++++++++++-
> > 1 file changed, 58 insertions(+), 1 deletion(-)
> >
> > diff --git a/libavutil/hwcontext_d3d11va.c b/libavutil/hwcontext_d3d11va.c
> > index cc8c97d2b6..2fd3561c88 100644
> > --- a/libavutil/hwcontext_d3d11va.c
> > +++ b/libavutil/hwcontext_d3d11va.c
> > @@ -552,6 +552,47 @@ static void d3d11va_device_uninit(AVHWDeviceContext
> > *hwdev)
> > }
> > }
> >
> > +static int d3d11va_device_find_adapter_by_vendor_id(AVHWDeviceContext *ctx,
> > uint32_t flags, const char *vendor_id)
> > +{
> > + HRESULT hr;
> > + IDXGIAdapter *adapter = NULL;
> > + IDXGIFactory2 *factory;
> > + int adapter_id = 0;
> > + long int id = strtol(vendor_id, NULL, 0);
> > +
> > + hr = mCreateDXGIFactory(&IID_IDXGIFactory2, (void **)&factory);
> > + if (FAILED(hr)) {
> > + av_log(ctx, AV_LOG_ERROR, "CreateDXGIFactory returned error\n");
> > + return -1;
> > + }
> > +
> > + while (IDXGIFactory2_EnumAdapters(factory, adapter_id++, &adapter) !=
> > DXGI_ERROR_NOT_FOUND) {
> > + ID3D11Device* device = NULL;
> > + DXGI_ADAPTER_DESC adapter_desc;
> > +
> > + hr = mD3D11CreateDevice(adapter, D3D_DRIVER_TYPE_UNKNOWN, NULL,
> > flags, NULL, 0, D3D11_SDK_VERSION, &device, NULL, NULL);
> > + if (FAILED(hr)) {
> > + av_log(ctx, AV_LOG_DEBUG, "D3D11CreateDevice returned error,
> > try
> > next adapter\n");
> > + IDXGIAdapter_Release(adapter);
> > + continue;
> > + }
> > +
> > + hr = IDXGIAdapter2_GetDesc(adapter, &adapter_desc);
> > + ID3D11Device_Release(device);
> > + IDXGIAdapter_Release(adapter);
> > + if (FAILED(hr)) {
> > + av_log(ctx, AV_LOG_DEBUG, "IDXGIAdapter2_GetDesc returned
> > error,
> > try next adapter\n");
> > + continue;
> > + } else if (adapter_desc.VendorId == id) {
> > + IDXGIFactory2_Release(factory);
> > + return adapter_id - 1;
> > + }
> > + }
> > +
> > + IDXGIFactory2_Release(factory);
> > + return -1;
> > +}
> > +
> > static int d3d11va_device_create(AVHWDeviceContext *ctx, const char
> > *device,
> > AVDictionary *opts, int flags)
> > {
> > @@ -563,6 +604,7 @@ static int d3d11va_device_create(AVHWDeviceContext *ctx,
> > const char *device,
> > UINT creationFlags = D3D11_CREATE_DEVICE_VIDEO_SUPPORT;
> > int is_debug = !!av_dict_get(opts, "debug", NULL, 0);
> > int ret;
> > + int adapter = -1;
> >
> > // (On UWP we can't check this.)
> > #if !HAVE_UWP
> > @@ -581,10 +623,25 @@ static int d3d11va_device_create(AVHWDeviceContext
> > *ctx,
> > const char *device,
> > }
> >
> > if (device) {
> > + adapter = atoi(device);
> > + } else {
> > + AVDictionaryEntry *e = av_dict_get(opts, "vendor_id", NULL, 0);
> > + if (e && e->value) {
> > + adapter = d3d11va_device_find_adapter_by_vendor_id(ctx,
> > creationFlags, e->value);
> > + if (adapter < 0) {
> > + av_log(ctx, AV_LOG_ERROR, "Failed to find d3d11va adapter
> > by
> > "
> > + "vendor id %s\n", e->value);
> > + return AVERROR_UNKNOWN;
> > + }
> > + }
> > + }
> > +
> > + if (adapter >= 0) {
> > IDXGIFactory2 *pDXGIFactory;
> > +
> > + av_log(ctx, AV_LOG_VERBOSE, "Selecting d3d11va adapter %d\n",
> > adapter);
> > hr = mCreateDXGIFactory(&IID_IDXGIFactory2, (void
> > **)&pDXGIFactory);
> > if (SUCCEEDED(hr)) {
> > - int adapter = atoi(device);
> > if (FAILED(IDXGIFactory2_EnumAdapters(pDXGIFactory, adapter,
> > &pAdapter)))
> > pAdapter = NULL;
> > IDXGIFactory2_Release(pDXGIFactory);
>
> I'll merge this patchset if there are no more comments for v2
Pushed,
Thanks
Haihao
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-12-07 2:34 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-11-28 4:42 [FFmpeg-devel] [PATCH v2 1/3] lavu/hwcontext_d3d11va: Add option vendor_id Xiang, Haihao
2023-11-28 4:42 ` [FFmpeg-devel] [PATCH v2 2/3] doc/ffmpeg: Update the description about d3d11va Xiang, Haihao
2023-11-28 4:42 ` [FFmpeg-devel] [PATCH v2 3/3] lavu/hwcontext_qsv: Make sure hardware vendor is Intel for qsv on d3d11va Xiang, Haihao
2023-12-05 8:18 ` [FFmpeg-devel] [PATCH v2 1/3] lavu/hwcontext_d3d11va: Add option vendor_id Xiang, Haihao
2023-12-07 2:33 ` Xiang, Haihao
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git