From patchwork Thu Mar 28 02:17:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 47565 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp1031000pzb; Wed, 27 Mar 2024 19:17:39 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVGZdjXn+9YucmwEQDn36PTJQ5T/tcoN7SdLkEOgkncJ0pR3exyjeAgSKCsyvgJGPqSccOIswNZ1jMFOGf9dHGzsEPxgMBGV1pjQg== X-Google-Smtp-Source: AGHT+IFkNc3Qd2lXRCaSRy0SOtQsLgB22Llkk6PJLrdwn+h78yfG4gVI0lcU576wcmFEHGNRh6KW X-Received: by 2002:ac2:499c:0:b0:515:a97d:6396 with SMTP id f28-20020ac2499c000000b00515a97d6396mr716545lfl.68.1711592259350; Wed, 27 Mar 2024 19:17:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711592259; cv=none; d=google.com; s=arc-20160816; b=LuPqAsqCREolnxCp51t126j71VCi2aNHB3XyglW1APX33sRRXIrYi8qcyum6Ih8ejS 8uiSSv0yIqjNdoAzVi7eB+ztjI8k6dRJIVFcK6YHPvlqiUIycZZZlmG1O2lAo8Ip0T/9 g7ZH3c+jEVlzVEAxSbmsW7CQsgdRAHMk8Yw4qENeQADb1k6nZnBrk1ruhJMLNXnMjniL eln/afITL0MTdDJvVtFb3RgpM/AYaZkTSUTtC6mlhRy7fZ+ND+cvEF0GmtQlLTf+KLBr GmExtYNDehQQmQgX5xjKo/+hiTX3EwGCI12BfZkkSowST5DyNakH4k9Vu06DZ05Rrtof 5yTw== 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=y2Tx3DlDkVtEoTIBvE68SD/hFIU5NZx0ZgTYTIg+oBo=; fh=1kpmTRI1sW42eNCnNMby7VLIISQBX6KJuVYxOEG0t2A=; b=vrev68JKAW8CCm55gHKzQXbKSstSbMmhE/HFBll9BzmOr3qOFH7PAnTumQgTse5uxb TVAPbupfkwBynvs+d57JKseTB+i9Mh0dURF96wpd5hSIiPNRFTR/V4pDp/sNGXM+8O9W CS4FCL+ve57kYI/leTCYybPwmuhRTDSMBphJSO08Z4YL09UMfxPntZ8sNPvrGBvyVKAD PlGNq5rxbdIDBZYD7avQZaY6qIVW/zVjWFvFuTs+lwliAtsrTy8NwyQNOXH1ozgzjDKE 9UuMXoxseT4izRj4S7QtFmIFtfPzWrh5lJYqxM+oSE4nkeBlT6MXFBn9G9QTHdNtjAxY 7qag==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=jd5MtSaE; 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 bj17-20020a170906b05100b00a475301bb92si182686ejb.920.2024.03.27.19.17.38; Wed, 27 Mar 2024 19:17:39 -0700 (PDT) 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=jd5MtSaE; 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 012AC68D6FA; Thu, 28 Mar 2024 04:17:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.21]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0F14068ADF1 for ; Thu, 28 Mar 2024 04:17:29 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1711592256; x=1743128256; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=TwzOtJbVrt3BmqhmFeMV4QPIYgPCkfsBLHKVnWFF4Mw=; b=jd5MtSaEIT0h3nxrJe9Mxms6h3pbV5STULCdqPtzjPoTHEaFHmd8zIXe dQLdQSzJRBr1e4SeRgfPUDyBWnKAMxjFkM33Jw1mNj/+6ePJsLgQ15hHG a2h6Uf9V1QqYm8X2ZrQI5R/HPz7FpIlB/CuJKPMwXJAmSk23UL6fEWSUa nG7H6pljqjekVL/rn7tKoRSx3caOAQ5sUEnKhPul68e8NFpyHLCiceSkk RAw9h9CyCLxxvdMGXpUgTBI5Cica7oDwBkRtZcBGiXLUtcCF10126J9Dy uBtYt3Cf61yXnw+uvjdPrfwAAe2v9zQmfy6K5KlBJETCRM5+UcSLGVDNd w==; X-CSE-ConnectionGUID: mzAXwkQVSXG/vlUB6RLL3Q== X-CSE-MsgGUID: dBVbidL6QgWVlpIdVqAUpg== X-IronPort-AV: E=McAfee;i="6600,9927,11026"; a="6664783" X-IronPort-AV: E=Sophos;i="6.07,160,1708416000"; d="scan'208";a="6664783" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by orvoesa113.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Mar 2024 19:17:29 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,160,1708416000"; d="scan'208";a="16890294" Received: from xhh-dg264.sh.intel.com ([10.238.2.76]) by orviesa007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Mar 2024 19:17:27 -0700 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Thu, 28 Mar 2024 10:17:15 +0800 Message-Id: <20240328021717.4116418-1-haihao.xiang@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] lavu/hwcontext_vaapi: Add a new quirk 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: BSSeYAGo2skV From: Haihao Xiang libva2 doesn't require a fixed surface-array any more, but some driver/hardware combinations which rely on this are still used. To reduce the impact to users, add a quirk for the driver/hardware combination which supports dynamic surface pool. Signed-off-by: Haihao Xiang --- libavutil/hwcontext_vaapi.c | 7 +++++++ libavutil/hwcontext_vaapi.h | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c index 56d03aa4cd..dae5dd4a11 100644 --- a/libavutil/hwcontext_vaapi.c +++ b/libavutil/hwcontext_vaapi.c @@ -390,6 +390,13 @@ static const struct { "Splitted-Desktop Systems VDPAU backend for VA-API", AV_VAAPI_DRIVER_QUIRK_SURFACE_ATTRIBUTES, }, +#if CONFIG_VAAPI_1 + { + "New Intel iHD", + "Intel iHD driver for Intel(R) Gen Graphics", + AV_VAAPI_DRIVER_QUIRK_DYNAMIC_SURFACE_POOL, + }, +#endif }; static int vaapi_device_init(AVHWDeviceContext *hwdev) diff --git a/libavutil/hwcontext_vaapi.h b/libavutil/hwcontext_vaapi.h index 0b2e071cb3..07014fd526 100644 --- a/libavutil/hwcontext_vaapi.h +++ b/libavutil/hwcontext_vaapi.h @@ -58,6 +58,12 @@ enum { * and the results of the vaQuerySurfaceAttributes() call will be faked. */ AV_VAAPI_DRIVER_QUIRK_SURFACE_ATTRIBUTES = (1 << 3), + + /** + * The driver (and the underlying HW) supports dynamic surface pool. + * The vaCreateContext() call doesn't require a fixed surface-array. + */ + AV_VAAPI_DRIVER_QUIRK_DYNAMIC_SURFACE_POOL = (1 << 4), }; /**