From patchwork Thu Mar 28 02:17:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 47566 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp1031036pzb; Wed, 27 Mar 2024 19:17:47 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXNyR40w2KIbcLRRoTsGt+Clfzzdt/CcJFcCZ7rtSLH0vuw9XHeHP7ZOX2Jt7dZqnuLP/hlHMOzLfnfhQ2Eh/z7cmN0DM6vBzjeow== X-Google-Smtp-Source: AGHT+IGw/u0YnN+l6qeZ6oAfxvctUVKWpVPpmGO3tJXzNL4CVoJ7pgoW6n6ZUf+S33XOVceRfPpC X-Received: by 2002:a19:4303:0:b0:515:c190:140f with SMTP id q3-20020a194303000000b00515c190140fmr689920lfa.14.1711592267181; Wed, 27 Mar 2024 19:17:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711592267; cv=none; d=google.com; s=arc-20160816; b=OfA8u3e3yfBw54XWh+tTd0ZFRaLKGwITty4IWh8+RXs+XrhtAZQczUQNPzlBdwY1ug eI2p7e3Z4jjmVp3HdaCqiwG4jxs9dQCiFYR2EoNdE33KuA0vi5h5FIrj5oszdWg5FWsl d7CBhd7b1ivIepSHkc7kSqQaM2TFDP5INk74mRcpd7kBpuEdJ+/um5A5AU3UsxzS2rzv toXYC0sqNB1wPrjD37NSxYApyOpDaS5KobgJ9iqqBYl83M7OnCha5C1hFOqqxE6Tckn5 dvUlfEXG06XAnKGT+mttq+eWXl6q4AI4B3PW3QgNkaPwrlAmsp/2F8LSDJ7KnBxaQUFL bdOg== 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=7ucZUB0smPiPw/d34gdIo/TBJVzrDMSzPNJ5tBUCIIc=; fh=1kpmTRI1sW42eNCnNMby7VLIISQBX6KJuVYxOEG0t2A=; b=wk2TlBS0JgSJuTNOeloMKPb3PrXbtPTnIfgOCL/npAZPs42dHVb3JaR8wQ9YHFGjbj QUbX9GGftgeuvWGR3/YuT7KlNzRut/WvLirPwjqdKZiEGZ+JYSDAx/rH6+DdRwIq1LNl CtA5B02XEqemBLfJTnyHrtsg44v423o9fqxOs1+CeNQRqkR+AoIZXtYIHt+nIGm5zDzw 1NL0hD4KIcMT5vXrqM3iBhYKve4zDBnq3Gob8bdpZ9Wj5Hv8ftTcjaDuKLfIM7jdwWKE vOrJqkyE/4vGpPMzc3z2/iqV4XBzIbsL2+ra0memxA192AB5y8KN0mPznBni8rQBS6/O 0bqg==; 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="m/Lwb01w"; 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 m19-20020a170906235300b00a4df7996a3esi180983eja.461.2024.03.27.19.17.46; Wed, 27 Mar 2024 19:17:47 -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="m/Lwb01w"; 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 2B29368D701; Thu, 28 Mar 2024 04:17:40 +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 80E8D68ADF1 for ; Thu, 28 Mar 2024 04:17:32 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1711592258; x=1743128258; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Gf+LjjYkfhm8KDovFlpjb6bMK0XPbiAV4VhyrQs7FGY=; b=m/Lwb01wOz/G1opwZ19PTQTh3g4AAJwWsBK3HJjCy3aQvQtcwggcNjaD gqOMEJamStuxrE60kGTUVn3zu/zu9xjKTaJOOrRnenLyTQ9+rLdpy/Arp qGFEPKSjymi4R+U4nurgofBQEsoGS3ReWSbtsIMfHjzIEymAaBI5/2iYa CUZ+p75woBUvhXIClXwDl5ydQUJjSWybVSrcoyzgvfxVgPr9guaUrM8wg f1l9G/Tv3n2peXw5kMTOnCAwHV1QlxNcHsjSK1ji5erBJBYfqKtLcIPdl n6ClfNi9UR3D2GitIgaNYcy+2w3IPKJM4/XxKUeh7cSFw+NzVzVmrsiZD g==; X-CSE-ConnectionGUID: Kxb8g1eoRMuGP77qgB7zfw== X-CSE-MsgGUID: SeLfwg1QSn+OTnY6ZRWP+A== X-IronPort-AV: E=McAfee;i="6600,9927,11026"; a="6664785" X-IronPort-AV: E=Sophos;i="6.07,160,1708416000"; d="scan'208";a="6664785" 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:30 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,160,1708416000"; d="scan'208";a="16890300" 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:28 -0700 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Thu, 28 Mar 2024 10:17:16 +0800 Message-Id: <20240328021717.4116418-2-haihao.xiang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240328021717.4116418-1-haihao.xiang@intel.com> References: <20240328021717.4116418-1-haihao.xiang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] lavc/vaapi_decode: Use dynamic frame pool if possible 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: 36G/pbQLv3My From: Haihao Xiang This allows a downstream element stores more frames from VAAPI decoders and fixes the broke cases for the driver/hardware combination which doesn't rely on fixed surface-array. For example: $ ffmpeg -hwaccel vaapi -hwaccel_output_format vaapi \ -i input.mp4 -c:v hevc_vaapi -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 cca94b5336..c690e25342 100644 --- a/libavcodec/vaapi_decode.c +++ b/libavcodec/vaapi_decode.c @@ -598,22 +598,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 (hwctx->driver_quirks & AV_VAAPI_DRIVER_QUIRK_DYNAMIC_SURFACE_POOL) + 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; + } } }