diff --git a/Changelog b/Changelog index 66d7249af3..e49a9791e8 100644 --- a/Changelog +++ b/Changelog @@ -19,6 +19,7 @@ version : - Sample Dump eXchange demuxer - abitscope multimedia filter - Scenarist Closed Captions demuxer and muxer +- threshold filter version 3.2: - libopenmpt demuxer diff --git a/doc/filters.texi b/doc/filters.texi index 21a5bf5d5f..6e01df9fb5 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -13192,6 +13192,63 @@ 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. + +The filter accepts the following option: + +@table @option +@item planes +Set which planes will be processed, unprocessed planes will be copied. +By default value 0xf, all planes will be processed. +@end table + +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 91621d903b..68a94be4a6 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -289,6 +289,7 @@ OBJS-$(CONFIG_SWAPRECT_FILTER) += vf_swaprect.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 d71d14a91c..86941bad5e 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -304,6 +304,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/version.h b/libavfilter/version.h index 83258d18c6..f399238c08 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -30,7 +30,7 @@ #include "libavutil/version.h" #define LIBAVFILTER_VERSION_MAJOR 6 -#define LIBAVFILTER_VERSION_MINOR 71 +#define LIBAVFILTER_VERSION_MINOR 72 #define LIBAVFILTER_VERSION_MICRO 100 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ diff --git a/libavfilter/vf_threshold.c b/libavfilter/vf_threshold.c new file mode 100644 index 0000000000..1cb4c9aab8 --- /dev/null +++ b/libavfilter/vf_threshold.c @@ -0,0 +1,349 @@ +/* + * 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 planes; + int bpc; + + int nb_planes; + int width[4], height[4]; + + void (*threshold)(const uint8_t *in, const uint8_t *threshold, + const uint8_t *min, const uint8_t *max, + 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; + +#define OFFSET(x) offsetof(ThresholdContext, x) +#define FLAGS AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_FILTERING_PARAM + +static const AVOption threshold_options[] = { + { "planes", "set planes to filter", OFFSET(planes), AV_OPT_TYPE_INT, {.i64=15}, 0, 15, FLAGS}, + { NULL } +}; + +AVFILTER_DEFINE_CLASS(threshold); + +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_GRAY10, + AV_PIX_FMT_GRAY12, 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, *min, *max; + 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, &min, 0)) < 0 || + (ret = ff_framesync_get_frame(&s->fs, 3, &max, 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++) { + if (!(s->planes & (1 << p))) { + av_image_copy_plane(out->data[p], out->linesize[p], + in->data[p], in->linesize[p], + s->width[p] * s->bpc, + s->height[p]); + continue; + } + s->threshold(in->data[p], threshold->data[p], + min->data[p], max->data[p], + out->data[p], + in->linesize[p], threshold->linesize[p], + min->linesize[p], max->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 *min, const uint8_t *max, + 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] ? min[x] : max[x]; + } + + in += ilinesize; + threshold += tlinesize; + min += flinesize; + max += 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 *min = (const uint16_t *)ffirst; + const uint16_t *max = (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] ? min[x] : max[x]; + } + + in += ilinesize / 2; + threshold += tlinesize / 2; + min += flinesize / 2; + max += 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; + s->bpc = 1; + } else { + s->threshold = threshold16; + s->bpc = 2; + } + + 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 *min = ctx->inputs[2]; + AVFilterLink *max = ctx->inputs[3]; + FFFrameSyncIn *in; + int ret; + + if (base->format != threshold->format || + base->format != min->format || + base->format != max->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 != min->w || + base->h != min->h || + base->w != max->w || + base->h != max->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, min->w, min->h, + ctx->input_pads[3].name, max->w, max->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 = min->time_base; + in[3].time_base = max->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 = "min", + .type = AVMEDIA_TYPE_VIDEO, + .filter_frame = filter_frame, + }, + { + .name = "max", + .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 first video stream using other video streams."), + .priv_size = sizeof(ThresholdContext), + .priv_class = &threshold_class, + .uninit = uninit, + .query_formats = query_formats, + .inputs = inputs, + .outputs = outputs, + .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, +};