diff options
| author | Paul B Mahol <onemda@gmail.com> | 2018-05-03 15:05:51 +0200 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2018-05-04 21:34:49 +0200 |
| commit | d122c8b1028bb713c6c0cdb45d477f43b62d2436 (patch) | |
| tree | 38cd36572923a80737f10221b2a6f1eb73e33fd9 | |
| parent | aba39cc1f18faf68cf287032516c8ee4efb709b4 (diff) | |
| download | ffmpeg-d122c8b1028bb713c6c0cdb45d477f43b62d2436.tar.gz | |
avfilter/vf_edgedetect: add canny mode
Signed-off-by: Paul B Mahol <onemda@gmail.com>
| -rw-r--r-- | doc/filters.texi | 3 | ||||
| -rw-r--r-- | libavfilter/vf_edgedetect.c | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/doc/filters.texi b/doc/filters.texi index a0826f2f5d..49c61dd144 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -8276,6 +8276,9 @@ Draw white/gray wires on black background. @item colormix Mix the colors to create a paint/cartoon effect. + +@item canny +Apply Canny edge detector on all selected planes. @end table Default value is @var{wires}. diff --git a/libavfilter/vf_edgedetect.c b/libavfilter/vf_edgedetect.c index 173f9fe161..534a302d90 100644 --- a/libavfilter/vf_edgedetect.c +++ b/libavfilter/vf_edgedetect.c @@ -35,6 +35,7 @@ enum FilterMode { MODE_WIRES, MODE_COLORMIX, + MODE_CANNY, NB_MODE }; @@ -61,6 +62,7 @@ static const AVOption edgedetect_options[] = { { "mode", "set mode", OFFSET(mode), AV_OPT_TYPE_INT, {.i64=MODE_WIRES}, 0, NB_MODE-1, FLAGS, "mode" }, { "wires", "white/gray wires on black", 0, AV_OPT_TYPE_CONST, {.i64=MODE_WIRES}, INT_MIN, INT_MAX, FLAGS, "mode" }, { "colormix", "mix colors", 0, AV_OPT_TYPE_CONST, {.i64=MODE_COLORMIX}, INT_MIN, INT_MAX, FLAGS, "mode" }, + { "canny", "detect edges on planes", 0, AV_OPT_TYPE_CONST, {.i64=MODE_CANNY}, INT_MIN, INT_MAX, FLAGS, "mode" }, { NULL } }; @@ -79,6 +81,7 @@ static int query_formats(AVFilterContext *ctx) { const EdgeDetectContext *edgedetect = ctx->priv; static const enum AVPixelFormat wires_pix_fmts[] = {AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE}; + static const enum AVPixelFormat canny_pix_fmts[] = {AV_PIX_FMT_YUV444P, AV_PIX_FMT_GBRP, AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE}; static const enum AVPixelFormat colormix_pix_fmts[] = {AV_PIX_FMT_GBRP, AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE}; AVFilterFormats *fmts_list; const enum AVPixelFormat *pix_fmts = NULL; @@ -87,6 +90,8 @@ static int query_formats(AVFilterContext *ctx) pix_fmts = wires_pix_fmts; } else if (edgedetect->mode == MODE_COLORMIX) { pix_fmts = colormix_pix_fmts; + } else if (edgedetect->mode == MODE_CANNY) { + pix_fmts = canny_pix_fmts; } else { av_assert0(0); } |