summaryrefslogtreecommitdiff
path: root/libavutil
diff options
context:
space:
mode:
authorHaihao Xiang <haihao.xiang@intel.com>2023-11-27 13:37:22 +0800
committerHaihao Xiang <haihao.xiang@intel.com>2023-12-05 10:11:19 +0800
commit05debdaa5fde6440b0575d7e2a1fd2e357b55f65 (patch)
treecc2f6c322bcd95e424af547efb9893ffd0de89cd /libavutil
parentfc73b372cd43e52d3aa0aefc6d76fd340bf753f1 (diff)
lavu/hwcontext_qsv: use mfxImplDescription instead of mfxExtendedDeviceId on Linux
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@intel.com>
Diffstat (limited to 'libavutil')
-rw-r--r--libavutil/hwcontext_qsv.c8
1 files 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);