X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavfilter%2Fvf_median.c;h=ee264e1a74c5a74095803218cfe7082296bd68bf;hb=c36e72ed279b072bce325c7a11a85020c0a310fc;hp=37945ec4df56905d902583451b02507cde0bc6e1;hpb=97cf49b7fe1db7e6836e973d789498738357fb83;p=ffmpeg

diff --git a/libavfilter/vf_median.c b/libavfilter/vf_median.c
index 37945ec4df5..ee264e1a74c 100644
--- a/libavfilter/vf_median.c
+++ b/libavfilter/vf_median.c
@@ -54,7 +54,7 @@
 #include "median_template.c"
 
 #define OFFSET(x) offsetof(MedianContext, x)
-#define FLAGS AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_FILTERING_PARAM
+#define FLAGS AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_RUNTIME_PARAM
 
 static const AVOption median_options[] = {
     { "radius", "set median radius",    OFFSET(radius), AV_OPT_TYPE_INT,   {.i64=1},     1,  127, FLAGS },
@@ -110,6 +110,26 @@ static int query_formats(AVFilterContext *ctx)
     return ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
 }
 
+static void check_params(MedianContext *s, AVFilterLink *inlink)
+{
+    for (int i = 0; i < s->nb_planes; i++) {
+        if (!(s->planes & (1 << i)))
+            continue;
+
+        if (s->planewidth[i] < s->radius * 2 + 1) {
+            av_log(inlink->dst, AV_LOG_WARNING, "The %d plane width %d must be not less than %d, clipping radius.\n", i, s->planewidth[i], s->radius * 2 + 1);
+            s->radius = (s->planewidth[i] - 1) / 2;
+        }
+
+        if (s->planeheight[i] < s->radiusV * 2 + 1) {
+            av_log(inlink->dst, AV_LOG_WARNING, "The %d plane height %d must be not less than %d, clipping radiusV.\n", i, s->planeheight[i], s->radiusV * 2 + 1);
+            s->radiusV = (s->planeheight[i] - 1) / 2;
+        }
+    }
+
+    s->t = 2 * s->radius * s->radiusV + 2 * s->radius;
+}
+
 static int config_input(AVFilterLink *inlink)
 {
     const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format);
@@ -123,22 +143,8 @@ static int config_input(AVFilterLink *inlink)
 
     s->radiusV = !s->radiusV ? s->radius : s->radiusV;
     s->nb_planes = av_pix_fmt_count_planes(inlink->format);
-    s->t = 2 * s->radius * s->radiusV + 2 * s->radius;
-
-    for (int i = 0; i < s->nb_planes; i++) {
-        if (!(s->planes & (1 << i)))
-            continue;
 
-        if (s->planewidth[i] < s->radius * 2 + 1) {
-            av_log(inlink->dst, AV_LOG_ERROR, "The %d plane width %d must be not less than %d\n", i, s->planewidth[i], s->radius * 2 + 1);
-            return AVERROR(EINVAL);
-        }
-
-        if (s->planeheight[i] < s->radiusV * 2 + 1) {
-            av_log(inlink->dst, AV_LOG_ERROR, "The %d plane height %d must be not less than %d\n", i, s->planeheight[i], s->radiusV * 2 + 1);
-            return AVERROR(EINVAL);
-        }
-    }
+    check_params(s, inlink);
 
     s->nb_threads = FFMAX(1, FFMIN(s->planeheight[1] / (s->radiusV + 1), ff_filter_get_nb_threads(inlink->dst)));
     s->bins   = 1 << ((s->depth + 1) / 2);
@@ -243,6 +249,23 @@ static av_cold void uninit(AVFilterContext *ctx)
     av_freep(&s->fine);
 }
 
+static int process_command(AVFilterContext *ctx, const char *cmd, const char *args,
+                           char *res, int res_len, int flags)
+{
+    MedianContext *s = ctx->priv;
+    int ret;
+
+    ret = ff_filter_process_command(ctx, cmd, args, res, res_len, flags);
+    if (ret < 0)
+        return ret;
+
+    if (!s->radiusV)
+        s->radiusV = s->radius;
+    check_params(s, ctx->inputs[0]);
+
+    return 0;
+}
+
 static const AVFilterPad median_inputs[] = {
     {
         .name         = "default",
@@ -271,4 +294,5 @@ AVFilter ff_vf_median = {
     .inputs        = median_inputs,
     .outputs       = median_outputs,
     .flags         = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS,
+    .process_command = process_command,
 };