From patchwork Wed Apr 3 19:45:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 47769 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp622666pzb; Wed, 3 Apr 2024 12:45:22 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXNp+p4z3k4XvA/LtlNVK8zX/0zOBqe1mbV9SkxEQWa/sNGfgBULuws451FfepYO/H1IimFQ+IrbRds6apPrnR+5DkcTLDt5zrjsA== X-Google-Smtp-Source: AGHT+IFaE7sSjzwW4gzQ23JCrE6++u2R0Y8R6EgjLZ9nsSkySY12cNAPlzJcJl19ZYEvkmCpvwfs X-Received: by 2002:a17:906:c291:b0:a47:3469:d75a with SMTP id r17-20020a170906c29100b00a473469d75amr168584ejz.67.1712173522560; Wed, 03 Apr 2024 12:45:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712173522; cv=none; d=google.com; s=arc-20160816; b=VOcW4bjuPdCtZnDWHC8fXhmlCvQm95+zHrrM/yCzPZB50Nd3yukmZAVbeF19jsECjH ZfhZDxauM05sQ93KrPna9HAMxKL8utzP+jn4w28fIESx2Neg+69VZFyl0vQ+Ns2ZiZ1J wL04mzU1wRCnU419NKcaA/nUujiDSOBmnEIFg9wzYStbrs1W9l7BTW1Za2gIRI47LCcT vchWBXfYdmZmEJSIx+YHLG9eHa0jo4/0RS1O2Y1EoZqLWYx7bXOloHqjbNXn6hwC6ENP p0wSwGBlRHL80wWUaooihwXGtjM/IV77wYRt2xcRSA3QXIk/zWlahrB6y+0NWhR8E+t8 3LmQ== 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=mNKZTZ+Fp1BoXF/bgabgBr1pGGj4rRon1atHO5/99CY=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=XOxQcHaX+QoCaQwHdZjt0GwjZJc24KNvLQHd3ckAWryzG3Zwl/i9dhXCLKEgnzY0y2 i5DAWcd/ToVbZg6W/okEO9MMoeW6C2njvqhj4P68I6y2dY3jcz5GqqYDfFD77GcOq6Y+ +yMnIRleddEJLo7cJNWLiyMCNqaMCJsVqCA9Fe9HcfMWPbqbtGQiRvIYB7vmEXGbXCDQ oSUQ6SB+K8tqYjLQdcdd5NFR0eeAPJ2n5wfWuduZTKISGvx5lzkKKerE9bq6cmgmTqVX 2zzBvU5jLdI9bUTt8PsxWGEhCTPViaDkvmMtdXmkdnxEuMO03HRDb2bvZQWJcMNoDtne 4Jcw==; 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=qKKOlz2D; 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 dt2-20020a170906b78200b00a47100a7144si7384123ejb.199.2024.04.03.12.45.22; Wed, 03 Apr 2024 12:45:22 -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=qKKOlz2D; 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 2C50768D13A; Wed, 3 Apr 2024 22:45:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8CBF668D13A for ; Wed, 3 Apr 2024 22:45:12 +0300 (EEST) Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-41628d9ca8dso690045e9.0 for ; Wed, 03 Apr 2024 12:45:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20230601.gappssmtp.com; s=20230601; t=1712173512; x=1712778312; 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=eAhEpkUGZ2oRS2AeAIe1D2+1g77s28McMcr+NvIloX0=; b=qKKOlz2DI3DTJD8hIuH85SytA8aWsiZxHe1cxhVOB3jchUJmu52Kb9hNfqifPIZR+f MCua5z/R05z6mB910rk0YY+xrrCfx6Lj4IJYDRbSAPGrJnCqhBoX9/t16W6Guw2AQwCM 15RoYd6BBiqUOuPxgfVH8s/iBtlqeAdPDxeSByfIuArhj6KicYecpcCsksPPnxkSEvQl otsPKU7N5yIbJP10bOm94pdtsfSR8mEgxA3GA0JKd7+Rtm2V5zNGnhYaFxv0o/wj6fQl iUmZPIwSEKoiaSWeWLOuRpcnN/BQcvu8g8oUZnxhai4epjSPXt6O/Y03t6KlhTJLYFKf +8xA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712173512; x=1712778312; 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=eAhEpkUGZ2oRS2AeAIe1D2+1g77s28McMcr+NvIloX0=; b=TaiyuUo3ziDWVH6Jptu/WZ4jJVZaILHlpSLvYc3WrvR6dVDC1T2oSMF1zlbtMZhMWR voOkJzG686co1WU1uo78x4iCa7bdYfqbZhr3hJJx/KyX0xVV0pu2oABRjlj0pMDunCb3 i0D04iMTmJzLj9kOuf9w55iGXohylU4rMuWNJWbgxAaqzoJXjAN6JZfOe4xt9oT28q7n OlaYCcf2+oRqRxg7sn5fVfweC1fCbHv+8qN2obvFuNenv9AqhVvGWZtOp2oj/J713yuk jWihhH75rhnObS8OCpWO9l+tGT4HHg9c7vnhuhPwunqEFiINsYCD9O+mPXTITJWGeFyo 6BAw== X-Gm-Message-State: AOJu0YyEVzB8xZFHMoZv2jLMPXXAEytILDz2uyyTRuGbfrEnPvk5ciAg FJn6uvcWX5gGarR+kHukZ0IvCcrwHxv/6L3g8f4z3iHTRInNsPenoK6zJFgXz4KVRfk9oLIo1u6 e X-Received: by 2002:adf:fec4:0:b0:343:69b4:b527 with SMTP id q4-20020adffec4000000b0034369b4b527mr340910wrs.18.1712173511956; Wed, 03 Apr 2024 12:45:11 -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 f10-20020a0560001b0a00b00341dbb4a3a7sm17931399wrz.86.2024.04.03.12.45.11 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 03 Apr 2024 12:45:11 -0700 (PDT) Message-ID: <781ade9e-ae1d-4b2d-9900-169bd02996d2@jkqxz.net> Date: Wed, 3 Apr 2024 20:45:38 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US From: Mark Thompson To: FFmpeg development discussions and patches References: <15056f44-06c8-40a1-bb78-db3e66b2ee86@jkqxz.net> In-Reply-To: <15056f44-06c8-40a1-bb78-db3e66b2ee86@jkqxz.net> Subject: [FFmpeg-devel] [PATCH 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: 1xcG+rddCiNm libva 2.0 was released in 2017 and the 2.x versions are included in all supported distributions nowadays. --- 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. } }