avfilter/vf_morpho: add gradient operation type

Paul B Mahol committed 5 years ago

Commit b4626da1 parent d619e822 files · +38 −0Browse files

Unified · Split

2 files

doc/filters.texi +1 −0
libavfilter/vf_morpho.c +37 −0

@@ -15374,6 +15374,7 @@ Set morphological transform to apply, can be: · 15373 unmodified lines
15374	@item dilate	15374	@item dilate
15375	@item open	15375	@item open
15376	@item close	15376	@item close
		15377	@item gradient
15377	@end table	15378	@end table
15378	Default is @code{erode}.	15379	Default is @code{erode}.
15379		15380

libavfilter/vf_morpho.c+37−0

     DILATE,
     OPEN,
     CLOSE,
+    GRADIENT,
     NB_MODES
 };
     void (*min_out_place)(uint8_t *c, const uint8_t *a, const uint8_t *b, int x);
     void (*max_in_place)(uint8_t *a, const uint8_t *b, int x);
     void (*min_in_place)(uint8_t *a, const uint8_t *b, int x);
+    void (*diff_in_place)(uint8_t *a, const uint8_t *b, int x);
 } IPlane;
 typedef struct LUT {
     { "dilate", NULL,                                         0,                  AV_OPT_TYPE_CONST, {.i64=DILATE}, 0,  0, FLAGS, "mode" },
     { "open",   NULL,                                         0,                  AV_OPT_TYPE_CONST, {.i64=OPEN},   0,  0, FLAGS, "mode" },
     { "close",  NULL,                                         0,                  AV_OPT_TYPE_CONST, {.i64=CLOSE},  0,  0, FLAGS, "mode" },
+    { "gradient",NULL,                                        0,                  AV_OPT_TYPE_CONST, {.i64=GRADIENT},0, 0, FLAGS, "mode" },
     { "planes",  "set planes to filter",                      OFFSET(planes),     AV_OPT_TYPE_INT,   {.i64=7}, 0, 15, FLAGS },
     { "structure", "when to process structures",              OFFSET(structures), AV_OPT_TYPE_INT,   {.i64=1}, 0,  1, FLAGS, "str" },
     {   "first", "process only first structure, ignore rest", 0,                  AV_OPT_TYPE_CONST, {.i64=0}, 0,  0, FLAGS, "str" },
         a[i] = FFMAX(a[i], b[i]);
 }
+static void diffinplace_fun(uint8_t *a, const uint8_t *b, int x)
+{
+    for (int i = 0; i < x; i++)
+        a[i] -= b[i];
+}
 static void min16_fun(uint8_t *cc, const uint8_t *aa, const uint8_t *bb, int x)
 {
     const uint16_t *a = (const uint16_t *)aa;
         a[i] = FFMIN(a[i], b[i]);
 }
+static void diffinplace16_fun(uint8_t *aa, const uint8_t *bb, int x)
+{
+    uint16_t *a = (uint16_t *)aa;
+    const uint16_t *b = (const uint16_t *)bb;
+    for (int i = 0; i < x; i++)
+        a[i] -= b[i];
+}
 static void max16_fun(uint8_t *cc, const uint8_t *aa, const uint8_t *bb, int x)
 {
     const uint16_t *a = (const uint16_t *)aa;
     return 0;
 }
+static void gradient(IPlane *g, IPlane *f)
+{
+    for (int y = 0; y < f->h; y++)
+        f->diff_in_place(g->img[y], f->img[y], f->w);
+}
 static int insert_chord_set(chord_set *chords, chord c)
 {
     // Checking if chord fits in dynamic array, resize if not.
     imp->min_out_place = type_size == 1 ? min_fun : min16_fun;
     imp->max_in_place = type_size == 1 ? maxinplace_fun : maxinplace16_fun;
     imp->min_in_place = type_size == 1 ? mininplace_fun : mininplace16_fun;
+    imp->diff_in_place = type_size == 1 ? diffinplace_fun : diffinplace16_fun;
     for (int y = 0; y < h; y++)
         imp->img[y] = (uint8_t *)dst + y * dst_linesize;
                 break;
             ret = erode(&s->g[p], &s->h[p], &s->SE[p], &s->Ty[1][p]);
             break;
+        case GRADIENT:
+            ret = read_iplane(&s->h[p], s->temp->data[p], s->temp->linesize[p], width, height, 1, type_size, depth);
+            if (ret < 0)
+                break;
+            ret = dilate(&s->g[p], &s->f[p], &s->SE[p], &s->Ty[0][p]);
+            if (ret < 0)
+                break;
+            ret = erode(&s->h[p], &s->f[p], &s->SE[p], &s->Ty[1][p]);
+            if (ret < 0)
+                return ret;
+            gradient(&s->g[p], &s->h[p]);
+            break;
         default:
             av_assert0(0);
         }

avfilter/vf_morpho: add gradient operation type

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code