From patchwork Fri Nov 24 07:38:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 44787 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bca6:b0:181:818d:5e7f with SMTP id fx38csp1129346pzb; Thu, 23 Nov 2023 23:39:36 -0800 (PST) X-Google-Smtp-Source: AGHT+IG+oroZm0nDWyD+taYo9TBx2T96XKPNpt7t+jz16ZdjiWIwgnzd8gmY7v0n/uJ+2/9wXvu+ X-Received: by 2002:a17:906:4a0d:b0:9e0:dde:cc9f with SMTP id w13-20020a1709064a0d00b009e00ddecc9fmr1510183eju.22.1700811576154; Thu, 23 Nov 2023 23:39:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700811576; cv=none; d=google.com; s=arc-20160816; b=M39+nMfQRTb1GMK9YQa4AhfZeri6neCP4+4QTN6oJ7ythaZZkybc6BXBKeMBR0xsAP 5I8ZbRCtThrsX+mqdf96nqFf+mKj3B4NCMdMwIyuPc0DHB49k3q73lP8BO7ICvE7+ooX dy82lLQi0GJRmEvozX80ZqonH9s0U3zQNdkJdpo5aAp3918RmrjuAiVmvbLLW2YUeykE BV2fk5AF6GNI+/l7iBDb2OCf73/9BWjyyznN8gc9eXYBMSCmEGQ9GMDVI5mYUSqqGj8P S9Wxjlja6S2rEmcBtqRPdXPg9qMgGPJ97KPxuwJzlmW0wfjF6ciNQhs7FoFP23xsdCI5 YMsg== 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=7YIygcTtL/SWQFsxLA7BU1ZBaJ55STavOJafTOErVcY=; fh=1kpmTRI1sW42eNCnNMby7VLIISQBX6KJuVYxOEG0t2A=; b=L3fqcZ1NuBucILzwrunigR2+C+IVX9NelxtT8OEkzHGDsnTtsjKpqfaFfdSlcESG2X 4zR8tRR2uJEA+Ui/2ORZOkYNw00JEGCSZrIw7XanXz6JFMe9ufJPwoN/4WtchvABC5aX 30XBzbnSeIgdrA8jQ4Sj7f7Lhnn1EWydd3jbuDK8CDKuBultVmWL2oqfuBPmCLaKyYvC 6kT7OpnnZwKaPHbyE1htfY9A9U5dTrr5LnbCqjTMLmcOakC0Pf1dfCckFipxoVV0EaaN G9n9XnUJcaHUX9xeymjaHFT0tG8P1WcmtkszGcMiwDjBAZ7Wp7JJftOthpdtHfgybeEr vVXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=H3sB6iuF; 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 e12-20020a1709067e0c00b009f95787c9cbsi1616907ejr.218.2023.11.23.23.39.35; Thu, 23 Nov 2023 23:39:36 -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=H3sB6iuF; 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 CC90C68CDB6; Fri, 24 Nov 2023 09:39:32 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A3A0F68CB17 for ; Fri, 24 Nov 2023 09:39:25 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1700811570; x=1732347570; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=FwAQa81rjDT1eYYs48Db4Z970SC6QQ24jIC/tn00u+Y=; b=H3sB6iuFl/tplAUbzeGsKmW6uEVndENUtN2P2LbNFO8Tzy/3U1mCqjoQ 9NB6EVcJ30eD/QrcUnAIojAKBqDMcIPMSo9ETrgLu8xfcnW/fzUVlrsth TFPhVJ0/JMDhy2qLP44SyBivKkzJU3rRgPJEn0vdbDRAKH7ssoC604JCG gn10o/382KiWjXtGkprx1mlRQmEw60DekiUeRYUlejFP7MPGDQ78cShCZ c7QDY7gPmY+6H6AQG7hsMi04uL+U9EQK55L+bQD0Do0XHtb3IUhJcIKLv RvGVNP0pBJ5Sikdci+yLlKO7bSP/xk18rmlI5dNilXlik529Vlq5A3tOf w==; X-IronPort-AV: E=McAfee;i="6600,9927,10902"; a="478589204" X-IronPort-AV: E=Sophos;i="6.04,223,1695711600"; d="scan'208";a="478589204" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Nov 2023 23:39:18 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10902"; a="885197460" X-IronPort-AV: E=Sophos;i="6.04,223,1695711600"; d="scan'208";a="885197460" Received: from xhh-dg264.sh.intel.com ([10.238.2.76]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Nov 2023 23:39:17 -0800 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Nov 2023 15:38:52 +0800 Message-Id: <20231124073852.3172051-1-haihao.xiang@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] 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: E3x8yKLHfys/ From: Haihao Xiang 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);