From patchwork Fri Dec 10 05:38:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wenbin Chen X-Patchwork-Id: 32253 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp1348350iog; Thu, 9 Dec 2021 21:38:34 -0800 (PST) X-Google-Smtp-Source: ABdhPJxzFQEH0dAtmSIAdM3UN5gK5cMEkpXwuVQARYfc3xd6Fn78bB0QSYIH8TZ7ZioQVTa/0w63 X-Received: by 2002:a17:907:2d10:: with SMTP id gs16mr20455355ejc.353.1639114713741; Thu, 09 Dec 2021 21:38:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1639114713; cv=none; d=google.com; s=arc-20160816; b=jUyE1pbSk4yFRcObW/VB8jfmmdMgrZ8pttcH3NnzBG1keIcB/VhCeKJgNpdTvQgdDb T4mr7fHUkRdTbmplFz/wE/Az5MPS048dghYiRd1IAXO0G6OoTivOFEq00gRGGz6u29Tn RcfpL0htqMErdeI3khQTuzOKIpi+lZmWKKf1sStkTUcpFAg0a6zwg6z8AfU7t1MRmS28 9RWRGnppDGp3M/bI865dY8An5Q28jqqCM5+cDSjLykaoA6CgSDaTF9y5Ti/20VUQ1hUh QMNQwEMCzVZcOLUlp9eRIIzYXMRjqZZSbEx/PqEpwtsstiJWV6aei0dKo6MCc0+P6336 e3dg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=Bg2o7pCCTtYm3WYaKb2IoCXTAFdbdRv90XQI2Jj7jfU=; b=fBK4r146TF8KYj/SvAHrcw2XrznxSqodUvpngv6r1bgn3TYM3qJ5kDhn48w43/5rMi FbMjegvJtrLIK8iaGovtGHod/gM/5P6DbFo40bCNs710mt58THI6jemWPqJaAvZ9NrzG lR6knPdGvZiFoTb0outy4iB/dYr54M0WYRSoDqWNM3jTBJsCQ1QucE0UOm3EULJDVTT5 8gH4JIy+stpDaf2doqyHSAuThs2WTV6N4nYwpUTFtKnTid0o0mMaCzK62sLrLhsA5xYo HM8FY6uMDxewCVdJkR7QpxGNuHccVHpJ/yU+OUCU/mOggYJcE0OQdY7uTrkHOFMFjmPj w5QQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=mh2IbPbq; 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 z9si4041835edc.426.2021.12.09.21.38.32; Thu, 09 Dec 2021 21:38:33 -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=mh2IbPbq; 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 53E0568AD86; Fri, 10 Dec 2021 07:38:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7117668A59F for ; Fri, 10 Dec 2021 07:38:21 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1639114706; x=1670650706; h=from:to:subject:date:message-id:mime-version: content-transfer-encoding; bh=RzNg75RP5h4qCVvbQA5kGCoXWuoRaE+gBXWNlPmNQQU=; b=mh2IbPbqLz4r9q7lMK00HmSoIDesyFnC12KQs2JMRXPnVMEAsfQwxT56 W0j/960VCJva3B+/64nUsqTU7TClMycMl9zf5Ggo8fUWqiv/k1aOyYv76 ZF7wdgXkoJWkrZcymuLPcgzDE9KeJK1Wu/81szAotYx/JeH3MGyyY+rqT pmcyK8aqmhSVwPnDZK4tUcjVdq8TQKinZ2GS3Bsu8ydhNeybpso9rugto m5/sTBXuauEaQrssxEvd9lop6tJjFFYs+pzw/7GxFyvZ1n9+lZEaG0Y4/ RXRzOMkNaYWrGGhiZe01eQ5HPRea5UBwEPfCL7pp4Gpqq5fbq/DdJ6jMv w==; X-IronPort-AV: E=McAfee;i="6200,9189,10193"; a="218301976" X-IronPort-AV: E=Sophos;i="5.88,194,1635231600"; d="scan'208";a="218301976" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Dec 2021 21:38:19 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,194,1635231600"; d="scan'208";a="612811638" Received: from chenwenbin-z390-aorus-ultra.sh.intel.com ([10.239.35.110]) by orsmga004.jf.intel.com with ESMTP; 09 Dec 2021 21:38:18 -0800 From: Wenbin Chen To: ffmpeg-devel@ffmpeg.org Date: Fri, 10 Dec 2021 13:38:17 +0800 Message-Id: <20211210053818.3815652-1-wenbin.chen@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH V3 1/2] libavcodec/vaapi_decode: fix the problem that init_pool_size < nb_surface 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 4CKYRzgQt+K4 For vaapi if the init_pool_size is not zero, the pool size is fixed. This means max surfaces is init_pool_size, but when mapping vaapi frame to qsv frame, the init_pool_size < nb_surface. The cause is that vaapi_decode_make_config() config the init_pool_size and it is called twice. The first time is to init frame_context and the second time is to init codec. On the second time the init_pool_size is changed to original value so the init_pool_size is lower than the reall size because pool_size used to initialize frame_context need to plus thread_count and 3 (guarantee 4 base work surfaces). Now add code to make sure init_pool_size is only set once. Now the following commandline works: ffmpeg -hwaccel vaapi -hwaccel_device /dev/dri/renderD128 \ -hwaccel_output_format vaapi -i input.264 \ -vf "hwmap=derive_device=qsv,format=qsv" \ -c:v h264_qsv output.264 Signed-off-by: Wenbin Chen --- libavcodec/vaapi_decode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/vaapi_decode.c b/libavcodec/vaapi_decode.c index 665af370ed..da0e72b10b 100644 --- a/libavcodec/vaapi_decode.c +++ b/libavcodec/vaapi_decode.c @@ -650,7 +650,7 @@ int ff_vaapi_decode_init(AVCodecContext *avctx) ctx->hwctx = ctx->device->hwctx; err = vaapi_decode_make_config(avctx, ctx->frames->device_ref, - &ctx->va_config, avctx->hw_frames_ctx); + &ctx->va_config, NULL); if (err) goto fail;