From patchwork Thu Nov 18 04:05:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xu, Guangxin" X-Patchwork-Id: 31464 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp220527iob; Wed, 17 Nov 2021 20:10:52 -0800 (PST) X-Google-Smtp-Source: ABdhPJyRfNsqMe0aYjy8JuP2JqSJiPkOwhmQW3fPiuNXp8ZFvJMWXirDqorugAe2u4rT0WoogtK+ X-Received: by 2002:a17:907:7242:: with SMTP id ds2mr29350987ejc.269.1637208651867; Wed, 17 Nov 2021 20:10:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637208651; cv=none; d=google.com; s=arc-20160816; b=iquXH8yuIRUNZ4efQUIe09FXCwFq+pPSTjrUwvE0yffGtOakW0deA9d0cckmBWy0oC DIBVGw7ieENfVhiNe/ebnh1vgkb3LQfHFbFBoUwtCiXm3xxnEa9Sq8khgpZ6xwuGfRSb hAKybzmrpNpm+fM8KLG9aRsVjSPEKw5LuEMXFsP80cA1ALJ/KPULwfGUZ+gnSulevf/C TV7n/yhbE1fEj6EO7Zg1+1MDYlqmA6Z2AAnlmunOR12d5ovwTFhSszK8+kZBIfqhTE5I tlxD5odqZv0ju1eL77t046JGfFtWPBIPHllhRd90ZPBMxpQYUKLvaPji/iYIbQztYeVp A9lw== 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 :delivered-to; bh=IaXK8qIOLrDIuAVRE2OzSzendhIox7uPXrTWKWg/mkE=; b=egwDrm8cK21iQtLtOirxIRh9nlerJWJCVRi/uSKnfzp6+Q7r+KcgJwyLN2xdKPoCvS VsleJc1F+K8uAiNtIPSU+Yx0Bo2NsPb8UT6zYKzJzLf4fTLtKwXlyQxqrg1fqcuJxJqA 7SgE3Q8ItPONFXgTQEUxzaMwczfKvmuMjhdZRh4aIhKyRAiy/v0gsGNCz0pG6brYZjJT 1sNhuwZXI1w0lasNd34OUHionu+npQeey582VnCgr3m0CUKUiamUmMZstRuED+ox1azP szK8vLmwcpDlWpRqIqHbyE+w/NTabLhL96weWCyJeUUVP3X6dBXCkokH86Kto/j2Uv3e BvDA== ARC-Authentication-Results: i=1; mx.google.com; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hz1si5695131ejc.254.2021.11.17.20.10.44; Wed, 17 Nov 2021 20:10:51 -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; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1FDEB68AB35; Thu, 18 Nov 2021 06:10:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9605A689F08 for ; Thu, 18 Nov 2021 06:10:29 +0200 (EET) X-IronPort-AV: E=McAfee;i="6200,9189,10171"; a="214827588" X-IronPort-AV: E=Sophos;i="5.87,243,1631602800"; d="scan'208";a="214827588" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Nov 2021 20:10:25 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.87,243,1631602800"; d="scan'208";a="455154576" Received: from trinity.sh.intel.com ([10.239.159.156]) by orsmga006.jf.intel.com with ESMTP; 17 Nov 2021 20:10:24 -0800 From: Xu Guangxin To: ffmpeg-devel@ffmpeg.org Date: Thu, 18 Nov 2021 12:05:46 +0800 Message-Id: <20211118040549.3871537-1-guangxin.xu@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/4] avutils: hwcontext_vaapi, print error if allocated surfaces > pool size 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: Xu Guangxin Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: o5GvXYej4dQY --- libavutil/hwcontext_vaapi.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c index 83e542876d..14a2df38c6 100644 --- a/libavutil/hwcontext_vaapi.c +++ b/libavutil/hwcontext_vaapi.c @@ -475,8 +475,11 @@ static AVBufferRef *vaapi_pool_alloc(void *opaque, size_t size) AVBufferRef *ref; if (hwfc->initial_pool_size > 0 && - avfc->nb_surfaces >= hwfc->initial_pool_size) + avfc->nb_surfaces >= hwfc->initial_pool_size) { + av_log(hwfc, AV_LOG_ERROR, "allocated surfaces count(%d) > pool_size(%d)\n", + avfc->nb_surfaces, hwfc->initial_pool_size); return NULL; + } vas = vaCreateSurfaces(hwctx->display, ctx->rt_format, hwfc->width, hwfc->height, From patchwork Thu Nov 18 04:05:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xu, Guangxin" X-Patchwork-Id: 31463 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp220596iob; Wed, 17 Nov 2021 20:10:56 -0800 (PST) X-Google-Smtp-Source: ABdhPJzf2Dw4B0yWsI0O6sGtNW1h1S4t1M8RchFqOZ3lcxjcsBX+uk8xhNsDhG70k2W1BGwpyU+f X-Received: by 2002:a17:907:7253:: with SMTP id ds19mr29812626ejc.476.1637208656750; Wed, 17 Nov 2021 20:10:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637208656; cv=none; d=google.com; s=arc-20160816; b=LMfAe4YOddZF3qM74xtaZvLwSOk3x9gDNQXyPhnYWZy+ow58MB7VDqig7uzLGNw+ws 7xg+w6pnob6eaGRW20eb8Dg59ugURmkMRfVQlYNndXiNTJJ0bieR9vs7/By+HeuM4qA+ ar5pI+J0CuEyMZbwlxuYwfpZ0JQ64Pk/s4q0Hi1yz1eWULZvvS3mDknm89OMJ8uCDFFM TxgASDXl0XSTCg1OoYynDE3jFV1HedNZaYMTXPwc0ze+jOqqKd3P+ot5AJHC2uEYSpO1 F5J8kuPaFPsIhZY0VmewIublAPcfWvza8JmsEbq+T9x6MLJSUVkSnsVQHobBY0zQFz3T 0eFg== 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:references:in-reply-to :message-id:date:to:from:delivered-to; bh=eW8k9r1h9b6nQDy0Jbg86kwiOKokVmWrsgbrmyHV5as=; b=dDQZ/JnSZ/YhEBiUF+r9M+nT7wcXcW0QA4kpMCfCvp4/ueQqUrc3uvzQCMt8gWw5KL Nh6OCYxoYgHDh1O0YN8dXyBkEb+bfvxUrxgqJULNF8ufr+qq1AsyKq7hUfLsjtYb9pQv Wc6OR5d0Xem0QDX66qoVw+U4lhvn9nRsLYkWT0dfiqiQjo+KLr1joMvKpf+GsZG7VALW PVa0xc1HNRU+wvyO0fWIxo3HyyPWIKj+g1COsgeaJkygcsf+XFTYvgJyJGXiU3wEH27E vpX7vzPXNNaAlvykBu/tTyOSpUiK0WT41X9l9mf+tmmEx0gRG6bxsbe8jwq3YTINBDc/ BFNA== ARC-Authentication-Results: i=1; mx.google.com; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id dt5si6278107ejc.402.2021.11.17.20.10.56; Wed, 17 Nov 2021 20:10:56 -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; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 21ADE68ACC3; Thu, 18 Nov 2021 06:10:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 09ACD68A1B8 for ; Thu, 18 Nov 2021 06:10:31 +0200 (EET) X-IronPort-AV: E=McAfee;i="6200,9189,10171"; a="214827597" X-IronPort-AV: E=Sophos;i="5.87,243,1631602800"; d="scan'208";a="214827597" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Nov 2021 20:10:30 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.87,243,1631602800"; d="scan'208";a="455154598" Received: from trinity.sh.intel.com ([10.239.159.156]) by orsmga006.jf.intel.com with ESMTP; 17 Nov 2021 20:10:29 -0800 From: Xu Guangxin To: ffmpeg-devel@ffmpeg.org Date: Thu, 18 Nov 2021 12:05:47 +0800 Message-Id: <20211118040549.3871537-2-guangxin.xu@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211118040549.3871537-1-guangxin.xu@intel.com> References: <20211118040549.3871537-1-guangxin.xu@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4] avutil: hwcontext_vaapi, add AV_VAAPI_DRIVER_QUIRK_FRAME_POOL_RESIZING 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: Xu Guangxin Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: rH8Ex3YmRL3G --- libavutil/hwcontext_vaapi.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavutil/hwcontext_vaapi.h b/libavutil/hwcontext_vaapi.h index 0b2e071cb3..e4c7707861 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 does not support dynamically frame pool resizing. + * We need to provide all va surfaces at vaCreateContext + */ + AV_VAAPI_DRIVER_QUIRK_FRAME_POOL_RESIZING = (1 << 4), }; /** From patchwork Thu Nov 18 04:05:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xu, Guangxin" X-Patchwork-Id: 31466 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp220729iob; Wed, 17 Nov 2021 20:11:07 -0800 (PST) X-Google-Smtp-Source: ABdhPJzHnu5LUAKxQujrCP4y1OpND1avIFQxlh2SS+5ftmsyK51TsGlzSPfEh8pXbgvus+wG2V0t X-Received: by 2002:a17:907:6e9e:: with SMTP id sh30mr29259246ejc.156.1637208667181; Wed, 17 Nov 2021 20:11:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637208667; cv=none; d=google.com; s=arc-20160816; b=Ao5gshsZj2RVUBdoNZ7y1EaY56SPP03xOL1ZLvKEmIZD6SVgaqsuSgiIS/SDaEHA3F bgkEdhC9g5oJXUzsI6XbKQM6HvvgbiQoxYniLeXjjLYrdmBBWn979EgZnuqepCqztl1S eONk3PvBCKk76y2wHzTKFgF4EJEqXXUi/6Rm+M+N1fsSbARhFT2rwhwU/1M9NZPx2Srd D6r6qZsJ04Gky/sNyuaA3VFXnZUTE6rbOHGoQXe8bRUUS6J9HN4pfx8iXcxKjHeXRCWi bWBEvExGHmvSC2jk4J+bc/wsXSh5lmAYB04Nr0laR/v4sMsftNLXtJAw9KaaKx0VK3bg NjdA== 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:references:in-reply-to :message-id:date:to:from:delivered-to; bh=F+mHZmw/ijrAeBPdYyD8gyigzwfErl9EH+BE+r+6T/4=; b=j+9N/U+SolC8Aph2oevBnvol/WUnRlZXqVSx1ooAHERn1LX8cO//O3meDBVo8v4l2T CQWrn+5Ljy2wEkCGULuda4ITvKfTdl1SfLUurmRAMeEFlgRigFojp4fzsFfWbCQio+iB O3BIG9vDJqdcS2tj1GEAI7IeGYX+2922YF0EpxKdc5vrv5c5MGeqc0hc579CugXEj/GF Jf3r+lCVY5JaGrwwpgwgpRY05sV5fbQf8NB6TjHOj2cwV9hV5apAcIxqCbWj2n6ayUaJ 3rikffZ5HImd123ehgde7ser3rhg6YFxyIoC7L+VX1+n0V7yVmtVbwfPpish4Xg2j4uM LyjQ== ARC-Authentication-Results: i=1; mx.google.com; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id cx23si3504222edb.77.2021.11.17.20.11.06; Wed, 17 Nov 2021 20:11:07 -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; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3394268ABCA; Thu, 18 Nov 2021 06:10:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9B25668A98A for ; Thu, 18 Nov 2021 06:10:34 +0200 (EET) X-IronPort-AV: E=McAfee;i="6200,9189,10171"; a="214827599" X-IronPort-AV: E=Sophos;i="5.87,243,1631602800"; d="scan'208";a="214827599" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Nov 2021 20:10:32 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.87,243,1631602800"; d="scan'208";a="455154609" Received: from trinity.sh.intel.com ([10.239.159.156]) by orsmga006.jf.intel.com with ESMTP; 17 Nov 2021 20:10:31 -0800 From: Xu Guangxin To: ffmpeg-devel@ffmpeg.org Date: Thu, 18 Nov 2021 12:05:48 +0800 Message-Id: <20211118040549.3871537-3-guangxin.xu@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211118040549.3871537-1-guangxin.xu@intel.com> References: <20211118040549.3871537-1-guangxin.xu@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] avutil: hwcontext_vaapi, mark i965, VDPAU and ubit driver as AV_VAAPI_DRIVER_QUIRK_FRAME_POOL_RESIZING 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: Xu Guangxin Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: w3zX/aE0Ol0e Legacy drivers can't support decode output frame pool resize. --- libavutil/hwcontext_vaapi.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c index 14a2df38c6..c13c395da2 100644 --- a/libavutil/hwcontext_vaapi.c +++ b/libavutil/hwcontext_vaapi.c @@ -331,23 +331,26 @@ static const struct { const char *match_string; unsigned int quirks; } vaapi_driver_quirks_table[] = { -#if !VA_CHECK_VERSION(1, 0, 0) - // The i965 driver did not conform before version 2.0. + // The i965 driver did not conform RENDER_PARAM_BUFFERS before version 2.0. { "Intel i965 (Quick Sync)", "i965", - AV_VAAPI_DRIVER_QUIRK_RENDER_PARAM_BUFFERS, - }, +#if !VA_CHECK_VERSION(1, 0, 0) + AV_VAAPI_DRIVER_QUIRK_RENDER_PARAM_BUFFERS | AV_VAAPI_DRIVER_QUIRK_FRAME_POOL_RESIZING, +#else + AV_VAAPI_DRIVER_QUIRK_FRAME_POOL_RESIZING, #endif + }, + { "Intel iHD", "ubit", - AV_VAAPI_DRIVER_QUIRK_ATTRIB_MEMTYPE, + AV_VAAPI_DRIVER_QUIRK_ATTRIB_MEMTYPE | AV_VAAPI_DRIVER_QUIRK_FRAME_POOL_RESIZING, }, { "VDPAU wrapper", "Splitted-Desktop Systems VDPAU backend for VA-API", - AV_VAAPI_DRIVER_QUIRK_SURFACE_ATTRIBUTES, + AV_VAAPI_DRIVER_QUIRK_SURFACE_ATTRIBUTES | AV_VAAPI_DRIVER_QUIRK_FRAME_POOL_RESIZING, }, }; From patchwork Thu Nov 18 04:05:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xu, Guangxin" X-Patchwork-Id: 31465 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp220883iob; Wed, 17 Nov 2021 20:11:19 -0800 (PST) X-Google-Smtp-Source: ABdhPJzT5Bb8u8CjY38ch7uwTdS2YA7AVYepooVMf/omX5A7XQ2f/+slMcaXT9KYudInoXOIpQ/j X-Received: by 2002:a17:907:7e88:: with SMTP id qb8mr28240873ejc.535.1637208679321; Wed, 17 Nov 2021 20:11:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637208679; cv=none; d=google.com; s=arc-20160816; b=NSFfZ/Q1MD8VHem0x3kenEbXIyTReGfJu3TApku+LA1xdVJ8fo2xB1lL3pmxiedLVU +hDOeqY5AY3oz1ZgDr4Rq1C9pI7IIz8Ydfu35tzvg0G1/JK5/zUAoYBAjOfGfrux+UBP P1wEHBi68OuyFzVaUytg9xLTQ2GTsZedoFahpR2HyXJCEu7TR+Q3fAjaXI6/dAC63Bap rqtS45N/Oxc74vriIN+Rs/yQhYXMeYM2hWp+oKx6YbaHvvs6P6tDEKICP96Gh12IyP2E LIAJDoJTJe1mm1wS2vKdXO3xQ/Os4Y4bNQrI6cQtjCw4yFuRyjbzW5MTGlJ4EGIZ5/ED nduw== 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:references:in-reply-to :message-id:date:to:from:delivered-to; bh=EmKMjLHl9tnBK5msa8AQdqQd87jgyrVj5RhL5zthnwM=; b=jT0X7WkVI73N1uFp6vJaCBMPvwWKQlKAkktoLioHxf+6BW3dsVpuCO4fYfXYlo1rja V2FbsE1Wk5V85NPF0ANSwc6DCR85DuTU841CqoxOIeXPykB+fsQJWhaRg07ND0epC+G7 pF1XOS4eJPYoJm7LA4bPl9ua/CyKAy7cDSGpMVh15wJSI8ab3QHDjFdk3fePQE83pOXa vSzIFcq/h8X8CED/lmjXrEJrXQikDIi3pJO/f5WS84s0hlbvmKVRkk5KNzF0uPkA7q3q R4e0f3e+BeAgZz03obS5PPwpS2DhnEKq8/mrUV9lTTLygVH/vImGO7qix0uVWbGA1ivu u4DQ== ARC-Authentication-Results: i=1; mx.google.com; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id s5si6060227edd.286.2021.11.17.20.11.19; Wed, 17 Nov 2021 20:11:19 -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; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3A38868AE3F; Thu, 18 Nov 2021 06:10:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 73B8F68AE3F for ; Thu, 18 Nov 2021 06:10:43 +0200 (EET) X-IronPort-AV: E=McAfee;i="6200,9189,10171"; a="220991795" X-IronPort-AV: E=Sophos;i="5.87,243,1631602800"; d="scan'208";a="220991795" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Nov 2021 20:10:41 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.87,243,1631602800"; d="scan'208";a="455154637" Received: from trinity.sh.intel.com ([10.239.159.156]) by orsmga006.jf.intel.com with ESMTP; 17 Nov 2021 20:10:40 -0800 From: Xu Guangxin To: ffmpeg-devel@ffmpeg.org Date: Thu, 18 Nov 2021 12:05:49 +0800 Message-Id: <20211118040549.3871537-4-guangxin.xu@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211118040549.3871537-1-guangxin.xu@intel.com> References: <20211118040549.3871537-1-guangxin.xu@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4] avcodec: vaapi_decode, do not set initial_pool_size if driver supports frame pool resizing 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: Xu Guangxin Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: AApurdyYl+1v Two benifites of this commit: 1. Save memory. If we play an 8k hevc, previous code we allocate 50M * 20(1 + 16 + 3) = 1G memory. 4 may enough for most of playback usecases. 16 is a waste. 2. Allow downstream cache more frames. A downstream lookahead encoder will cache some frames. 20 may not enough for it. This commit will fix the following command ffmpeg -hwaccel vaapi -hwaccel_output_format vaapi -i 100frames.264 -vf reverse -an -f null - --- libavcodec/vaapi_decode.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/libavcodec/vaapi_decode.c b/libavcodec/vaapi_decode.c index 665af370ed..177949c36d 100644 --- a/libavcodec/vaapi_decode.c +++ b/libavcodec/vaapi_decode.c @@ -572,22 +572,24 @@ static int vaapi_decode_make_config(AVCodecContext *avctx, if (err < 0) goto fail; - frames->initial_pool_size = 1; - // Add per-codec number of surfaces used for storing reference frames. - switch (avctx->codec_id) { - case AV_CODEC_ID_H264: - case AV_CODEC_ID_HEVC: - case AV_CODEC_ID_AV1: - frames->initial_pool_size += 16; - break; - case AV_CODEC_ID_VP9: - frames->initial_pool_size += 8; - break; - case AV_CODEC_ID_VP8: - frames->initial_pool_size += 3; - break; - default: - frames->initial_pool_size += 2; + if (hwctx->driver_quirks & AV_VAAPI_DRIVER_QUIRK_FRAME_POOL_RESIZING) { + frames->initial_pool_size = 1; + // Add per-codec number of surfaces used for storing reference frames. + switch (avctx->codec_id) { + case AV_CODEC_ID_H264: + case AV_CODEC_ID_HEVC: + case AV_CODEC_ID_AV1: + frames->initial_pool_size += 16; + break; + case AV_CODEC_ID_VP9: + frames->initial_pool_size += 8; + break; + case AV_CODEC_ID_VP8: + frames->initial_pool_size += 3; + break; + default: + frames->initial_pool_size += 2; + } } }