From patchwork Mon Apr 22 21:43:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 48230 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:2d06:b0:1a9:af23:56c1 with SMTP id tw6csp41179pzb; Mon, 22 Apr 2024 14:43:11 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXmQlHQDxlq0KKhaxHYod7KM8UJPwG0S/0yDIzRNyInKpfPK7RC9KvYUSRqjjGgUOkt++uvyDrpzvytL0AXP6zEXah0KqXDmd8B2g== X-Google-Smtp-Source: AGHT+IETcXZesfCmuucU/cViSOTXNONOFMbpqHth0G6E0DAvpTZtMWJ/ElM2e8rQAxc6qVW0ODyw X-Received: by 2002:a17:906:6092:b0:a52:387b:8391 with SMTP id t18-20020a170906609200b00a52387b8391mr6539458ejj.34.1713822191085; Mon, 22 Apr 2024 14:43:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713822191; cv=none; d=google.com; s=arc-20160816; b=X9kq/30IN2ZUoknnyK3R4ZMJGU5CscmRrxcvju2VP/OeETTETXhR2eY7GFUZ8Q28/a i4fEUI2v452dZoG4Twh0kP/dkPtRzuJlvLL1Ybu6XH9gmv/WldkupNMmasOywuBGXOv6 2fSlD98YCAXd/+MVQ8RNS6pRoQlv4nJxf2kT8i6OaeLUTSVkzLOyv9Q3AKC7sOF4TMwX Dhru+CFW7p3FbaNcCLVj0mzcsLZLDVjiApq+mhNCC5J7Rk61e8dwjmtkzpuyqBA3hYVu icVv2LIlm8yWqSG0AW1MpxYHNpptI7TOD9aNJX5IxwmaKZsgRyH6Holp369t0P5/nbl9 SQsQ== 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=syfUnRCKYXU20sgBIWDeuaFpnpEGR6Mz91wz/lHoLJg=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=M3MngmhVv3ycodPRKz6hAEMpHUnt4wki3RAPbF/njOn6TQMd5nQMKoen3uRmsADi7V oGPDC8oMvTTrinFt627HVGyWAgM8m951tdUK34ZL02fiy7NXRMEGwioAI+lRjHcOj82k VEb5ToBp4rCKKDCbhH+zUvxqM3tDsneps+Eu2qt44w3jSfAw1QzTo6ydFLXY4xcKHDxd 9uSntjjmVRrqr/oPZAm06GqT3S9rghwtsXr4kqCjSV93DpYAd67wFwu+s66NjLkXMQoj cIYDEHfiC09hzGXgR9EBFNHKmO7IFzNHkrKlMeqXg3VwLT08uhLtMHCJNym8hkaUzn92 pI/A==; 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=veH+HAw1; 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 q12-20020a170906388c00b00a523a9237basi6305439ejd.191.2024.04.22.14.43.10; Mon, 22 Apr 2024 14:43:11 -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=veH+HAw1; 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 E6C2468D388; Tue, 23 Apr 2024 00:43:08 +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 8DDF968D210 for ; Tue, 23 Apr 2024 00:43:02 +0300 (EEST) Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-41a5b68ed0aso9892175e9.2 for ; Mon, 22 Apr 2024 14:43:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20230601.gappssmtp.com; s=20230601; t=1713822182; x=1714426982; 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=mI5xYEW5LaTdIng9lN6bNectBJZjk13Dq/omQbSXCaY=; b=veH+HAw1WNv8UJnBHNQi17CBEeqAQ9ua3BfsZ1h1QrKnT1yd2ls/oCmJnyHRCSNqtG UNeBDEi+sGX6ckMxeLzWTseDMaj6CTQ87WDSceEORWsgRkKqii6ymgfnUN4dEOQ7G8fp V1wN5y/UMmNdI9WqpGcyTz06v7lOCBXHJCI0vsYS8T4xN0l3BytUvf1fBCnYwBdhFpPY yIaQGlquiOVSaZ9I33cNMYQO19kpS/JyGvjHXfSAMeuwRUW63j16cMOh0effzY1MTrwF 89W8OCSBii2wijjL9vEjuL9M1RmYDSMOtMfENk2mJEouEek7Qcmzpy4ZRzinS0+nbVuA EcFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713822182; x=1714426982; 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=mI5xYEW5LaTdIng9lN6bNectBJZjk13Dq/omQbSXCaY=; b=bPqSJydWl9TUYffHARfeL8TTe4qfSa6GeokKWlNxMNaP26k52gMdq+1LCfL5tfH5ua 6DtdPVytKJTtEMLIfH/G+jbnoBgKXu9FupcmiJjZ4kPSwDHe1eom+8Kq9ktwrbzspMnY fUWzEEL3qM3/itkF6VqIGqxp1rth2bafYwxxyugeYSvUQizI8xiKslIdC2aXPzY3tKc4 0Bu1plbTTCi7ySc9gmEGWKmaThBxVtqmL+G5vTTYTaF27cAJFvS5/bJQVn2BCUd1yKsl jSmHnMunN5QzmCtSD3vTJlkXmAdXYl6lq+h75fKFKlznbepaQJ9fd8I5/4v/ISAZ5bFu A0WA== X-Gm-Message-State: AOJu0YwCn9nURCMXYLlDI6rF18kw8b3G7zpNHrWqaz3gcapJCivw24k2 XbKQgh8WogNyRn8rcDI3p28ddabEFSqWihvJ1IHhFUr2mq9yIU1OE6Q7ao8z4vG/WpL7rGNFUL2 w X-Received: by 2002:a5d:6a48:0:b0:347:9c4d:4e19 with SMTP id t8-20020a5d6a48000000b003479c4d4e19mr5785746wrw.70.1713822181874; Mon, 22 Apr 2024 14:43:01 -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 r26-20020adfa15a000000b0034b6d40ecdbsm141771wrr.48.2024.04.22.14.43.01 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 22 Apr 2024 14:43:01 -0700 (PDT) Message-ID: <7d3e5c79-127d-4f6e-95b5-a628ef713084@jkqxz.net> Date: Mon, 22 Apr 2024 22:43:26 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US From: Mark Thompson To: FFmpeg development discussions and patches References: In-Reply-To: Subject: [FFmpeg-devel] [PATCH v3 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: 8oG3MkFfOzFG libva 2.0 was released in 2017 and the 2.x versions are included in all supported distributions nowadays. --- Rebase on the dynamic pool change. libavfilter/vaapi_vpp.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/libavfilter/vaapi_vpp.c b/libavfilter/vaapi_vpp.c index 9ef7a289fb..fe14170fee 100644 --- a/libavfilter/vaapi_vpp.c +++ b/libavfilter/vaapi_vpp.c @@ -204,12 +204,9 @@ int ff_vaapi_vpp_config_output(AVFilterLink *outlink) output_frames->width = ctx->output_width; output_frames->height = ctx->output_height; - if (CONFIG_VAAPI_1) - output_frames->initial_pool_size = 0; - else - output_frames->initial_pool_size = 4; + output_frames->initial_pool_size = 0; - err = ff_filter_init_hw_frames(avctx, outlink, 10); + err = ff_filter_init_hw_frames(avctx, outlink, 0); if (err < 0) goto fail; @@ -677,15 +674,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. } }