From patchwork Mon Nov 27 05:37:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 44823 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bca6:b0:181:818d:5e7f with SMTP id fx38csp3097779pzb; Sun, 26 Nov 2023 21:37:45 -0800 (PST) X-Google-Smtp-Source: AGHT+IGqctJx5gAXiMRHurTy5RE5RaS7M9L5w94soDmSFCU9NSbDgbZDFhwYnI1XmHHhZW4GdET3 X-Received: by 2002:a50:9b44:0:b0:54a:8e8c:80ac with SMTP id a4-20020a509b44000000b0054a8e8c80acmr6650488edj.30.1701063464835; Sun, 26 Nov 2023 21:37:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701063464; cv=none; d=google.com; s=arc-20160816; b=KcV/K1Y9RwMX1RlpIeTGYhKOxEGjZcjrkCqX/SOfuobAUqynM4a6DJcsSMu93zoaNP HkfeWSFR5TKbFXKrZfthFYhtaUv3BWA1u5IPs+kWrPX0+eJ6qJoP82FIb7IVPgf9Uw1P uNpklbhAj9jHx7C/B0gB7xgLZMWlBz8T+OLq4nRUOD531p77GPCjQc9wANzo2Sq0XooC m948TyG4G+sCSl2rvx47LvXHLWtqLFoO1vT2mVwrrhUa9IoC0ua3dAEX+JrzQdXkEzaR Mbxdu/a4ncvJ/zTlaQPY1kLQpeNWPYHRh1RndzzKutzConYa76S+24P9C7dOcYkUBCrX myWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=ak4hQpRkmmJN1ztWKTaFz9PGRNoPUC17fKzSDrU7Nno=; fh=1kpmTRI1sW42eNCnNMby7VLIISQBX6KJuVYxOEG0t2A=; b=yfEbjeAZPhDCCXrV2rXZqo+q1Dekn2xPggZIeUvj6AWU0M2mUoZ14hAHxI43z8BTuI evwXoObARNOTkmMEFWCwx2gV9gqoqblxgPk0ZshUnCzHzg4k3Y0jpJf0TtuYmzL3xl3E Szm/HfRPEY7FNWMeMO92Mma89WlvVTpvFTWUetXzzH5XBFW4SdNHlso/TidFM+1qHrz2 hQ8vcYSkRMcQiz22O4Hffqe6uNV9lZES99SqbBDLBxN2zg4uwK5FtFczuQ92YH8XoYrq SYZH+tcKK1ZEips/lD81ClFidnf0Mh7bbd6ysk7ywgzABFFLObbIL4MVVCSKe8Mnjgyc MlrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=Tz6sIR2+; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u6-20020a509506000000b005488288c72fsi4678847eda.75.2023.11.26.21.37.44; Sun, 26 Nov 2023 21:37:44 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=Tz6sIR2+; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EBF4268CF57; Mon, 27 Nov 2023 07:37:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D700E68CB9D for ; Mon, 27 Nov 2023 07:37:33 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1701063459; x=1732599459; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=UYFIoz4/M0o0NaNzVd+G96DOvP/xlA9IhFUgPVm2t6Q=; b=Tz6sIR2+qTPGHwatFt279/leQCMInpGveuScaor4iUgdJk8csgAM1lr4 CWmjXJP4YA7240S3d1o+AlbNuiTBQAs5lJF3mf02YONFl58PfKYZ7xI8o xcq4AKefBRlBnqORQuNDmp9vcRP9Ha4NhwfNuvssmkIV87frx/+6J1chO m2cUUcEZrJAvlsS922u1DW5eqkE5z0rwW2aMMB3mMtpfrIr3YFVQCzxFu Nw4HIGBmgcIAfsfV3R5PAmBoNuAHUo6dXAmTQjcxr5R8dQ9gg8J69QkHv r6+uT0DT+66rZ5Nk9S6PpEiYnnqttBQLgYqj4vYNN1eAe4o7CzU+UUs/q w==; X-IronPort-AV: E=McAfee;i="6600,9927,10906"; a="459129858" X-IronPort-AV: E=Sophos;i="6.04,230,1695711600"; d="scan'208";a="459129858" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Nov 2023 21:37:30 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10906"; a="891624541" X-IronPort-AV: E=Sophos;i="6.04,230,1695711600"; d="scan'208";a="891624541" Received: from xhh-dg264.sh.intel.com ([10.238.2.76]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Nov 2023 21:37:29 -0800 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Mon, 27 Nov 2023 13:37:22 +0800 Message-Id: <20231127053722.2420663-1-haihao.xiang@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] lavu/hwcontext_qsv: use mfxImplDescription instead of mfxExtendedDeviceId on Linux X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Haihao Xiang Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ptZcYNaCUikN From: Haihao Xiang 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 --- 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);