[FFmpeg-devel] [PATCH 1/3] lavu/hwcontext_d3d11va: Add option vendor_id

[Xiang, Haihao]

On So, 2023-11-26 at 11:49 +0100, Anton Khirnov wrote:
> Quoting Xiang, Haihao (2023-11-24 06:43:46)
> > From: Artem Galin <artem.galin at intel.com>
> > 
> > User may choose the hardware via option vendor_id when multiple hardware
> > are available.
> > 
> > Signed-off-by: Artem Galin <artem.galin at intel.com>
> > Signed-off-by: Haihao Xiang <haihao.xiang at intel.com>
> > ---
> >  libavutil/hwcontext_d3d11va.c | 67 ++++++++++++++++++++++++++++++++++-
> >  1 file changed, 66 insertions(+), 1 deletion(-)
> > 
> > diff --git a/libavutil/hwcontext_d3d11va.c b/libavutil/hwcontext_d3d11va.c
> > index cc8c97d2b6..a6777b70a1 100644
> > --- a/libavutil/hwcontext_d3d11va.c
> > +++ b/libavutil/hwcontext_d3d11va.c
> > @@ -552,6 +552,55 @@ 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_ERROR, "D3D11CreateDevice returned
> > error\n");
> 
> This should not be AV_LOG_ERROR, since it does not result in failure.
> 
> > +
> > +            if (adapter)
> 
> I'd expect adapter to be always non-NULL here. Same below, also for
> device..

Thanks for the comments, I'll update the patch

BRs
Haihao

>