From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 581B14BC74 for ; Tue, 30 Dec 2025 17:33:17 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'aG0urUoJBlDNR8CuJhwL/HUley86g7Fbbs0C8btfxvE=', expected b'OoS6tqEDCKHnK7b7ySGmri3J/Tx8lCoM14mWgzZCg9Q=')) header.d=gmail.com header.a=rsa-sha256 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1767115981; h=to : date : message-id : in-reply-to : references : mime-version : reply-to : subject : list-id : list-archive : list-archive : list-help : list-owner : list-post : list-subscribe : list-unsubscribe : from : cc : content-type : content-transfer-encoding : from; bh=4ulQ9h0JQfanwYN6mzYEmpK91ILUjdzasVZEky3WtAQ=; b=3KAwVRyI8JacOlO9bEe+NPfWmn+8z40aLotZknjxCeOK9kw/KoYquKi3PwHuLY315yyK+ SKdjzwYR81Tv/MJ8kMZKLQx2ujbxZ+33SC9p5cdvDzjkzdkBbGd991WIDznRTZSw4yT9gAC iq2Y68HecMyYBvmRlOFuCQui4iW8Pnp4MEZQk1tz/YgXGO6SeYs3NhcericWhr8A8l96g7L gXJvquVjvWSwfjbGSStbrL5Mv90fkUuhG6GjgzeI+2T/GGMaUhTmmWp0dlJ6JuhLnp+w9Vo c4/++GZKViyWrIeEme+yyfVv1ncQ60jOefrpfExdfssFmAQDX5vKbROmlHgQ== Received: from [172.20.0.4] (unknown [172.20.0.4]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 93396690C83; Tue, 30 Dec 2025 19:33:01 +0200 (EET) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1767115960; b=ez+myi1wbfNdnv6bYZIceuQweYMLTMLBe3T0NZg8fU6GhawT20Jn0C6lK1i8NinByj4eC VnfehuFSxX+d6/3pupvVsAae9JKXtuaonO5Q4yuAkau4YBoIhHSHVAMqoYgQijHOyqdfckF RYz2PyS9S70dvZ2LgLshFI92XXYCcNto8Q3w1qPvdvS9s66W+pGx9wc0xThDCgFyMS5Hu6S 2SDz7R5SGrbn1vYNkzoix7Zm8zXyWM39RQ8iPwOJx3SBUGX6mkyDmLi3dODqpKHnwlhSHAn SQkJX7oYF+F+GU3ZIDdQ5eFWPCG14r9fV1w3d2l435MuWFoZKXaw0UHd/GMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1767115960; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=aG0urUoJBlDNR8CuJhwL/HUley86g7Fbbs0C8btfxvE=; b=MsuDnJEfusJleajJLByejtBQ3BhQAta4C4qX4l+Of2oV/yp6WVtINGJtNEpqgBI3BaezF lDnw5dp0vaG7raaopXRJiyMznuG1jEYeX03VTR35N4F8Mx5hRe0oApLqJgGEMT0KsbJZpuV 54ZPF6PIghLXpF/18dEj2+SdbyVEB/kBt2lwwtH+v6ZIHQBjRl8geOHqBbtO2us/FBN6/Gj qgTXvMN+w5ZKgapnBT7KKzI0ZcwyV+Daft7Z9iuzJ1QMhQpk6/aw18opR2eHANRae1Oo69i 0Ac/FG3SjMm5HGy4lDkNfKw+j6t6QfLZE4UVFce3t6O3TkdP85ItRqBipdeQ== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=gmail.com; arc=none; dmarc=pass header.from=gmail.com policy.dmarc=quarantine Authentication-Results: ffmpeg.org; dkim=pass header.d=gmail.com; arc=none (Message is not ARC signed); dmarc=pass (Used From Domain Record) header.from=gmail.com policy.dmarc=quarantine Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 82487690BE9 for ; Tue, 30 Dec 2025 19:32:27 +0200 (EET) Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-7b852bb31d9so12043289b3a.0 for ; Tue, 30 Dec 2025 09:32:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1767115945; x=1767720745; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=OoS6tqEDCKHnK7b7ySGmri3J/Tx8lCoM14mWgzZCg9Q=; b=VLI8da2dJXuliddm4O51T9VWmcDdJ6tZCZAXzsYsXSLuGBVsH3YwVyq+RBkZwlKkxR LihIH/vcnSieogIqwaXeLzKRxppg7KtKl62zYkWTNXD6g/BsjTk5BKMD+jMTC0cRajb8 LOOLqoWPtGYf/spbcG7QbxUC1XsfRf7+BdAH4OspUyIFeWokSfjkcfVXlHxXI3CNLbxv jyY+wNTijqc6D+iwy8LsmpZgjhD4CayRatk0Dd4J4fyP+0scdvP73T5sSP5AsGdZbyek 0fbtiB9PEa1PedCvHfkbdu6cgSdTefYZ5xKT6n7jcr3LnPqSI9l+zDzXubW9qzON0vTi D4aQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767115945; x=1767720745; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=OoS6tqEDCKHnK7b7ySGmri3J/Tx8lCoM14mWgzZCg9Q=; b=EuW7JUctXXhiO5Xb13U8D+mIvPlBLvcIoea/7MaV9qK3g1WEwPP9k6TvmjexpEgeLf Ja0C9NdFQlTDJjXOtgG7wTUhjP70oip+T6zfstRmgyn2uGwjYpTQfr/1BY9UEcsN/C9S ac0iWp17dd/i6n7Chhcmk3S9uEyR1rB5Rs7nAvpFfl3MOtAUxTuRJFBw5dHRthKUH/9b kubTW05ZT8mSM5UFUaJ0vEGlATTBJZmnBI0Wl7BnmlMwFRfg7U8/uKmwETePOc4I6Ss1 938D1lT3Fd9lyLYl8+99MBxGtfEWP+mqVgp3ucvjDMf6R9its/rlymD8yHbviTXseI5I 3vzA== X-Gm-Message-State: AOJu0YxZ0232LiypHxuM9BswoQ3zx8HH+gVugGFk28b+6cubsDsPeiJy OXS5dFrsiAZeZew1ZOvSxzzl7HrPPodp4i/qyMGi7Hzsj2COgu+SuNWUuO0DLg== X-Gm-Gg: AY/fxX5lgEgoVfE53Oy+IbyDF19RcIYwOijH2kpCn8LZjP55VCk0SMV3eEURpmz2HtM EcR6cVmPWFC91P9Eff+eMBWUxunsQ/6AoaJ7iGLjworL32FrAqVwRA7CnHGPF1//A69tV5zji+x 5Pkb+2AhnNvjEnCHO7WqwDF0EhfxyUy4bqtqrcjK4xJiG8BsjUdVmu4dPbQHkB/REhd2HDQ3a+u BTTt4N7iVeTPcJHdpN294LBW4WXC5Th/Ex9GSwEoyJW64bw55lbpzJcIzGvKBuPvaDbV8a++U1q XKIrk98tylFK+mwDrb4ThjM9NOu3JQV4S9CwHCjBJ2GZbmC8nu6zMS1VsSOaq7SPtsB3qsr2Qw/ X0PcuqennyKxGxANmOFPb/Ou9hK2ltssndPrI6u3ssHnkOcMCq5eHb2HV7f5N/c0h/2WK8jjAOW VVCTcvXONruTISLSDrE5YaO+4xHlhzeIyz8UDZRuxm X-Google-Smtp-Source: AGHT+IFkibW0U1y3ooVpSVADPyWJFhWZLenehwvomQGHUT1qV3zFs9a4UdTfhkgsdidhmrt2ox8ntA== X-Received: by 2002:a05:6a00:3027:b0:7e8:43f5:bd31 with SMTP id d2e1a72fcca58-7ff6795c10bmr27546389b3a.70.1767115945129; Tue, 30 Dec 2025 09:32:25 -0800 (PST) Received: from Raja-Rathour-ASUS-TUF-Gaming-A15.. ([150.242.72.109]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7ff7e48f3d7sm33201574b3a.51.2025.12.30.09.32.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Dec 2025 09:32:24 -0800 (PST) To: ffmpeg-devel@ffmpeg.org Date: Tue, 30 Dec 2025 23:01:56 +0530 Message-ID: <20251230173156.62073-1-imraja729@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20251223164441.123475-1-imraja729@gmail.com> References: <20251223164441.123475-1-imraja729@gmail.com> MIME-Version: 1.0 Message-ID-Hash: KU4X7Q44XDF4FBUARMMVXPU6XTM3X2IF X-Message-ID-Hash: KU4X7Q44XDF4FBUARMMVXPU6XTM3X2IF X-MailFrom: SRS0=cf/C=7E=gmail.com=imraja729@ffmpeg.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-ffmpeg-devel.ffmpeg.org-0; header-match-ffmpeg-devel.ffmpeg.org-1; header-match-ffmpeg-devel.ffmpeg.org-2; header-match-ffmpeg-devel.ffmpeg.org-3; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH v5] avfilter/vf_blackframe: add slice threading List-Id: FFmpeg development discussions and patches Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Raja Rathour via ffmpeg-devel Cc: Raja Rathour Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: This patch adds slice threading support to the blackframe filter, improving performance on multi-core systems. Changes in v5: - Removed meta-comments regarding C90 compliance as requested. - Removed redundant null checks for ThreadData pointers. - Renamed the thread results array to 'nb_black_pixels_per_slice' for clarity. Signed-off-by: Raja Rathour --- libavfilter/vf_blackframe.c | 73 ++++++++++++++++--------------------- 1 file changed, 31 insertions(+), 42 deletions(-) diff --git a/libavfilter/vf_blackframe.c b/libavfilter/vf_blackframe.c index cb566d103d..fb531b8a4c 100644 --- a/libavfilter/vf_blackframe.c +++ b/libavfilter/vf_blackframe.c @@ -39,19 +39,20 @@ typedef struct BlackFrameContext { const AVClass *class; - int bamount; ///< black amount - int bthresh; ///< black threshold - unsigned int frame; ///< frame number - unsigned int nblack; ///< number of black pixels counted so far - unsigned int last_keyframe; ///< frame number of the last received key-frame + int bamount; + int bthresh; + unsigned int frame; + unsigned int nblack; + unsigned int last_keyframe; } BlackFrameContext; typedef struct ThreadData { - const uint8_t *data; // Pointer to the image data - int linesize; // How wide is the memory line - int bthresh; // The black threshold - int width; // Image width - unsigned int *counts; // POINTER to the array where threads write results + const uint8_t *data; + int linesize; + int bthresh; + int width; + int height; // Added height for cleaner slice math + unsigned int *counts; } ThreadData; static const enum AVPixelFormat pix_fmts[] = { @@ -67,25 +68,21 @@ static const enum AVPixelFormat pix_fmts[] = { static int blackframe_slice(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) { ThreadData *td = arg; - // Calculate vertical slice - int slice_start = (ctx->inputs[0]->h * jobnr) / nb_jobs; - int slice_end = (ctx->inputs[0]->h * (jobnr+1)) / nb_jobs; - - // Safety check for pointers - if (!td || !td->data || !td->counts) return 0; - - const uint8_t *p = td->data + slice_start * td->linesize; - unsigned int local_nblack = 0; + int slice_start = (td->height * jobnr) / nb_jobs; + int slice_end = (td->height * (jobnr+1)) / nb_jobs; int x, y; + const uint8_t *p; + unsigned int black_pixels_count = 0; + + p = td->data + slice_start * td->linesize; for (y = slice_start; y < slice_end; y++) { for (x = 0; x < td->width; x++) - local_nblack += p[x] < td->bthresh; + black_pixels_count += p[x] < td->bthresh; p += td->linesize; } - // Save my private count - td->counts[jobnr] = local_nblack; + td->counts[jobnr] = black_pixels_count; return 0; } @@ -97,39 +94,31 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) AVDictionary **metadata; char buf[32]; ThreadData td; + int nb_threads, nb_jobs, i; + unsigned int *nb_black_pixels_per_slice; + + nb_threads = ff_filter_get_nb_threads(ctx); - // 1. Get thread count - int nb_threads = ff_filter_get_nb_threads(ctx); - - // Allocate memory for thread results - unsigned int *thread_counts = av_calloc(nb_threads, sizeof(*thread_counts)); - if (!thread_counts) { - av_log(ctx, AV_LOG_ERROR, "Failed to allocate thread_counts\n"); + nb_black_pixels_per_slice = av_calloc(nb_threads, sizeof(*nb_black_pixels_per_slice)); + if (!nb_black_pixels_per_slice) return AVERROR(ENOMEM); - } - // 3. Prepare the data package td.data = frame->data[0]; td.linesize = frame->linesize[0]; td.width = inlink->w; + td.height = inlink->h; td.bthresh = s->bthresh; - td.counts = thread_counts; + td.counts = nb_black_pixels_per_slice; - // 4. Run the threads! - // We calculate the exact number of jobs we are about to run - int nb_jobs = FFMIN(frame->height, nb_threads); + nb_jobs = FFMIN(td.height, nb_threads); ff_filter_execute(ctx, blackframe_slice, &td, NULL, nb_jobs); - // 5. THE REDUCE STEP: Sum up the results s->nblack = 0; - // Only sum up the jobs that actually ran - for (int i = 0; i < nb_jobs; i++) { - s->nblack += thread_counts[i]; + for (i = 0; i < nb_jobs; i++) { + s->nblack += nb_black_pixels_per_slice[i]; } - // --- FROM HERE DOWN, THE CODE IS THE SAME AS THE ORIGINAL --- - if (frame->flags & AV_FRAME_FLAG_KEY) s->last_keyframe = s->frame; @@ -149,7 +138,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) s->frame++; s->nblack = 0; - av_free(thread_counts); + av_free(nb_black_pixels_per_slice); return ff_filter_frame(inlink->dst->outputs[0], frame); } -- 2.48.1 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org