From patchwork Wed Dec 20 07:10:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 45255 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5184:b0:194:e134:edd4 with SMTP id j4csp44052pzf; Tue, 19 Dec 2023 23:12:45 -0800 (PST) X-Google-Smtp-Source: AGHT+IEmwu52KMt5KxOr5/C3+fh09wDlxFmoL9icbY7TElNt086eQZs0juNsUaT0gHuYj7cYEIhn X-Received: by 2002:a17:906:18b1:b0:a23:2801:4c54 with SMTP id c17-20020a17090618b100b00a2328014c54mr1416343ejf.298.1703056365400; Tue, 19 Dec 2023 23:12:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703056365; cv=none; d=google.com; s=arc-20160816; b=vPrFI9zEaOIinE3DN7BlnE0Lb8EabTJtgDQ3C8bn730UOjuSa13HfqKm/BFq4Z9GVS 2STRxEeBCQfXobZiTam8Hr6DC8Rm6uyCeJegWlUVX9bqaiRRcjFv+XRM0NEmwbdiu4zs DLZFX7d2QUZ/aS94Ghy+CNbLlw9RflTS7NnJVxaiUfMIhFfbDPbRFuer/M0NPFSSznPG cZdwh9aZsq2tAezrxMA1IRVstgDMBb5Uc4jFO9WpAEddjj5/1Uw7Bb/5rd4e1VV6Murq kULAlJICGIoPlIPsVwx3MdokveXev8GoLQKlLCYeKXY4z8+yfuOhiy079K9SwhotrA7j BekQ== 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=ZQOBcItivTFzxa6oqarbqtHgEieAPdyD6npX4CsOwHM=; fh=1kpmTRI1sW42eNCnNMby7VLIISQBX6KJuVYxOEG0t2A=; b=gZb+EcevTYEWCJxr5ttJcRjq8LWPB0Nw5aTrfJ7NZPvG84+JzbZCkocFvR6TouFFyQ 5AalYXKsk9A2F8LESereQY4lR9fzVRYVdmYcsOo77O5PMBnEpvjSGbxEXPCyJNYxboQt 3N7Xv2yIHWC3Q9rI5Cqopl0D5ZmbWJRiysD31D+A3LJaOp41drk2bXtn1ViXsnGTyqcR 19y1To79UZWU+uk5kf3zqMtlbPS3SwZgDuDeYjFmeDe1mrUtl+hyRv+0DdNEQDvZaMPL 8rfz5Od0Ny8KlPwbTW2zDRZ17ad811QkqiJBHEb7OCpW5PKaDe0uKS+CizaR/kWvf+hl LahA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=gjxX0RV0; 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 r2-20020a170906550200b00a233cdf0627si3140857ejp.527.2023.12.19.23.12.45; Tue, 19 Dec 2023 23:12:45 -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; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=gjxX0RV0; 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 7FF3C68D1DA; Wed, 20 Dec 2023 09:11:32 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.88]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BC66068D1A3 for ; Wed, 20 Dec 2023 09:11:26 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1703056286; x=1734592286; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=z5pc/UPRhf5r4nOWIynzt9pzs0wHPvsZ1KOKtOFdI1E=; b=gjxX0RV0JsGztHTK+H3P8slNpFzUQZ7H4zIo7NVpU/SFhvvLpSw3T3SI zZkSOckHepCLpPdphwYE1TiNn52y+gUDwKcRal/DYlfbWYmhK4VYwwKhk aDGdTP+QH8XKG3NH372xmq/HHxCjqS3eVK32+sYMbXLQEewn9JVi563KW eZjQdevGdWF1+NpnB48XBYofgNz8fp8kf/DIqSppcqLozUl+jNyl5w4WV bdcMkg/N+U2QMu0kUETQmgV9WOqSNxJ9WBj0hwQs3aIbwfFfB8jk3F2YQ QGVBOC1qChgmqxbtYktsJSQDuHBOf2G6srfwnljnPvmOD4ufgDA8kSFEf A==; X-IronPort-AV: E=McAfee;i="6600,9927,10929"; a="426921057" X-IronPort-AV: E=Sophos;i="6.04,290,1695711600"; d="scan'208";a="426921057" 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:20 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.04,290,1695711600"; d="scan'208";a="18191923" 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:19 -0800 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Wed, 20 Dec 2023 15:10:49 +0800 Message-Id: <20231220071050.3175819-11-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 11/12] 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: 2GBu+bHl/xdJ 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 ceac769c52..8cc29e96f9 100644 --- a/libavcodec/vaapi_decode.c +++ b/libavcodec/vaapi_decode.c @@ -601,22 +601,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; + } } }