avfilter/vf_xmedian: remove limitation of only odd number of inputs

diff --git a/doc/filters.texi b/doc/filters.texi
index 6e2dedaf0e52b146c8891b04c52a3162edec6727..67bafdc7d2513311a82626abe7b88034174eac67 100644 (file)
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -18465,9 +18465,10 @@ Pick median pixels from several input videos.
 The filter accept the following options:
 
 @table @option
-@item nb_inputs
-Set number of inputs. This must be odd number.
+@item inputs
+Set number of inputs.
 Default is 3. Allowed range is from 3 to 255.
+If number of inputs is even number, than result will be mean value between two median values.
 
 @item planes
 Set which planes to filter. Default value is @code{15}, by which all planes are processed.

diff --git a/libavfilter/vf_xmedian.c b/libavfilter/vf_xmedian.c
index ae61e18098b2b49a7f69f4447e2d8c27e1095961..672b3a7e78ae19d0dd47a766ea26129bc4e59e90 100644 (file)
--- a/libavfilter/vf_xmedian.c
+++ b/libavfilter/vf_xmedian.c
@@ -88,10 +88,6 @@ static av_cold int init(AVFilterContext *ctx)
     XMedianContext *s = ctx->priv;
     int ret;
 
-    if (!(s->nb_inputs & 1))
-        av_log(s, AV_LOG_WARNING, "nb_intputs: %d is not odd number.\n", s->nb_inputs);
-
-    s->nb_inputs = s->nb_inputs | 1;
     s->radius = s->nb_inputs / 2;
     s->frames = av_calloc(s->nb_inputs, sizeof(*s->frames));
     if (!s->frames)
@@ -156,7 +152,10 @@ static int median_frames16(AVFilterContext *ctx, void *arg, int jobnr, int nb_jo
                 }
 
                 AV_QSORT(values, nb_inputs, int, comparei);
-                dst[x] = values[radius];
+                if (radius & 1)
+                    dst[x] = values[radius];
+                else
+                    dst[x] = (values[radius] + values[radius - 1]) >> 1;
             }
 
             dst += out->linesize[p] / 2;
@@ -195,7 +194,10 @@ static int median_frames8(AVFilterContext *ctx, void *arg, int jobnr, int nb_job
                     values[i] = in[i]->data[p][y * in[i]->linesize[p] + x];
 
                 AV_QSORT(values, nb_inputs, int, comparei);
-                dst[x] = values[radius];
+                if (radius & 1)
+                    dst[x] = values[radius];
+                else
+                    dst[x] = (values[radius] + values[radius - 1]) >> 1;
             }
 
             dst += out->linesize[p];
@@ -319,8 +321,8 @@ static int activate(AVFilterContext *ctx)
 #define FLAGS AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_FILTERING_PARAM
 
 static const AVOption xmedian_options[] = {
-    { "nb_inputs", "set number of inputs", OFFSET(nb_inputs), AV_OPT_TYPE_INT, {.i64=3},  3, 255, .flags = FLAGS },
-    { "planes",    "set planes to filter", OFFSET(planes),    AV_OPT_TYPE_INT, {.i64=15}, 0,  15, .flags = FLAGS },
+    { "inputs", "set number of inputs", OFFSET(nb_inputs), AV_OPT_TYPE_INT, {.i64=3},  3, 255, .flags = FLAGS },
+    { "planes", "set planes to filter", OFFSET(planes),    AV_OPT_TYPE_INT, {.i64=15}, 0,  15, .flags = FLAGS },
     { NULL },
 };