Commit 0bcc6657 authored by Paul B Mahol's avatar Paul B Mahol

avfilter/vf_edgedetect: add planes option

Signed-off-by: 's avatarPaul B Mahol <onemda@gmail.com>
parent d122c8b1
...@@ -8280,8 +8280,10 @@ Mix the colors to create a paint/cartoon effect. ...@@ -8280,8 +8280,10 @@ Mix the colors to create a paint/cartoon effect.
@item canny @item canny
Apply Canny edge detector on all selected planes. Apply Canny edge detector on all selected planes.
@end table @end table
Default value is @var{wires}. Default value is @var{wires}.
@item planes
Select planes for filtering. By default all available planes are filtered.
@end table @end table
@subsection Examples @subsection Examples
......
...@@ -26,12 +26,21 @@ ...@@ -26,12 +26,21 @@
*/ */
#include "libavutil/avassert.h" #include "libavutil/avassert.h"
#include "libavutil/imgutils.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "avfilter.h" #include "avfilter.h"
#include "formats.h" #include "formats.h"
#include "internal.h" #include "internal.h"
#include "video.h" #include "video.h"
#define PLANE_R 0x4
#define PLANE_G 0x1
#define PLANE_B 0x2
#define PLANE_Y 0x1
#define PLANE_U 0x2
#define PLANE_V 0x4
#define PLANE_A 0x8
enum FilterMode { enum FilterMode {
MODE_WIRES, MODE_WIRES,
MODE_COLORMIX, MODE_COLORMIX,
...@@ -48,6 +57,7 @@ struct plane_info { ...@@ -48,6 +57,7 @@ struct plane_info {
typedef struct EdgeDetectContext { typedef struct EdgeDetectContext {
const AVClass *class; const AVClass *class;
struct plane_info planes[3]; struct plane_info planes[3];
int filter_planes;
int nb_planes; int nb_planes;
double low, high; double low, high;
uint8_t low_u8, high_u8; uint8_t low_u8, high_u8;
...@@ -63,6 +73,13 @@ static const AVOption edgedetect_options[] = { ...@@ -63,6 +73,13 @@ static const AVOption edgedetect_options[] = {
{ "wires", "white/gray wires on black", 0, AV_OPT_TYPE_CONST, {.i64=MODE_WIRES}, INT_MIN, INT_MAX, 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" }, { "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" }, { "canny", "detect edges on planes", 0, AV_OPT_TYPE_CONST, {.i64=MODE_CANNY}, INT_MIN, INT_MAX, FLAGS, "mode" },
{ "planes", "set planes to filter", OFFSET(filter_planes), AV_OPT_TYPE_FLAGS, {.i64=7}, 1, 0x7, FLAGS, "flags" },
{ "y", "filter luma plane", 0, AV_OPT_TYPE_CONST, {.i64=PLANE_Y}, 0, 0, FLAGS, "flags" },
{ "u", "filter u plane", 0, AV_OPT_TYPE_CONST, {.i64=PLANE_U}, 0, 0, FLAGS, "flags" },
{ "v", "filter v plane", 0, AV_OPT_TYPE_CONST, {.i64=PLANE_V}, 0, 0, FLAGS, "flags" },
{ "r", "filter red plane", 0, AV_OPT_TYPE_CONST, {.i64=PLANE_R}, 0, 0, FLAGS, "flags" },
{ "g", "filter green plane", 0, AV_OPT_TYPE_CONST, {.i64=PLANE_G}, 0, 0, FLAGS, "flags" },
{ "b", "filter blue plane", 0, AV_OPT_TYPE_CONST, {.i64=PLANE_B}, 0, 0, FLAGS, "flags" },
{ NULL } { NULL }
}; };
...@@ -322,6 +339,14 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) ...@@ -322,6 +339,14 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
uint16_t *gradients = plane->gradients; uint16_t *gradients = plane->gradients;
int8_t *directions = plane->directions; int8_t *directions = plane->directions;
if (!((1 << p) & edgedetect->filter_planes)) {
if (!direct)
av_image_copy_plane(out->data[p], out->linesize[p],
in->data[p], in->linesize[p],
inlink->w, inlink->h);
continue;
}
/* gaussian filter to reduce noise */ /* gaussian filter to reduce noise */
gaussian_blur(ctx, inlink->w, inlink->h, gaussian_blur(ctx, inlink->w, inlink->h,
tmpbuf, inlink->w, tmpbuf, inlink->w,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment