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 F407A4DADD for ; Tue, 23 Dec 2025 16:45:21 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'RrAqHGM30jLT0esX1iRZiM/yY2cn/4K0MKoWpN/kjoY=', expected b'xLKLwQ0+xYC6z4bhC41GW/b/Duv2zS9iCLqZX7NztZU=')) 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=1766508314; h=to : date : message-id : 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=8HQKLCIIc+p3aiiKahVMIAA0QvFdQR2jE8OPyArxzMM=; b=GpzMI9r1HImFK6x7pn3SCcN4iaHXdXpwEVvzT2CmijJ4FCHKLo5LPDYvKLBM6CT6n6t4s QY/GU0MuWXj16oZrZLaSbKKg10hflHdwf0EOPI+7TpzjBPHyuQgXuL5QpGaKOcj7kbigbEn CHH5ihRR7TewDhzF6wBK3Sejo+ul/QhVYQ5rj+XFtC1Vo2Uy8Y6JaZNp/n1W7p+sTjdH+/S li1FsSp3DwV0+NoYBZJypKeDkYlcJb1Ka3InhxJqgn/DSL4srC97Sif/xEy8opxhObkaQbP 9rsm09xrUUKUt1OHP5gfCyNf3P4L67P6YcTqDUoLVouuZloUAltnxIRJkLJw== Received: from [172.20.0.2] (unknown [172.19.0.4]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id BECA8690B26; Tue, 23 Dec 2025 18:45:14 +0200 (EET) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1766508308; b=f5lDzwuovuhp9MadepOy9S/ayTpRVGRkamGwa/TIRRptxSbyPkw6DAVO1CiC8Wn831aeN JDD+Pvbo4De1kiLGJyOOsEN+TUEgGMb5u6OxnLRm+a3sH6Th1dfUKRS7cjYWWmFpncMBIFR U1NtgciJ8We6EdCYumV1ps9v2WAaGD1Lk48lklGuhqwfKbO6cMr+LZSVsDEgMMOK35VVxgW X1t0ER2OA0Uye2Q4yMqQFwpgjxVtk0C4/poCgwvnHZq+13iBDch5hcBME/sR0g2jQaHzcrl FFx9oOVCiCgVY+s5hi59Ex4G/x9oMAGlayPUlvxycFKfMWYI+60Aqcnmgaqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1766508308; 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=RrAqHGM30jLT0esX1iRZiM/yY2cn/4K0MKoWpN/kjoY=; b=fdntVy/YZEWAyD/Sr1mPVHJVSaGvoxBBg8smJdYxshmmKEkBckg8vc0xTLqUq3PYphY7f Rgfe6R6p1sT1k8M46c70/5LhSemueWJV+myk8wXjbRdkZq0RYumGXm6r3ibfjdnjf8YhbUf e+/vJNIdLiIXAYwI16PRYJIX7ZdMqrh3QMJ7yp+e4k/2RTG5M941N0Bzt0vS0xliIWte2cd A2JH/k/pdU373Xv16I52+i6KViSfbT3yQUCvKDm1FB4vhjKHjf21IQWF1LigG3NybS/GoPl 1sky6I1uAgWZuMY5UnpJL4iQ+tIVpow4mWWw4l7LQq3/GPm6ovng1oX2uShg== 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-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id D659F68F9F7 for ; Tue, 23 Dec 2025 18:44:55 +0200 (EET) Received: by mail-pj1-f42.google.com with SMTP id 98e67ed59e1d1-34c902f6845so7101736a91.2 for ; Tue, 23 Dec 2025 08:44:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1766508294; x=1767113094; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=xLKLwQ0+xYC6z4bhC41GW/b/Duv2zS9iCLqZX7NztZU=; b=SRfdW7vFcUjyQsao4VAvCTDfU3aAeQI+D4/Cw6PPj7X6KilJts+5TroQ950pFwNDHL +hlN0JRov0vM+5qZATCZixAtBrL2Sdz7npcu3GEv90bcs4RMXXvHKnMsu28ZH7jqA+pb Bu4cl2zV8xXPeXnhkbhnAn00AlR8aNiQoL8rWH6jdPThQmeCXArKBILyqpuxGxyUvRfL G4iChOraxuY113GiIwEaXX3yKxcasJKSazx2D2XvzXi951gu4nyPVtt7B/e9UNTQUT5E ISPZxOFb56LRC3EtWFOlzhvza/JhQjEW5POhu4Mz++ft+Ow2CYdiTLR42T98l8ELz4b0 oMVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766508294; x=1767113094; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=xLKLwQ0+xYC6z4bhC41GW/b/Duv2zS9iCLqZX7NztZU=; b=BYxmmohBopbIUAygq603gIbjHzGIi1Tow65uD5Z3mlB8Qrfj+1PQp++6LOCFE+N+E6 qja8Yh2BbacQhiQXY61yqVWp7hYit9Q+gNkvT+e0+PrSSUvsoBiLuVvDT255unr9nwza 8cnl3s8bamh/S3NcXc6YyiMkpJw/7lFDYzD5B31mTxKjhBATIN1/adDC8J0FaDC2w4ot HfOXM4Udu4Zc3c01UzdjVFhbSpou3Xh6WaGPHesTMx1+Ggr9DsY6d+u1ODsy2aq7faIC iqGHYOO8AX54VjTfzfG1zjm168bnOeHDNSOJRlr0HfOGV8SFecssUuXMOYRyc8Rh/3ni SSzw== X-Gm-Message-State: AOJu0Yx/OWliTHAjHkrHnyBpp900PFxtoNXmdrwr7iwqS/UGn0vwpUyz YDD17X5SyC+0MadKNCPjktKXvQqd0HOiC5lRxKpCWuQ2IKenEtMaNqY6tcNeHA== X-Gm-Gg: AY/fxX7SIooKeXi5d3mpmpFej3jGxbRSKT4m+7Cmjbg1L/rrt4ZnVNFef6VvkfKCZx2 R/wQ17sH5QtNt3wQYVu8EET2JGzlJ0gaS3BnoWTOf4A43JZ3TJX4ouXS/G+GMN5R9wWHmcXtXUc s2c77Iv0GaQtRtD2l5DjzLAC6JTX04g+436YXUX9ONczyBLnr9ckdIvTYTNWiYoGwK0Xmapbyth 9F3zv7T1qmD9wMKIw9udD6f6L8eKWUb7PikkzAt7Qm7sxtK/7PECCAB+YHycZCLxgrtmHX0l5lB irxbVwtSAHkugcn9WhwY2nYYYbQqS707zHyozS3FnYFWPRfFnI+t50DSofac34zM2XoynG6qryB lTuuQknlCisixWWiPUxYqfpHsKzeqhDPrN0X6ZVmbWpYD0lV10MpnMov6nWiP56h6wqxP7zBbWZ rjjMklDfyLUOTKozJ/NIM9rkjhhoZnJdf4SpZDBsx82d0S4srB2w== X-Google-Smtp-Source: AGHT+IGmgaSOiuEHCtXqtT4vwCO754Cf1vQkvB+pH+Nf7wS4hgDXuZRy3QaTKHSOkUK5vX5VRuNY0w== X-Received: by 2002:a17:90b:28cf:b0:34c:9cf7:60a0 with SMTP id 98e67ed59e1d1-34e921221aemr13465268a91.5.1766508293748; Tue, 23 Dec 2025 08:44:53 -0800 (PST) Received: from Raja-Rathour-ASUS-TUF-Gaming-A15.. ([150.242.65.63]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-34e921b165bsm13286941a91.6.2025.12.23.08.44.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Dec 2025 08:44:53 -0800 (PST) To: ffmpeg-devel@ffmpeg.org Date: Tue, 23 Dec 2025 22:14:41 +0530 Message-ID: <20251223164441.123475-1-imraja729@gmail.com> X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 Message-ID-Hash: QUMQMX5VLNQL34CRHVJV3F75LFMFYVEW X-Message-ID-Hash: QUMQMX5VLNQL34CRHVJV3F75LFMFYVEW X-MailFrom: SRS0=JFHy=65=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 v4] 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: --- libavfilter/vf_blackframe.c | 80 ++++++++++++++++++++++++++++++++----- 1 file changed, 71 insertions(+), 9 deletions(-) diff --git a/libavfilter/vf_blackframe.c b/libavfilter/vf_blackframe.c index f0aa53e133..f09d564bf7 100644 --- a/libavfilter/vf_blackframe.c +++ b/libavfilter/vf_blackframe.c @@ -32,6 +32,7 @@ #include "libavutil/internal.h" #include "libavutil/opt.h" +#include "libavutil/mem.h" #include "avfilter.h" #include "filters.h" #include "video.h" @@ -45,6 +46,14 @@ typedef struct BlackFrameContext { unsigned int last_keyframe; ///< frame number of the last received key-frame } 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 +} ThreadData; + static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUV420P, AV_PIX_FMT_GRAY8, AV_PIX_FMT_NV12, AV_PIX_FMT_NV21, AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV411P, @@ -55,22 +64,72 @@ static const enum AVPixelFormat pix_fmts[] = { snprintf(buf, sizeof(buf), format, value); \ av_dict_set(metadata, key, buf, 0) +static int blackframe_slice(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) +{ + ThreadData *td = arg; + // --- C90 HARD FIX: ALL DECLARATIONS AT THE VERY TOP --- + int slice_start, slice_end, x, y; + const uint8_t *p; + unsigned int local_nblack = 0; + // ------------------------------------------------------ + + // Safety check + if (!td || !td->data || !td->counts) return 0; + + slice_start = (ctx->inputs[0]->h * jobnr) / nb_jobs; + slice_end = (ctx->inputs[0]->h * (jobnr+1)) / nb_jobs; + + 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; + p += td->linesize; + } + + // Save my private count + td->counts[jobnr] = local_nblack; + return 0; +} + static int filter_frame(AVFilterLink *inlink, AVFrame *frame) { AVFilterContext *ctx = inlink->dst; BlackFrameContext *s = ctx->priv; - int x, i; + // --- C90 HARD FIX: ALL DECLARATIONS AT THE VERY TOP --- int pblack = 0; - uint8_t *p = frame->data[0]; AVDictionary **metadata; char buf[32]; - - for (i = 0; i < frame->height; i++) { - for (x = 0; x < inlink->w; x++) - s->nblack += p[x] < s->bthresh; - p += frame->linesize[0]; + ThreadData td; + int nb_threads; + unsigned int *thread_counts; + int nb_jobs; + int i; // <--- This was the MSVC killer. Moved to top. + // ------------------------------------------------------ + + nb_threads = ff_filter_get_nb_threads(ctx); + + thread_counts = av_calloc(nb_threads, sizeof(*thread_counts)); + if (!thread_counts) { + av_log(ctx, AV_LOG_ERROR, "Failed to allocate thread_counts\n"); + return AVERROR(ENOMEM); } + td.data = frame->data[0]; + td.linesize = frame->linesize[0]; + td.width = inlink->w; + td.bthresh = s->bthresh; + td.counts = thread_counts; + + nb_jobs = FFMIN(frame->height, nb_threads); + + ff_filter_execute(ctx, blackframe_slice, &td, NULL, nb_jobs); + + s->nblack = 0; + for (i = 0; i < nb_jobs; i++) { + s->nblack += thread_counts[i]; + } + if (frame->flags & AV_FRAME_FLAG_KEY) s->last_keyframe = s->frame; @@ -89,6 +148,9 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) s->frame++; s->nblack = 0; + + av_free(thread_counts); + return ff_filter_frame(inlink->dst->outputs[0], frame); } @@ -118,9 +180,9 @@ const FFFilter ff_vf_blackframe = { .p.name = "blackframe", .p.description = NULL_IF_CONFIG_SMALL("Detect frames that are (almost) black."), .p.priv_class = &blackframe_class, - .p.flags = AVFILTER_FLAG_METADATA_ONLY, + .p.flags = AVFILTER_FLAG_METADATA_ONLY | AVFILTER_FLAG_SLICE_THREADS, .priv_size = sizeof(BlackFrameContext), FILTER_INPUTS(avfilter_vf_blackframe_inputs), FILTER_OUTPUTS(ff_video_default_filterpad), FILTER_PIXFMTS_ARRAY(pix_fmts), -}; +}; \ No newline at end of file -- 2.48.1 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org