From patchwork Wed Apr 3 22:10:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 47774 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp691670pzb; Wed, 3 Apr 2024 15:10:02 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX8uR8lOAz2xxhA89n6r7LG9ky/2mJqkv2f1DQvHvc/cNBP0gGPYFZBpABf8fOYFG4Dwo1WDcmdtrgFKjtoxWhcLUjZYPHrdJkh2Q== X-Google-Smtp-Source: AGHT+IGh1e1xRT0V5hfALb9Dm1Up53SqyPrhXYTvuFQkw+qfCbZ58j3K8CLwWzEs71v5WMonAOwn X-Received: by 2002:a2e:301a:0:b0:2d4:7f17:185d with SMTP id w26-20020a2e301a000000b002d47f17185dmr607297ljw.0.1712182202433; Wed, 03 Apr 2024 15:10:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712182202; cv=none; d=google.com; s=arc-20160816; b=Uva0prQO83RWSFvuM6sP7C8cqHyin/N3tj9um7QHMe1Ufx8Aind8V3mhvGASIgt0/K fJacsAuWGsuzJseKznob7Ev0Y3I6QrO+lcZMA9z2lXFzo939bc1HnbWzNryACOMk++Ps pukmq7YrTYp1Dxd1nQXLTFnf2nyKbWqdI/H+QPPcNBfeT9UZ/oAR2I0B7sJzC2p3A9c6 DScjSdIXGQcCsSIlMRWky/W0bNp0YfLoSVk3TQqs247gFmgh15Z/I3G/mrzIhLEhTfgW IAm/NCjthK/qI2LNFiMIuBuvLLx0tNvqw3z2OWIIaXFtRVbmTOqjI5oAKG6/1nUGTMSI 1Rmw== 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:in-reply-to:references:to:from:content-language :user-agent:mime-version:date:message-id:dkim-signature:delivered-to; bh=UwNrEFqEnJEW8nzo7sT28AvmfovV8f5Vr6IHFeRA9ak=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=cR8mA6+WwAqcbY/4feQOUMXN3sUgWJ/inu1tOfbLah7cjOjraTfssiRhyIvcus2RBO J50ZAImomr2bCSXwpWssDhyX6WXfrIdagePweJ8M4hjz+tOmsJN+6RGVWx7UZSZ9R6jb lTSJwm9InefwxxGXZmcoVA2Hh4fdWBmqxBbgpUFcMbag8k2DWDY3AR5XlP68GIy5BSJ0 vQ7ngJdImf5KChQWawIzTkk7J0ILEjL86Mx12KULFawiOiloTa98tzwJ3BA1T3lNhz2y koUQq3Ae+4dYOzPUsFjdfLDRxxr8MOg0AyGM1rq1AaN3bA0UuGfVjDTYcTt/Ac6BMwaU aswQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20230601.gappssmtp.com header.s=20230601 header.b=Ss0I2ZRY; 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 d29-20020a50f69d000000b0056df788446fsi1718343edn.535.2024.04.03.15.10.01; Wed, 03 Apr 2024 15:10:02 -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=@jkqxz-net.20230601.gappssmtp.com header.s=20230601 header.b=Ss0I2ZRY; 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 E489468CFE3; Thu, 4 Apr 2024 01:09:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 204FE68C74E for ; Thu, 4 Apr 2024 01:09:54 +0300 (EEST) Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-4155819f710so2428035e9.2 for ; Wed, 03 Apr 2024 15:09:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20230601.gappssmtp.com; s=20230601; t=1712182193; x=1712786993; darn=ffmpeg.org; h=content-transfer-encoding:in-reply-to:references:to:from :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=xvTU//MWcTZDw/Aac1oV6s4KYEL8NBPs80dG+pEt9Kc=; b=Ss0I2ZRYg4w04pSTdrknOirbaMwPd9zuZiSqPVtyxV5LBampEnFVoVEhGR1dleszyP gJpTH9gi2bwY5JTOCMhFQLVoLuMD75jwLic+Y91ECN6gOORKL/uWw6xtz9J6t8e/wwKq Ir2k47v662cfdLvNSwnAz9/Gt94izr5fslxqzszPZXaejqymAftTUUxfFDpueBF6y17Q t6rLmpTnQ3DwWFeqRv35XWrBf2PkU9wlrqfXXq4fIkbRW9XEhOrEMqRdejQ5FIQHt0Qy wXtyfvDcQnb+D0f3gPlwhpVRCt/ZOWMKMXWEzFu/nYxPVzMFcybsFXGD2RCZbzLnfg57 E6XQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712182193; x=1712786993; h=content-transfer-encoding:in-reply-to:references:to:from :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=xvTU//MWcTZDw/Aac1oV6s4KYEL8NBPs80dG+pEt9Kc=; b=tV8Y+t6UKky6Tn4fFZsdjxe3qygioBdFK2fJwA22EELLeahIfSMfca/Bkzrl/ImXuK 8CiGjvFYQ/LwGQsuuTTWOBq/tXZx7uy8mjyO1KhwCO5/sK7ev0Hheu00Vqym+ls7GF7A qUdRzz6hyCEasZ/5fmZLGkNpjCXI/lmbJWWrcCutfqZ5QyWyrOXJbqSqFtZ1QZcxuut7 K24xhHKdu6QSFTm/WcoUlx1b1jsVS7js8Qg3aCnfqwAOrkF91XVLGqr6Uz1HmNrPafTy M+l9HDX3f36nJM31YqC8gx6xSn3mDOxQK4N1GFoUx5a5NHXkXx1VpcfdvpLWDd7Jyjnx 2dJQ== X-Gm-Message-State: AOJu0Yxb/DeEIEKA4jOSLJ0rdHHSFilJ1TDFJuAvKyH1o5OZ+p6KMKbp ZMhP+kfzGSAjvI775UQIGjEvhn9bKFcsNWdqz+AHXNFrkSkYEp9r1sqQTWLyzRiXj9vEHvU3Q2j N X-Received: by 2002:adf:a190:0:b0:343:72d2:dd6a with SMTP id u16-20020adfa190000000b0034372d2dd6amr562557wru.17.1712182193558; Wed, 03 Apr 2024 15:09:53 -0700 (PDT) Received: from [192.168.0.15] (cpc92302-cmbg19-2-0-cust1183.5-4.cable.virginm.net. [82.1.212.160]) by smtp.gmail.com with ESMTPSA id ck5-20020a5d5e85000000b0034349225fbcsm11099073wrb.114.2024.04.03.15.09.53 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 03 Apr 2024 15:09:53 -0700 (PDT) Message-ID: Date: Wed, 3 Apr 2024 23:10:20 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US From: Mark Thompson To: FFmpeg development discussions and patches References: <6708e86a-38e7-4ed7-a202-508b2ec9165f@jkqxz.net> In-Reply-To: <6708e86a-38e7-4ed7-a202-508b2ec9165f@jkqxz.net> Subject: [FFmpeg-devel] [PATCH v2 3/4] lavfi: Remove libva 1.x support 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: NdxoTMIRpKtP libva 2.0 was released in 2017 and the 2.x versions are included in all supported distributions nowadays. --- No change. libavfilter/vaapi_vpp.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/libavfilter/vaapi_vpp.c b/libavfilter/vaapi_vpp.c index ace1153a23..21d74f8112 100644 --- a/libavfilter/vaapi_vpp.c +++ b/libavfilter/vaapi_vpp.c @@ -672,15 +672,12 @@ int ff_vaapi_vpp_render_pictures(AVFilterContext *avctx, goto fail_after_render; } - if (CONFIG_VAAPI_1 || ctx->hwctx->driver_quirks & - AV_VAAPI_DRIVER_QUIRK_RENDER_PARAM_BUFFERS) { - for (int i = 0; i < cout && params_ids[i] != VA_INVALID_ID; i++) { - vas = vaDestroyBuffer(ctx->hwctx->display, params_ids[i]); - if (vas != VA_STATUS_SUCCESS) { - av_log(avctx, AV_LOG_ERROR, "Failed to free parameter buffer: " - "%d (%s).\n", vas, vaErrorStr(vas)); - // And ignore. - } + for (int i = 0; i < cout && params_ids[i] != VA_INVALID_ID; i++) { + vas = vaDestroyBuffer(ctx->hwctx->display, params_ids[i]); + if (vas != VA_STATUS_SUCCESS) { + av_log(avctx, AV_LOG_ERROR, "Failed to free parameter buffer: " + "%d (%s).\n", vas, vaErrorStr(vas)); + // And ignore. } }