Hi,
patch attached.
From 5352dbf21552746b2bf4359abd36b67a1b73a1bf Mon Sep 17 00:00:00 2001
From: Paul B Mahol <one...@gmail.com>
Date: Sat, 6 Feb 2016 17:11:07 +0100
Subject: [PATCH] avfilter: add threshold filter
Signed-off-by: Paul B Mahol <one...@gmail.com>
---
doc/filters.texi | 49 +++++++
libavfilter/Makefile | 1 +
libavfilter/allfilters.c | 1 +
libavfilter/vf_threshold.c | 323 +++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 374 insertions(+)
create mode 100644 libavfilter/vf_threshold.c
diff --git a/doc/filters.texi b/doc/filters.texi
index 5991dd4..95a71d6 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -11522,6 +11522,55 @@ PAL output (25i):
16p: 33333334
@end example
+@section threshold
+
+Apply threshold effect to video stream.
+
+This filter needs four video streams to perform thresholding.
+First stream is stream we are filtering.
+Second stream is holding threshold values, third stream is holding min values,
+and last, fourth stream is holding max values.
+
+For example if first stream pixel's component value is less then threshold value
+of pixel component from 2nd threshold stream, third stream value will picked,
+otherwise fourth stream pixel component value will be picked.
+
+Using color source filter one can perform various types of thresholding:
+
+@subsection Examples
+
+@itemize
+@item
+Binary threshold, using gray color as threshold:
+@example
+ffmpeg -i 320x240.avi -f lavfi -i color=gray -f lavfi -i color=black -f lavfi -i color=white -lavfi threshold output.avi
+@end example
+
+@item
+Inverted binary threshold, using gray color as threshold:
+@example
+ffmpeg -i 320x240.avi -f lavfi -i color=gray -f lavfi -i color=white -f lavfi -i color=black -lavfi threshold output.avi
+@end example
+
+@item
+Truncate binary threshold, using gray color as threshold:
+@example
+ffmpeg -i 320x240.avi -f lavfi -i color=gray -i 320x240.avi -f lavfi -i color=gray -lavfi threshold output.avi
+@end example
+
+@item
+Threshold to zero, using gray color as threshold:
+@example
+ffmpeg -i 320x240.avi -f lavfi -i color=gray -f lavfi -i color=white -i 320x240.avi -lavfi threshold output.avi
+@end example
+
+@item
+Inverted threshold to zero, using gray color as threshold:
+@example
+ffmpeg -i 320x240.avi -f lavfi -i color=gray -i 320x240.avi -f lavfi -i color=white -lavfi threshold output.avi
+@end example
+@end itemize
+
@section thumbnail
Select the most representative frame in a given sequence of consecutive frames.
diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index 664c773..800d493 100644
--- a/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@ -245,6 +245,7 @@ OBJS-$(CONFIG_SUPER2XSAI_FILTER) += vf_super2xsai.o
OBJS-$(CONFIG_SWAPUV_FILTER) += vf_swapuv.o
OBJS-$(CONFIG_TBLEND_FILTER) += vf_blend.o dualinput.o framesync.o
OBJS-$(CONFIG_TELECINE_FILTER) += vf_telecine.o
+OBJS-$(CONFIG_THRESHOLD_FILTER) += vf_threshold.o
OBJS-$(CONFIG_THUMBNAIL_FILTER) += vf_thumbnail.o
OBJS-$(CONFIG_TILE_FILTER) += vf_tile.o
OBJS-$(CONFIG_TINTERLACE_FILTER) += vf_tinterlace.o
diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c
index f56b390..8ae5aa6 100644
--- a/libavfilter/allfilters.c
+++ b/libavfilter/allfilters.c
@@ -265,6 +265,7 @@ void avfilter_register_all(void)
REGISTER_FILTER(SWAPUV, swapuv, vf);
REGISTER_FILTER(TBLEND, tblend, vf);
REGISTER_FILTER(TELECINE, telecine, vf);
+ REGISTER_FILTER(THRESHOLD, threshold, vf);
REGISTER_FILTER(THUMBNAIL, thumbnail, vf);
REGISTER_FILTER(TILE, tile, vf);
REGISTER_FILTER(TINTERLACE, tinterlace, vf);
diff --git a/libavfilter/vf_threshold.c b/libavfilter/vf_threshold.c
new file mode 100644
index 0000000..78aa1c9
--- /dev/null
+++ b/libavfilter/vf_threshold.c
@@ -0,0 +1,323 @@
+/*
+ * Copyright (c) 2016 Paul B Mahol
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * threshold video filter
+ */
+
+#include "libavutil/imgutils.h"
+#include "libavutil/internal.h"
+#include "libavutil/opt.h"
+#include "libavutil/pixdesc.h"
+#include "avfilter.h"
+#include "framesync.h"
+#include "internal.h"
+#include "video.h"
+
+typedef struct ThresholdContext {
+ const AVClass *class;
+
+ int nb_planes;
+ int width[4], height[4];
+
+ void (*threshold)(const uint8_t *in, const uint8_t *threshold,
+ const uint8_t *first, const uint8_t *second,
+ uint8_t *out,
+ ptrdiff_t ilinesize, ptrdiff_t tlinesize,
+ ptrdiff_t flinesize, ptrdiff_t slinesize,
+ ptrdiff_t olinesize,
+ int w, int h);
+
+ AVFrame *frames[4];
+ FFFrameSync fs;
+} ThresholdContext;
+
+static int query_formats(AVFilterContext *ctx)
+{
+ static const enum AVPixelFormat pix_fmts[] = {
+ AV_PIX_FMT_YUVA444P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV440P,
+ AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUVJ440P,
+ AV_PIX_FMT_YUVA422P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUVA420P, AV_PIX_FMT_YUV420P,
+ AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUVJ420P,
+ AV_PIX_FMT_YUVJ411P, AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUV410P,
+ AV_PIX_FMT_YUV420P9, AV_PIX_FMT_YUV422P9, AV_PIX_FMT_YUV444P9,
+ AV_PIX_FMT_YUV420P10, AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUV444P10,
+ AV_PIX_FMT_YUV420P16, AV_PIX_FMT_YUV422P16, AV_PIX_FMT_YUV444P16,
+ AV_PIX_FMT_YUVA420P9, AV_PIX_FMT_YUVA422P9, AV_PIX_FMT_YUVA444P9,
+ AV_PIX_FMT_YUVA420P10, AV_PIX_FMT_YUVA422P10, AV_PIX_FMT_YUVA444P10,
+ AV_PIX_FMT_YUVA420P16, AV_PIX_FMT_YUVA422P16, AV_PIX_FMT_YUVA444P16,
+ AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRP9, AV_PIX_FMT_GBRP10,
+ AV_PIX_FMT_GBRP12, AV_PIX_FMT_GBRP14, AV_PIX_FMT_GBRP16,
+ AV_PIX_FMT_GBRAP, AV_PIX_FMT_GBRAP16,
+ AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY16,
+ AV_PIX_FMT_NONE
+ };
+
+ return ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
+}
+
+static int process_frame(FFFrameSync *fs)
+{
+ AVFilterContext *ctx = fs->parent;
+ ThresholdContext *s = fs->opaque;
+ AVFilterLink *outlink = ctx->outputs[0];
+ AVFrame *out, *in, *threshold, *first, *second;
+ int ret;
+
+ if ((ret = ff_framesync_get_frame(&s->fs, 0, &in, 0)) < 0 ||
+ (ret = ff_framesync_get_frame(&s->fs, 1, &threshold, 0)) < 0 ||
+ (ret = ff_framesync_get_frame(&s->fs, 2, &first, 0)) < 0 ||
+ (ret = ff_framesync_get_frame(&s->fs, 3, &second, 0)) < 0)
+ return ret;
+
+ if (ctx->is_disabled) {
+ out = av_frame_clone(in);
+ if (!out)
+ return AVERROR(ENOMEM);
+ } else {
+ int p;
+
+ out = ff_get_video_buffer(outlink, outlink->w, outlink->h);
+ if (!out)
+ return AVERROR(ENOMEM);
+ av_frame_copy_props(out, in);
+
+ for (p = 0; p < s->nb_planes; p++) {
+ s->threshold(in->data[p], threshold->data[p],
+ first->data[p], second->data[p],
+ out->data[p],
+ in->linesize[p], threshold->linesize[p],
+ first->linesize[p], second->linesize[p],
+ out->linesize[p],
+ s->width[p], s->height[p]);
+ }
+ }
+
+ out->pts = av_rescale_q(s->fs.pts, s->fs.time_base, outlink->time_base);
+
+ return ff_filter_frame(outlink, out);
+}
+
+static void threshold8(const uint8_t *in, const uint8_t *threshold,
+ const uint8_t *first, const uint8_t *second,
+ uint8_t *out,
+ ptrdiff_t ilinesize, ptrdiff_t tlinesize,
+ ptrdiff_t flinesize, ptrdiff_t slinesize,
+ ptrdiff_t olinesize,
+ int w, int h)
+{
+ int x, y;
+
+ for (y = 0; y < h; y++) {
+ for (x = 0; x < w; x++) {
+ out[x] = in[x] < threshold[x] ? first[x] : second[x];
+ }
+
+ in += ilinesize;
+ threshold += tlinesize;
+ first += flinesize;
+ second += flinesize;
+ out += olinesize;
+ }
+}
+
+static void threshold16(const uint8_t *iin, const uint8_t *tthreshold,
+ const uint8_t *ffirst, const uint8_t *ssecond,
+ uint8_t *oout,
+ ptrdiff_t ilinesize, ptrdiff_t tlinesize,
+ ptrdiff_t flinesize, ptrdiff_t slinesize,
+ ptrdiff_t olinesize,
+ int w, int h)
+{
+ const uint16_t *in = (const uint16_t *)iin;
+ const uint16_t *threshold = (const uint16_t *)tthreshold;
+ const uint16_t *first = (const uint16_t *)ffirst;
+ const uint16_t *second = (const uint16_t *)ssecond;
+ uint16_t *out = (uint16_t *)oout;
+ int x, y;
+
+ for (y = 0; y < h; y++) {
+ for (x = 0; x < w; x++) {
+ out[x] = in[x] < threshold[x] ? first[x] : second[x];
+ }
+
+ in += ilinesize / 2;
+ threshold += tlinesize / 2;
+ first += flinesize / 2;
+ second += flinesize / 2;
+ out += olinesize / 2;
+ }
+}
+
+static int config_input(AVFilterLink *inlink)
+{
+ AVFilterContext *ctx = inlink->dst;
+ ThresholdContext *s = ctx->priv;
+ const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format);
+ int vsub, hsub;
+
+ s->nb_planes = av_pix_fmt_count_planes(inlink->format);
+
+ hsub = desc->log2_chroma_w;
+ vsub = desc->log2_chroma_h;
+ s->height[1] = s->height[2] = AV_CEIL_RSHIFT(inlink->h, vsub);
+ s->height[0] = s->height[3] = inlink->h;
+ s->width[1] = s->width[2] = AV_CEIL_RSHIFT(inlink->w, hsub);
+ s->width[0] = s->width[3] = inlink->w;
+
+ if (desc->comp[0].depth == 8)
+ s->threshold = threshold8;
+ else
+ s->threshold = threshold16;
+
+ return 0;
+}
+
+static int config_output(AVFilterLink *outlink)
+{
+ AVFilterContext *ctx = outlink->src;
+ ThresholdContext *s = ctx->priv;
+ AVFilterLink *base = ctx->inputs[0];
+ AVFilterLink *threshold = ctx->inputs[1];
+ AVFilterLink *first = ctx->inputs[2];
+ AVFilterLink *second = ctx->inputs[3];
+ FFFrameSyncIn *in;
+ int ret;
+
+ if (base->format != threshold->format ||
+ base->format != first->format ||
+ base->format != second->format) {
+ av_log(ctx, AV_LOG_ERROR, "inputs must be of same pixel format\n");
+ return AVERROR(EINVAL);
+ }
+ if (base->w != threshold->w ||
+ base->h != threshold->h ||
+ base->w != first->w ||
+ base->h != first->h ||
+ base->w != second->w ||
+ base->h != second->h) {
+ av_log(ctx, AV_LOG_ERROR, "First input link %s parameters "
+ "(size %dx%d) do not match the corresponding "
+ "second input link %s parameters (%dx%d) "
+ "and/or third input link %s parameters (%dx%d) "
+ "and/or fourth input link %s parameters (%dx%d)\n",
+ ctx->input_pads[0].name, base->w, base->h,
+ ctx->input_pads[1].name, threshold->w, threshold->h,
+ ctx->input_pads[2].name, first->w, first->h,
+ ctx->input_pads[3].name, second->w, second->h);
+ return AVERROR(EINVAL);
+ }
+
+ outlink->w = base->w;
+ outlink->h = base->h;
+ outlink->time_base = base->time_base;
+ outlink->sample_aspect_ratio = base->sample_aspect_ratio;
+ outlink->frame_rate = base->frame_rate;
+
+ if ((ret = ff_framesync_init(&s->fs, ctx, 4)) < 0)
+ return ret;
+
+ in = s->fs.in;
+ in[0].time_base = base->time_base;
+ in[1].time_base = threshold->time_base;
+ in[2].time_base = first->time_base;
+ in[3].time_base = second->time_base;
+ in[0].sync = 1;
+ in[0].before = EXT_STOP;
+ in[0].after = EXT_STOP;
+ in[1].sync = 1;
+ in[1].before = EXT_STOP;
+ in[1].after = EXT_STOP;
+ in[2].sync = 1;
+ in[2].before = EXT_STOP;
+ in[2].after = EXT_STOP;
+ in[3].sync = 1;
+ in[3].before = EXT_STOP;
+ in[3].after = EXT_STOP;
+ s->fs.opaque = s;
+ s->fs.on_event = process_frame;
+
+ return ff_framesync_configure(&s->fs);
+}
+
+static int filter_frame(AVFilterLink *inlink, AVFrame *buf)
+{
+ ThresholdContext *s = inlink->dst->priv;
+ return ff_framesync_filter_frame(&s->fs, inlink, buf);
+}
+
+static int request_frame(AVFilterLink *outlink)
+{
+ ThresholdContext *s = outlink->src->priv;
+ return ff_framesync_request_frame(&s->fs, outlink);
+}
+
+static av_cold void uninit(AVFilterContext *ctx)
+{
+ ThresholdContext *s = ctx->priv;
+
+ ff_framesync_uninit(&s->fs);
+}
+
+static const AVFilterPad inputs[] = {
+ {
+ .name = "default",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .filter_frame = filter_frame,
+ .config_props = config_input,
+ },
+ {
+ .name = "threshold",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .filter_frame = filter_frame,
+ },
+ {
+ .name = "first",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .filter_frame = filter_frame,
+ },
+ {
+ .name = "second",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .filter_frame = filter_frame,
+ },
+ { NULL }
+};
+
+static const AVFilterPad outputs[] = {
+ {
+ .name = "default",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .config_props = config_output,
+ .request_frame = request_frame,
+ },
+ { NULL }
+};
+
+AVFilter ff_vf_threshold = {
+ .name = "threshold",
+ .description = NULL_IF_CONFIG_SMALL("Threshold 1st video stream using other video streams."),
+ .priv_size = sizeof(ThresholdContext),
+ .uninit = uninit,
+ .query_formats = query_formats,
+ .inputs = inputs,
+ .outputs = outputs,
+};
--
1.9.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
