From patchwork Sun Aug 8 17:29:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 29354 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp2206772ioh; Sun, 8 Aug 2021 10:30:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzRQWvHUBx9Lky69J/oOTfNJZOWGqxDrdxKm/J6wVEvisuUUbqL/xj96+q0lyhMAa36en10 X-Received: by 2002:a05:6402:603:: with SMTP id n3mr24680856edv.61.1628443836485; Sun, 08 Aug 2021 10:30:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628443836; cv=none; d=google.com; s=arc-20160816; b=qdjvGl1uMp3aOWNfZiSa3BQke8z/8HyApFDg523aV746tEtq54gRxyAWmzvG9t+aa1 p/AJu1Kkc/bX1FETz32ocTF1Gs6YqoWE4tt0VdI9WVIA0/CbHTu3cNSlNM/6dBgc5uEy sRM/qkukwwgiweg31IBFjpERd251mrId5A07Vy1VpFdKN6WoE9iwJPREBfJ0ZzLOoXo1 6UyB8vXquvKSAbW3EXDlOzh4C6t+onziJcEv0E8fXshsF3zsgcWNFV5r7iYP0XKwPHAo jGOjvWrRTswOE+mIb2HEn98rQCACLb9CsU/TgfWRA8k89QC+CH/A4AY5YFzAYW/yvt5H JRmA== 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:references:in-reply-to:message-id :date:to:from:delivered-to; bh=3V55QQZ8OioypXk761xNzLQv+OPQru/vYH/NzBsssuo=; b=uVILE+RMFk0qOiJLGyXWEIjxPf2zCgVgmm35thYK0eZ640SH/5JkLCHvDEiTQSnjj3 Zxp8b7yVSOcWdzMdfxn8d6p6tKUQvRKBc8SZQ2vN2cBwiNx0zmdNGCEhrbjKuwdTb8jE PEWo7xmaFdxR6z6ItPMrUy3Di0nMILymM2/csPqQVNbKr0MLCuNZmvHkCidmLemaaHpz 7jXZ+UOESDentT4XT2ogB8atJl4lk7NuKcJw3rKyhRk/NFuehGMrE01ruVnsifV3qbmK CxQxFK9Ay70ny9LD9GRDHl9GOCUseuOdxxvUdrB+ExkKgmgEBaZkI8Y6X38xf88HF9DI jW8w== ARC-Authentication-Results: i=1; mx.google.com; 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 v8si14994558edt.425.2021.08.08.10.30.36; Sun, 08 Aug 2021 10:30:36 -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; 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 5CF8268A473; Sun, 8 Aug 2021 20:29:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 96CA56883DD for ; Sun, 8 Aug 2021 20:29:48 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id E5BE52404C8 for ; Sun, 8 Aug 2021 19:29:47 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id eFJQFUK_K1pP for ; Sun, 8 Aug 2021 19:29:47 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 20B4C240694 for ; Sun, 8 Aug 2021 19:29:46 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id 3C8C73A0E99; Sun, 8 Aug 2021 19:29:46 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sun, 8 Aug 2021 19:29:36 +0200 Message-Id: <20210808172941.18238-5-anton@khirnov.net> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210808172941.18238-1-anton@khirnov.net> References: <20210808172941.18238-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 05/10] lavfi/vf_scale: remove the nb_slices option 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: Df/2O/2tVPqG It was intended for debugging only and has been superseded by the standalone tool for testing sliced scaling. --- libavfilter/vf_scale.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index aa855b894a..7e70665cdd 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -148,8 +148,6 @@ typedef struct ScaleContext { int force_original_aspect_ratio; int force_divisible_by; - int nb_slices; - int eval_mode; ///< expression evaluation mode } ScaleContext; @@ -793,17 +791,6 @@ scale: ret = scale_slice(scale, out, in, scale->isws[0], 0, (link->h+1)/2, 2, 0); if (ret >= 0) ret = scale_slice(scale, out, in, scale->isws[1], 0, link->h /2, 2, 1); - } else if (scale->nb_slices) { - int i, slice_h, slice_start, slice_end = 0; - const int nb_slices = FFMIN(scale->nb_slices, link->h); - for (i = 0; i < nb_slices; i++) { - slice_start = slice_end; - slice_end = (link->h * (i+1)) / nb_slices; - slice_h = slice_end - slice_start; - ret = scale_slice(scale, out, in, scale->sws, slice_start, slice_h, 1, 0); - if (ret < 0) - break; - } } else { ret = scale_slice(scale, out, in, scale->sws, 0, link->h, 1, 0); } @@ -935,7 +922,6 @@ static const AVOption scale_options[] = { { "force_divisible_by", "enforce that the output resolution is divisible by a defined integer when force_original_aspect_ratio is used", OFFSET(force_divisible_by), AV_OPT_TYPE_INT, { .i64 = 1}, 1, 256, FLAGS }, { "param0", "Scaler param 0", OFFSET(param[0]), AV_OPT_TYPE_DOUBLE, { .dbl = SWS_PARAM_DEFAULT }, INT_MIN, INT_MAX, FLAGS }, { "param1", "Scaler param 1", OFFSET(param[1]), AV_OPT_TYPE_DOUBLE, { .dbl = SWS_PARAM_DEFAULT }, INT_MIN, INT_MAX, FLAGS }, - { "nb_slices", "set the number of slices (debug purpose only)", OFFSET(nb_slices), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, FLAGS }, { "eval", "specify when to evaluate expressions", OFFSET(eval_mode), AV_OPT_TYPE_INT, {.i64 = EVAL_MODE_INIT}, 0, EVAL_MODE_NB-1, FLAGS, "eval" }, { "init", "eval expressions once during initialization", 0, AV_OPT_TYPE_CONST, {.i64=EVAL_MODE_INIT}, .flags = FLAGS, .unit = "eval" }, { "frame", "eval expressions during initialization and per-frame", 0, AV_OPT_TYPE_CONST, {.i64=EVAL_MODE_FRAME}, .flags = FLAGS, .unit = "eval" },