[FFmpeg-devel] [PATCH v2] lavu/hwcontext_qsv: use mfxImplDescription instead of mfxExtendedDeviceId on Linux

[Xiang, Haihao]

On Ma, 2023-11-27 at 13:37 +0800, Xiang, Haihao wrote:
> From: Haihao Xiang <haihao.xiang at intel.com>
> 
> mfxExtendedDeviceId mightn't be supported in certain configurations of
> oneVPL on Linux, so we can't ensure a property filter for
> mfxExtendedDeviceId.DeviceID or mfxExtendedDeviceId.VendorID works as
> expected. This fixed the issue mentioned in [1]
> 
> [1] http://ffmpeg.org/pipermail/ffmpeg-user/2023-October/056983.html
> 
> Signed-off-by: Haihao Xiang <haihao.xiang at intel.com>
> ---
>  libavutil/hwcontext_qsv.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c
> index 1bfda9e69b..7f4a0fda0f 100644
> --- a/libavutil/hwcontext_qsv.c
> +++ b/libavutil/hwcontext_qsv.c
> @@ -821,7 +821,7 @@ static int qsv_va_update_config(void *ctx, mfxHDL handle,
> mfxConfig cfg)
>          impl_value.Type = MFX_VARIANT_TYPE_U16;
>          impl_value.Data.U16 = (attr.value & 0xFFFF);
>          sts = MFXSetConfigFilterProperty(cfg,
> -                                         (const mfxU8
> *)"mfxExtendedDeviceId.DeviceID", impl_value);
> +                                         (const mfxU8
> *)"mfxImplDescription.mfxDeviceDescription.DeviceID", impl_value);
>          if (sts != MFX_ERR_NONE) {
>              av_log(ctx, AV_LOG_ERROR, "Error adding a MFX configuration"
>                     "DeviceID property: %d.\n", sts);
> @@ -893,10 +893,10 @@ static int qsv_new_mfx_loader(void *ctx,
>          goto fail;
>      }
>  
> -    impl_value.Type = MFX_VARIANT_TYPE_U16;
> -    impl_value.Data.U16 = 0x8086; // Intel device only
> +    impl_value.Type = MFX_VARIANT_TYPE_U32;
> +    impl_value.Data.U32 = 0x8086; // Intel device only
>      sts = MFXSetConfigFilterProperty(cfg,
> -                                     (const mfxU8
> *)"mfxExtendedDeviceId.VendorID", impl_value);
> +                                     (const mfxU8
> *)"mfxImplDescription.VendorID", impl_value);
>      if (sts != MFX_ERR_NONE) {
>          av_log(ctx, AV_LOG_ERROR, "Error adding a MFX configuration"
>                 "VendorID property: %d.\n", sts);

Will apply,

Thanks
Haihao