From patchwork Wed Sep 6 06:00:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 43586 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4f16:b0:149:dfde:5c0a with SMTP id gi22csp2311313pzb; Tue, 5 Sep 2023 23:02:51 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGpPVXcqJ0aw1QGPCMca/PtZcukfuIG/D0wVK5KZLb3gjgL/gngJX0nbpQZU1NCkebjBTpW X-Received: by 2002:a17:906:1d5:b0:9a1:649b:46f9 with SMTP id 21-20020a17090601d500b009a1649b46f9mr1230768ejj.74.1693980171392; Tue, 05 Sep 2023 23:02:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693980171; cv=none; d=google.com; s=arc-20160816; b=bsNy4e6qxnJlUt+ZEB7Zd/qLfYm2bh5NkZCj1FahsKFyGA7x1Euj2NSW7yHf4iONf3 ALQAwyzDF4bnJ5iO2U8/Kw2ZAfKbsFIFY+Y0BMpDEjMnqNvz2ln0eTKa+XSLQJ9JfpWU VBpy0ETjtZT5ULXPGh19eHLnxhCIMiM7v5Ul+ZF5ZawDWTw0f4H3dwJsUa8Coau75IZd GnETGBeGnedY8rICBslXcQlS+r4bjtogu6cogrskmFviv2OIXvtz4Sw5q7YLq58In4ZF Y/JpruDhjNQIPODGJcsyJvj6Emq/tofF75YJq5QRdwYHqFJTUgbDluP4FPXahIlGwnfU /xWQ== 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:dkim-signature:delivered-to; bh=ZC3IYuyJGYGL8DDnqqiQo9scgOgAC135pHjHU2P82dg=; fh=1kpmTRI1sW42eNCnNMby7VLIISQBX6KJuVYxOEG0t2A=; b=YBaMGiGkFJfir/SmKxXC1uUXBTo5DklT3W+FJiuxq5ZzSxHYgT3TaGW0YVwXdfvwus zcCghvOSshVK6RqLW96yLjdZv+NCvSuqDVLgPE9tvHCb+H/WNjullPcvkjUHH6lBMAtS 29iREKaezDcyLVecirsw0sywcvMopRzVg7UppjmwZ9FUAF1QdhsD5xezT4mlBi9nOsk7 W6x0g6f3K0MqRaoewu5YEy8E8G+rN8xt2OQAq39TN16og4nh1tELANuo/OJnR9zAXhK/ zQjcQ3PETh+WB4ISu59O8DiH5V/XkpoZ3TOdS6QTzHV1DnN/hnnmApEknfte8KHh/QKr 1OqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=JBu2XPew; 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 d1-20020aa7d5c1000000b0052a4165d083si8275040eds.463.2023.09.05.23.02.50; Tue, 05 Sep 2023 23:02:51 -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=JBu2XPew; 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 7ECEC68C870; Wed, 6 Sep 2023 09:01:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 73AC068C7E6 for ; Wed, 6 Sep 2023 09:01:32 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1693980092; x=1725516092; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=DGB9mNccMukIrSG378sNoXOK91rc700JfHTcIN/StUM=; b=JBu2XPewZkRzV4mHZn8XH/zlmd/UTe/Pp3nMvgdKGNIG9S0j0iUY9YLO cm4Ce0Hg2yTE6W6IOlsA1LBUw9GAmZTYEtxRqHAPQbv4xk5P1EL6u6dYO ibq2IRll5+3vJjRWYSouQzdcBtTlPtXYv/e+u52EM/qGWZcJPrL6HM4QA GUal1JWjlgK0idOsoQzGmzpR0Hn8hSJWhLnBjyeilQFbxF3fUAtCFZzb6 7Og86hlm7VpHMVben6C0wyP5wfolcYa3J1Y3o4s5GPZeXYDQICopL4jEu xFjFI8/GJjrcY3iOwzpm+wnbJsCQTVnNmhjXwNGNhDQMdGZMqPQzF1Lm0 g==; X-IronPort-AV: E=McAfee;i="6600,9927,10824"; a="374372462" X-IronPort-AV: E=Sophos;i="6.02,231,1688454000"; d="scan'208";a="374372462" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Sep 2023 23:01:29 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10824"; a="734919089" X-IronPort-AV: E=Sophos;i="6.02,231,1688454000"; d="scan'208";a="734919089" Received: from xhh-dg264.sh.intel.com ([10.238.2.76]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Sep 2023 23:01:22 -0700 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Wed, 6 Sep 2023 14:00:51 +0800 Message-Id: <20230906060052.698620-12-haihao.xiang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230906060052.698620-1-haihao.xiang@intel.com> References: <20230906060052.698620-1-haihao.xiang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 12/13] lavc/vaapi_decode: use dynamic frame pool for output frames with libva2 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: y1soLn1jN2K/ From: Haihao Xiang This allows a downstream element stores more frames from VAAPI decoders and fixes error in get_buffer() $ ffmpeg -hwaccel vaapi -hwaccel_output_format vaapi -i input_100frames.mp4 \ -vf reverse -an -f null - ... [h264 @ 0x557a075a1400] get_buffer() failed [h264 @ 0x557a075a1400] thread_get_buffer() failed [h264 @ 0x557a075a1400] decode_slice_header error [h264 @ 0x557a075a1400] no frame! Signed-off-by: Haihao Xiang --- libavcodec/vaapi_decode.c | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/libavcodec/vaapi_decode.c b/libavcodec/vaapi_decode.c index dd55cbd6f1..c0a52c1d41 100644 --- a/libavcodec/vaapi_decode.c +++ b/libavcodec/vaapi_decode.c @@ -600,22 +600,26 @@ 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 (CONFIG_VAAPI_1) + frames->initial_pool_size = 0; + else { + 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; + } } }