From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id C4C9A4771A for ; Wed, 20 Dec 2023 07:12:34 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 254BC68D1C8; Wed, 20 Dec 2023 09:11:31 +0200 (EET) Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.88]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 85FB468D18F for ; Wed, 20 Dec 2023 09:11: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=1703056285; x=1734592285; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=WPeh8Z/bgpKCIsYR5/LYJFJnm17HJZBtIZlZ8LGmrG8=; b=gFtUOLjYXhXR14OKxQsl7NJK/HHnWterHIh7hHTce2lMwwNGLyP4lhUc pC86ruPRA52QgsLcZC5HZhqgNPX8Yh3ds34U/w99APKozhICrEcqSO84m 2YXVQvA5Kkoq+/TDriraG0QWgoTbkARZkyBveoP+hz0Jc0G11PLcvJa3y VOh7Qcin4XqlJ3gXn9A5lpjUsKfSbHM6rxE6OBw019c47hRFf1PRWv/qq ub8vOgquGKA5SP0NuuaL8exncPuP82+Au/E6FIp3spuL9RZTwceltdBFq cakMy7hrN1VhcYVhyG4V6RlPD2LiuKj1ytD2Sk9iepbLPXS8agJ3pVM1G w==; X-IronPort-AV: E=McAfee;i="6600,9927,10929"; a="426921055" X-IronPort-AV: E=Sophos;i="6.04,290,1695711600"; d="scan'208";a="426921055" Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Dec 2023 23:11:19 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.04,290,1695711600"; d="scan'208";a="18191906" Received: from xhh-dg264.sh.intel.com ([10.238.2.76]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Dec 2023 23:11:18 -0800 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Wed, 20 Dec 2023 15:10:48 +0800 Message-Id: <20231220071050.3175819-10-haihao.xiang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231220071050.3175819-1-haihao.xiang@intel.com> References: <20231220071050.3175819-1-haihao.xiang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 10/12] lavu/hwcontext_vaapi: relax the requirement when using libva2 (VAAPI 1) 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: Haihao Xiang With libva2, the argument for render target list to vaCreateContext() is a hint, so we may use a dynamic frame pool. Signed-off-by: Haihao Xiang --- doc/APIchanges | 4 ++++ libavutil/hwcontext_vaapi.c | 2 +- libavutil/hwcontext_vaapi.h | 5 +++-- libavutil/version.h | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index b68156ee94..0e36f43a91 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -2,6 +2,10 @@ The last version increases of all libraries were on 2023-02-09 API changes, most recent first: +2023-12-xx - xxxxxxxxxx - lavu 58.37.100 - hwcontext_vaapi.h + Modify the documentation to relax the constraint for dynamic + frames pool + 2023-12-xx - xxxxxxxxxx - lavu 58.36.100 - hwcontext_qsv.h Add AVQSVFramesContext.info diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c index 29fc8bd648..628232e2b8 100644 --- a/libavutil/hwcontext_vaapi.c +++ b/libavutil/hwcontext_vaapi.c @@ -618,7 +618,7 @@ static int vaapi_frames_init(AVHWFramesContext *hwfc) } } else { // This pool allows dynamic sizing, and will not be usable as a - // render target. + // render target with libva. It can be used with libva2 avfc->nb_surfaces = 0; avfc->surface_ids = NULL; } diff --git a/libavutil/hwcontext_vaapi.h b/libavutil/hwcontext_vaapi.h index 0b2e071cb3..cff88ad237 100644 --- a/libavutil/hwcontext_vaapi.h +++ b/libavutil/hwcontext_vaapi.h @@ -25,9 +25,10 @@ * @file * API-specific header for AV_HWDEVICE_TYPE_VAAPI. * - * Dynamic frame pools are supported, but note that any pool used as a render + * Dynamic frame pools are supported. Note that any pool used as a render * target is required to be of fixed size in order to be be usable as an - * argument to vaCreateContext(). + * argument to vaCreateContext() when libva is used. When libva2 (VAAPI 1) + * is used, a pool used as a render target can be dynamic. * * For user-allocated pools, AVHWFramesContext.pool must return AVBufferRefs * with the data pointer set to a VASurfaceID. diff --git a/libavutil/version.h b/libavutil/version.h index 3b4c50e9a9..3b38f8f5da 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,7 +79,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 58 -#define LIBAVUTIL_VERSION_MINOR 36 +#define LIBAVUTIL_VERSION_MINOR 37 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".