>
> Not for the functions, rather for the use of the filter and its
> options. See doc/filters.texi.
>
I have updated the documentation accordingly.
Regards,
Yatendra Singh.
On Fri, Apr 17, 2020 at 12:51 PM Moritz Barsnick <barsn...@gmx.net> wrote:
> On Thu, Apr 16, 2020 at 18:39:58 +0530, YATENDRA SINGH wrote:
> > > As Michael noted, please resend without broken like feeds. I can't read
> > > most of the diff the way it is now.
> > >
> > Sorry but I could not understand what broken by newlines mean. Can you
> > explain a little bit further?
>
> Your mailer introduced line wraps, making it impossible to apply the
> patch, and difficult to read.
>
> See what it looks like here:
> http://ffmpeg.org/pipermail/ffmpeg-devel/2020-April/260651.html
> (E.g. scroll to the bottom and check what stuff should be on one line,
> but isn't.)
>
> > > Documentation update missing (and eventually changelog).
> > >
> > Is this documentation supposed to be different from the autogenerated one
> > for the functions that I have placed?
>
> Not for the functions, rather for the use of the filter and its
> options. See doc/filters.texi.
>
> > Also git send-email is not working for some reason and I am always stuck
> on
> > the same SMTP error, so I have attached the patch updated based on the
> > suggestions.
>
> Yes, this patch is not corrupted anymore.
>
> Cheers,
> Moritz
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
From 465d4e4dff91167a362aa8f84ee4116cb7bd79c3 Mon Sep 17 00:00:00 2001
From: Yatendra Singh <yatend...@iitbhilai.ac.in>
Date: Sat, 18 Apr 2020 13:31:03 +0530
Subject: [PATCH] libavfilter/vf_colorconstancy.c : Adding weighted greyedge
Signed-off-by: Yatendra Singh <yatend...@iitbhilai.ac.in>
---
doc/filters.texi | 34 ++++
libavfilter/Makefile | 1 +
libavfilter/allfilters.c | 1 +
libavfilter/vf_colorconstancy.c | 266 +++++++++++++++++++++++++++-----
4 files changed, 267 insertions(+), 35 deletions(-)
diff --git a/doc/filters.texi b/doc/filters.texi
index a4f99ef376..bde1dd3ce3 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -20070,6 +20070,40 @@ separatefields,select=eq(mod(n,4),0)+eq(mod(n,4),3),weave
@end example
@end itemize
+@section weighted_greyedge
+Apply the color constancy filter which estimates illumination and updates the
+image colors accordingly.
+
+It accepts the following options:
+
+@table @option
+@item difford
+The order of differentiation to be applied on the scene. Must be chosen in the range
+[0,2] and default value is 1.
+
+@item minknorm
+The Minkowski parameter to be used for calculating the Minkowski distance. Must
+be chosen in the range [0,20] and default value is 1. Set to 0 for getting
+max value instead of calculating Minkowski distance.
+
+@item sigma
+The standard deviation of Gaussian blur to be applied on the scene. Must be
+chosen in the range [0,1024.0] and default value = 1. floor( @var{sigma} * break_off_sigma(3) )
+can't be equal to 0 if @var{difford} is greater than 0.
+
+@item min_err
+The minimum angular error at which the algoritm breaks off even if it has not reached the
+required number of iterations. Must be chosen in the range [0.02,PI] radians with default of 0.1.
+
+@item max_iters
+The maximum number of iterations the algorithm performs before giving the output. Must be in the
+range [1,100] with a default value of 10.
+@end table
+
+@example
+ffmpeg -i 1.tif -vf "weighted_greyedge=difford=1:minknorm=2:sigma=2:max_iters=50" 1o.tif
+@end example
+
@section xbr
Apply the xBR high-quality magnification filter which is designed for pixel
art. It follows a set of edge-detection rules, see
diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index ecbc628868..ba546c32b0 100644
--- a/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@ -448,6 +448,7 @@ OBJS-$(CONFIG_VSTACK_FILTER) += vf_stack.o framesync.o
OBJS-$(CONFIG_W3FDIF_FILTER) += vf_w3fdif.o
OBJS-$(CONFIG_WAVEFORM_FILTER) += vf_waveform.o
OBJS-$(CONFIG_WEAVE_FILTER) += vf_weave.o
+OBJS-$(CONFIG_WEIGHTED_GREYEDGE_FILTER) += vf_colorconstancy.o
OBJS-$(CONFIG_XBR_FILTER) += vf_xbr.o
OBJS-$(CONFIG_XFADE_FILTER) += vf_xfade.o
OBJS-$(CONFIG_XFADE_OPENCL_FILTER) += vf_xfade_opencl.o opencl.o opencl/xfade.o
diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c
index fb32bef788..da2adbed21 100644
--- a/libavfilter/allfilters.c
+++ b/libavfilter/allfilters.c
@@ -427,6 +427,7 @@ extern AVFilter ff_vf_vstack;
extern AVFilter ff_vf_w3fdif;
extern AVFilter ff_vf_waveform;
extern AVFilter ff_vf_weave;
+extern AVFilter ff_vf_weighted_greyedge;
extern AVFilter ff_vf_xbr;
extern AVFilter ff_vf_xfade;
extern AVFilter ff_vf_xfade_opencl;
diff --git a/libavfilter/vf_colorconstancy.c b/libavfilter/vf_colorconstancy.c
index eae62204b5..6d581f411c 100644
--- a/libavfilter/vf_colorconstancy.c
+++ b/libavfilter/vf_colorconstancy.c
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2018 Mina Sami
+ * Copyright (c) 2020 Yatendra Singh
*
* This file is part of FFmpeg.
*
@@ -26,6 +27,14 @@
*
* @cite
* J. van de Weijer, Th. Gevers, A. Gijsenij "Edge-Based Color Constancy".
+ *
+ * @cite
+ * J. van de Weijer, Th. Gevers, and J. Geusebroek,
+ * “Edge and corner detection by photometric quasi-invariants”.
+ *
+ * @cite
+ * A. Gijsenij, Th. Gevers, J. van de Weijer,
+ * "Improving Color Constancy by Photometric Edge Weighting".
*/
#include "libavutil/imgutils.h"
@@ -40,8 +49,10 @@
#include <math.h>
#define GREY_EDGE "greyedge"
+#define WEIGHTED_GREY_EDGE "weighted_greyedge"
#define SQRT3 1.73205080757
+#define NORAMAL_WHITE 1/SQRT3
#define NUM_PLANES 3
#define MAX_DIFF_ORD 2
@@ -83,6 +94,11 @@ typedef struct ColorConstancyContext {
int planeheight[4];
int planewidth[4];
+ double min_err;
+ int max_iters;
+
+ double *weight_info[2];
+
int filtersize;
double *gauss[MAX_DIFF_ORD+1];
@@ -552,32 +568,6 @@ static void normalize_light(double *light)
}
}
-/**
- * Redirects to corresponding algorithm estimation function and performs normalization
- * after estimation.
- *
- * @param ctx the filter context.
- * @param in frame to perfrom estimation on.
- *
- * @return 0 in case of success, a negative value corresponding to an
- * AVERROR code in case of failure.
- */
-static int illumination_estimation(AVFilterContext *ctx, AVFrame *in)
-{
- ColorConstancyContext *s = ctx->priv;
- int ret;
-
- ret = filter_grey_edge(ctx, in);
-
- av_log(ctx, AV_LOG_DEBUG, "Estimated illumination= %f %f %f\n",
- s->white[0], s->white[1], s->white[2]);
- normalize_light(s->white);
- av_log(ctx, AV_LOG_DEBUG, "Estimated illumination after normalization= %f %f %f\n",
- s->white[0], s->white[1], s->white[2]);
-
- return ret;
-}
-
/**
* Performs simple correction via diagonal transformation model.
*
@@ -634,6 +624,163 @@ static void chromatic_adaptation(AVFilterContext *ctx, AVFrame *in, AVFrame *out
ctx->internal->execute(ctx, diagonal_transformation, &td, NULL, nb_jobs);
}
+/**
+ * Slice function for weighted grey edge algorithm that does partial summing/maximizing
+ * of gaussian derivatives.
+ *
+ * @param ctx the filter context.
+ * @param arg data to be passed between threads.
+ * @param jobnr current job nubmer.
+ * @param nb_jobs total number of jobs.
+ *
+ * @return 0.
+ */
+static int filter_slice_weighted_greyedge(AVFilterContext* ctx, void* arg, int jobnr, int nb_jobs)
+{
+ ColorConstancyContext *s = ctx->priv;
+ ThreadData *td = arg;
+ AVFrame *in = td->in;
+ int minknorm = s->minknorm;
+ const uint8_t thresh = 255;
+ int plane;
+
+ int height_max = FFMAX3(s->planeheight[0], s->planeheight[1], s->planeheight[2]);
+ int width_max = FFMAX3(s->planewidth[0], s->planewidth[1], s->planewidth[2]);
+
+ memset(s->weight_info[0], 0, height_max * width_max * sizeof(double));
+ memset(s->weight_info[1], 0, height_max * width_max * sizeof(double));
+
+ for (plane = 0; plane < NUM_PLANES; plane++)
+ {
+ const int height = s->planeheight[plane];
+ const int width = s->planewidth[plane];
+ const int in_linesize = in->linesize[plane];
+ const int slice_start = (height * jobnr) / nb_jobs;
+ const int slice_end = (height * (jobnr+1)) / nb_jobs;
+ const uint8_t *img_data = in->data[plane];
+
+ for(int h = slice_start; h < slice_end; h++)
+ {
+ for (int w = 0; w < width; w++)
+ {
+ s->weight_info[0][INDX2D(h, w, width)] += img_data[ INDX2D(h, w, in_linesize) ] * s->white[plane];
+ s->weight_info[1][INDX2D(h, w, width)] += pow(img_data[ INDX2D(h, w, in_linesize) ],2);
+ }
+ }
+ }
+
+ for (plane = 0; plane < NUM_PLANES; ++plane) {
+ const int height = s->planeheight[plane];
+ const int width = s->planewidth[plane];
+ const int in_linesize = in->linesize[plane];
+ const int slice_start = (height * jobnr) / nb_jobs;
+ const int slice_end = (height * (jobnr+1)) / nb_jobs;
+ const uint8_t *img_data = in->data[plane];
+ const double *src = td->data[INDEX_NORM][plane];
+ double *dst = td->data[INDEX_DST][plane];
+ int r, c;
+
+ dst[jobnr] = 0;
+ if (!minknorm) {
+ for (r = slice_start; r < slice_end; ++r) {
+ for (c = 0; c < width; ++c) {
+
+ double weight = s->weight_info[0][INDX2D(r, c, width)] * s->white[plane];
+ if (s->weight_info[1][INDX2D(r, c, width)] > 0)
+ {
+ weight = weight / s->weight_info[1][INDX2D(r, c, width)];
+ }
+ dst[jobnr] = FFMAX( dst[jobnr], fabs(src[INDX2D(r, c, width)]) * weight
+ * (img_data[INDX2D(r, c, in_linesize)] < thresh) );
+
+ }
+ }
+ } else {
+ for (r = slice_start; r < slice_end; ++r) {
+ for (c = 0; c < width; ++c) {
+ double weight = s->weight_info[0][INDX2D(r, c, width)] * s->white[plane];
+ if (s->weight_info[1][INDX2D(r, c, width)] > 0)
+ {
+ weight = weight / s->weight_info[1][INDX2D(r, c, width)];
+ }
+ dst[jobnr] += ( pow( fabs(src[INDX2D(r, c, width)] / 255.), minknorm)
+ * (img_data[INDX2D(r, c, in_linesize)] < thresh) );
+ }
+ }
+ }
+ }
+ return 0;
+}
+
+/**
+ * Main driver function for weighted grey edge algorithm.
+ *
+ * @param ctx the filter context.
+ * @param in holds the input frame.
+ * @param out holds the output frame.
+ *
+ * AVERROR code if any error has occured.
+ */
+static int filter_weighted_greyedge(AVFilterContext *ctx, AVFrame *in, AVFrame *out)
+{
+ ColorConstancyContext *s = ctx->priv;
+ ThreadData td;
+ int minknorm = s->minknorm;
+ int difford = s->difford;
+ double *white = s->white;
+ int nb_jobs = FFMIN3(s->planeheight[1], s->planewidth[1], s->nb_threads);
+ int num_iters = 0;
+ int plane, job, ret, height_max, width_max;
+
+ td.in = in;
+ ret = setup_derivative_buffers(ctx, &td);
+ if (ret) {
+ return ret;
+ }
+
+ height_max = FFMAX3(s->planeheight[0], s->planeheight[1], s->planeheight[2]);
+ width_max = FFMAX3(s->planewidth[0], s->planewidth[1], s->planewidth[2]);
+
+ s->weight_info[0] = av_mallocz_array(height_max * width_max, sizeof(double));
+ s->weight_info[1] = av_mallocz_array(height_max * width_max, sizeof(double));
+
+ while( num_iters < s->max_iters )
+ {
+ get_derivative(ctx, &td);
+ if (difford > 0) {
+ ctx->internal->execute(ctx, slice_normalize, &td, NULL, nb_jobs);
+ }
+
+ ctx->internal->execute(ctx, filter_slice_weighted_greyedge, &td, NULL, nb_jobs);
+ if (!minknorm) {
+ for (plane = 0; plane < NUM_PLANES; ++plane) {
+ white[plane] = 0; // All values are absolute
+ for (job = 0; job < nb_jobs; ++job) {
+ white[plane] = FFMAX(white[plane] , td.data[INDEX_DST][plane][job]);
+ }
+ }
+ } else {
+ for (plane = 0; plane < NUM_PLANES; ++plane) {
+ white[plane] = 0;
+ for (job = 0; job < nb_jobs; ++job) {
+ white[plane] += td.data[INDEX_DST][plane][job];
+ }
+ white[plane] = pow(white[plane], 1./minknorm);
+ }
+ }
+
+ normalize_light(white);
+
+ chromatic_adaptation(ctx, in, out);
+
+ num_iters++;
+ //[TODO] break if angular error <= min_err
+ }
+
+ cleanup_derivative_buffers(&td, difford + 1, NUM_PLANES);
+ return 0;
+}
+
static int query_formats(AVFilterContext *ctx)
{
static const enum AVPixelFormat pix_fmts[] = {
@@ -661,7 +808,7 @@ static int config_props(AVFilterLink *inlink)
}
s->filtersize = 2 * floor(break_off_sigma * sigma + 0.5) + 1;
- if (ret=set_gauss(ctx)) {
+ if (ret = set_gauss(ctx)) {
return ret;
}
@@ -682,12 +829,6 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
int ret;
int direct = 0;
- ret = illumination_estimation(ctx, in);
- if (ret) {
- av_frame_free(&in);
- return ret;
- }
-
if (av_frame_is_writable(in)) {
direct = 1;
out = in;
@@ -699,10 +840,32 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
}
av_frame_copy_props(out, in);
}
- chromatic_adaptation(ctx, in, out);
+
+ if(!strcmp(ctx->filter->name, GREY_EDGE))
+ {
+ ColorConstancyContext *s = ctx->priv;
+ ret = filter_grey_edge(ctx, in);
+
+ normalize_light(s->white);
+
+ if (ret) {
+ av_frame_free(&in);
+ return ret;
+ }
+ chromatic_adaptation(ctx, in, out);
+ }
+ else if (!strcmp(ctx->filter->name, WEIGHTED_GREY_EDGE))
+ {
+ ret = filter_weighted_greyedge(ctx, in, out);
+ if (ret)
+ {
+ av_frame_free(&in);
+ return ret;
+ }
+ }
if (!direct)
- av_frame_free(&in);
+ av_frame_free(&in);
return ff_filter_frame(outlink, out);
}
@@ -716,6 +879,12 @@ static av_cold void uninit(AVFilterContext *ctx)
for (i = 0; i <= difford; ++i) {
av_freep(&s->gauss[i]);
}
+
+ if (!strcmp(ctx->filter->name, WEIGHTED_GREY_EDGE))
+ {
+ av_freep( &s->weight_info[0] );
+ av_freep( &s->weight_info[1] );
+ }
}
static const AVFilterPad colorconstancy_inputs[] = {
@@ -760,3 +929,30 @@ AVFilter ff_vf_greyedge = {
};
#endif /* CONFIG_GREY_EDGE_FILTER */
+
+#if CONFIG_WEIGHTED_GREYEDGE_FILTER
+
+static const AVOption weighted_greyedge_options[] = {
+ { "difford", "set differentiation order", OFFSET(difford), AV_OPT_TYPE_INT, {.i64=1}, 0, 2, FLAGS },
+ { "minknorm", "set Minkowski norm", OFFSET(minknorm), AV_OPT_TYPE_INT, {.i64=1}, 0, 20, FLAGS },
+ { "sigma", "set sigma", OFFSET(sigma), AV_OPT_TYPE_DOUBLE, {.dbl=1}, 0.0, 1024.0, FLAGS },
+ { "min_err", "set minimum angular error", OFFSET(min_err), AV_OPT_TYPE_DOUBLE, {.dbl=0.1}, 0.02, M_PI, FLAGS },
+ { "max_iters", "set the maximum iterations", OFFSET(max_iters), AV_OPT_TYPE_INT, {.i64=10}, 1, 100, FLAGS },
+ { NULL }
+};
+
+AVFILTER_DEFINE_CLASS(weighted_greyedge);
+
+AVFilter ff_vf_weighted_greyedge = {
+ .name = WEIGHTED_GREY_EDGE,
+ .description = NULL_IF_CONFIG_SMALL("Estimates scene illumination by grey edge assumption."),
+ .priv_size = sizeof(ColorConstancyContext),
+ .priv_class = &weighted_greyedge_class,
+ .query_formats = query_formats,
+ .uninit = uninit,
+ .inputs = colorconstancy_inputs,
+ .outputs = colorconstancy_outputs,
+ .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS,
+};
+
+#endif /* CONFIG_WEIGHTED_GREY_EDGE_FILTER */
--
2.20.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
