|
|
@ -80,9 +80,8 @@ static int query_formats(AVFilterContext *ctx) |
|
|
|
const EdgeDetectContext *edgedetect = ctx->priv; |
|
|
|
const EdgeDetectContext *edgedetect = ctx->priv; |
|
|
|
|
|
|
|
|
|
|
|
if (edgedetect->mode == MODE_WIRES) { |
|
|
|
if (edgedetect->mode == MODE_WIRES) { |
|
|
|
/* TODO: reindent */ |
|
|
|
static const enum AVPixelFormat pix_fmts[] = {AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE}; |
|
|
|
static const enum AVPixelFormat pix_fmts[] = {AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE}; |
|
|
|
ff_set_common_formats(ctx, ff_make_format_list(pix_fmts)); |
|
|
|
ff_set_common_formats(ctx, ff_make_format_list(pix_fmts)); |
|
|
|
|
|
|
|
} else if (edgedetect->mode == MODE_COLORMIX) { |
|
|
|
} else if (edgedetect->mode == MODE_COLORMIX) { |
|
|
|
static const enum AVPixelFormat pix_fmts[] = {AV_PIX_FMT_GBRP, AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE}; |
|
|
|
static const enum AVPixelFormat pix_fmts[] = {AV_PIX_FMT_GBRP, AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE}; |
|
|
|
ff_set_common_formats(ctx, ff_make_format_list(pix_fmts)); |
|
|
|
ff_set_common_formats(ctx, ff_make_format_list(pix_fmts)); |
|
|
@ -313,31 +312,30 @@ 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; |
|
|
|
|
|
|
|
|
|
|
|
/* TODO: reindent */ |
|
|
|
/* 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, |
|
|
|
in->data[p], in->linesize[p]); |
|
|
|
in->data[p], in->linesize[p]); |
|
|
|
|
|
|
|
|
|
|
|
/* compute the 16-bits gradients and directions for the next step */ |
|
|
|
/* compute the 16-bits gradients and directions for the next step */ |
|
|
|
sobel(inlink->w, inlink->h, |
|
|
|
sobel(inlink->w, inlink->h, |
|
|
|
gradients, inlink->w, |
|
|
|
gradients, inlink->w, |
|
|
|
directions,inlink->w, |
|
|
|
directions,inlink->w, |
|
|
|
tmpbuf, inlink->w); |
|
|
|
tmpbuf, inlink->w); |
|
|
|
|
|
|
|
|
|
|
|
/* non_maximum_suppression() will actually keep & clip what's necessary and
|
|
|
|
/* non_maximum_suppression() will actually keep & clip what's necessary and
|
|
|
|
* ignore the rest, so we need a clean output buffer */ |
|
|
|
* ignore the rest, so we need a clean output buffer */ |
|
|
|
memset(tmpbuf, 0, inlink->w * inlink->h); |
|
|
|
memset(tmpbuf, 0, inlink->w * inlink->h); |
|
|
|
non_maximum_suppression(inlink->w, inlink->h, |
|
|
|
non_maximum_suppression(inlink->w, inlink->h, |
|
|
|
tmpbuf, inlink->w, |
|
|
|
tmpbuf, inlink->w, |
|
|
|
directions,inlink->w, |
|
|
|
directions,inlink->w, |
|
|
|
gradients, inlink->w); |
|
|
|
gradients, inlink->w); |
|
|
|
|
|
|
|
|
|
|
|
/* keep high values, or low values surrounded by high values */ |
|
|
|
/* keep high values, or low values surrounded by high values */ |
|
|
|
double_threshold(edgedetect->low_u8, edgedetect->high_u8, |
|
|
|
double_threshold(edgedetect->low_u8, edgedetect->high_u8, |
|
|
|
inlink->w, inlink->h, |
|
|
|
inlink->w, inlink->h, |
|
|
|
out->data[p], out->linesize[p], |
|
|
|
out->data[p], out->linesize[p], |
|
|
|
tmpbuf, inlink->w); |
|
|
|
tmpbuf, inlink->w); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (edgedetect->mode == MODE_COLORMIX) { |
|
|
|
if (edgedetect->mode == MODE_COLORMIX) { |
|
|
|
color_mix(inlink->w, inlink->h, |
|
|
|
color_mix(inlink->w, inlink->h, |
|
|
|