From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 04E234A741 for ; Sun, 5 May 2024 19:01:49 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4DE1468D5AC; Sun, 5 May 2024 22:01:46 +0300 (EEST) Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6C04A68D56B for ; Sun, 5 May 2024 22:01:40 +0300 (EEST) Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-34c1fff534fso1105919f8f.1 for ; Sun, 05 May 2024 12:01:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20230601.gappssmtp.com; s=20230601; t=1714935699; x=1715540499; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=avQitjEy+CRJKNTBhujbXX6owPNgRz9SsRz/2didsvw=; b=BS5qVfg8vFnb+XlJ8zV0HwzmNPxyaLjBg6QgUXWfBBzRrzKtXIL6/l6STEvprX0WYD C//RggEXbwXv2tf6ckEwqPw62MIJm4BG7mcMmCQkrKiPrkJGl7RgeLfc9IyMt+RYDmZz mgfz1Z8zhNzZQEpYTT4q7WtLr5GwFjlj4SMg7p9Dibp6u6aTW4aHKkxtJ5aSq38ETbYj /IkXtnbCwZq7UiQM2oCVrHk2npdWr3O9ptYx6HjV1rrWVLeeYf64QHDASPjbTHxqKq5y ogr3+xa2jXIMDbu7OqHO71tM3P8l7dUe5p7o0r57rDUi5CRwOAof0uA9MlsKNZlu/My4 1LTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714935699; x=1715540499; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=avQitjEy+CRJKNTBhujbXX6owPNgRz9SsRz/2didsvw=; b=e3+E18vuNp5JsmX5n3WxWIrok+Ic80M9ayDe3tyfrXsu94k4ThJV7mtJ/z+EOpHFOS rFSbGPk0qDhgUH8E/IAktu6SGX2Hl2iXFqnS4ke8TxSibqk66a4RttX3DtROy9XvaFqj beI4YKzAHeVxzdC9LlYow9SB0EkC6K5cjQu/KZ0qcjqS8G5gu1CNdpeC5oxLeevZGbW1 1LhPvby6l1K3adhDsMUU2dNbq1Utf6elroqqVEmomhs6vAo8OHibyKGjzhm34uS9xNRA WA3IbN8l/8nEtHUF7YiShP8ZSGFUdJsdybkcvxHndEB/8D16T3sEKRbZdpGNRzPfMFCe l9Pw== X-Gm-Message-State: AOJu0YyGYAQEonhzPNGUwGKDAbKnzFiSyTS0VyhYqf214MojRDztuED0 9pLhpK5qqZG3hk+TOeKgPMCTNsAQhm32gh7ji7Q8jCgdNrJesrIOPTmqzpHl2WhF4SvHtrnEZ3q Q X-Google-Smtp-Source: AGHT+IEUvUi1boaMsPOWpFOE8WXzkA32qYRjQeokEvvyHZlDuTwvfaHhgfY9RFpTxNy4CuuauBrpRw== X-Received: by 2002:a5d:6b4c:0:b0:34e:f725:74cc with SMTP id x12-20020a5d6b4c000000b0034ef72574ccmr2174082wrw.34.1714935699446; Sun, 05 May 2024 12:01:39 -0700 (PDT) Received: from localhost.localdomain (cpc92302-cmbg19-2-0-cust1183.5-4.cable.virginm.net. [82.1.212.160]) by smtp.gmail.com with ESMTPSA id s14-20020adfe00e000000b0034e553f6174sm7292523wrh.98.2024.05.05.12.01.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 May 2024 12:01:39 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 5 May 2024 20:01:44 +0100 Message-ID: <20240505190154.90781-2-sw@jkqxz.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240505190154.90781-1-sw@jkqxz.net> References: <20240505190154.90781-1-sw@jkqxz.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 2/5] 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: libva 2.0 was released in 2017 and the 2.x versions are included in all supported distributions nowadays. --- 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. } } -- 2.43.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".