videolan/ffmpeg
1
Fork 0
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-10-02 17:12:49 +02:00
Code Releases Activity

avfilter/vf_edgedetect: add more formats support to canny mode

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2018-05-03 15:39:06 +02:00
parent 0bcc66571a
commit 20c83be27a
1 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
libavfilter/vf_edgedetect.c
View File

@ -52,6 +52,7 @@ struct plane_info {
uint8_t *tmpbuf; uint8_t *tmpbuf;
uint16_t *gradients; uint16_t *gradients;
char *directions; char *directions;
int width, height;
}; };
typedef struct EdgeDetectContext { typedef struct EdgeDetectContext {
@ -98,7 +99,7 @@ static int query_formats(AVFilterContext *ctx)
{ {
const EdgeDetectContext *edgedetect = ctx->priv; const EdgeDetectContext *edgedetect = ctx->priv;
static const enum AVPixelFormat wires_pix_fmts[] = {AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE}; 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 canny_pix_fmts[] = {AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, 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}; static const enum AVPixelFormat colormix_pix_fmts[] = {AV_PIX_FMT_GBRP, AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE};
AVFilterFormats *fmts_list; AVFilterFormats *fmts_list;
const enum AVPixelFormat *pix_fmts = NULL; const enum AVPixelFormat *pix_fmts = NULL;
@ -123,14 +124,19 @@ static int config_props(AVFilterLink *inlink)
int p; int p;
AVFilterContext *ctx = inlink->dst; AVFilterContext *ctx = inlink->dst;
EdgeDetectContext *edgedetect = ctx->priv; EdgeDetectContext *edgedetect = ctx->priv;
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format);
edgedetect->nb_planes = inlink->format == AV_PIX_FMT_GRAY8 ? 1 : 3; edgedetect->nb_planes = inlink->format == AV_PIX_FMT_GRAY8 ? 1 : 3;
for (p = 0; p < edgedetect->nb_planes; p++) { for (p = 0; p < edgedetect->nb_planes; p++) {
struct plane_info *plane = &edgedetect->planes[p]; struct plane_info *plane = &edgedetect->planes[p];
int vsub = p ? desc->log2_chroma_h : 0;
int hsub = p ? desc->log2_chroma_w : 0;
plane->tmpbuf = av_malloc(inlink->w * inlink->h); plane->width = AV_CEIL_RSHIFT(inlink->w, hsub);
plane->gradients = av_calloc(inlink->w * inlink->h, sizeof(*plane->gradients)); plane->height = AV_CEIL_RSHIFT(inlink->h, vsub);
plane->directions = av_malloc(inlink->w * inlink->h); plane->tmpbuf = av_malloc(plane->width * plane->height);
plane->gradients = av_calloc(plane->width * plane->height, sizeof(*plane->gradients));
plane->directions = av_malloc(plane->width * plane->height);
if (!plane->tmpbuf || !plane->gradients || !plane->directions) if (!plane->tmpbuf || !plane->gradients || !plane->directions)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
@ -338,42 +344,44 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
uint8_t *tmpbuf = plane->tmpbuf; uint8_t *tmpbuf = plane->tmpbuf;
uint16_t *gradients = plane->gradients; uint16_t *gradients = plane->gradients;
int8_t *directions = plane->directions; int8_t *directions = plane->directions;
const int width = plane->width;
const int height = plane->height;
if (!((1 << p) & edgedetect->filter_planes)) { if (!((1 << p) & edgedetect->filter_planes)) {
if (!direct) if (!direct)
av_image_copy_plane(out->data[p], out->linesize[p], av_image_copy_plane(out->data[p], out->linesize[p],
in->data[p], in->linesize[p], in->data[p], in->linesize[p],
inlink->w, inlink->h); width, height);
continue; continue;
} }
/* gaussian filter to reduce noise */ /* gaussian filter to reduce noise */
gaussian_blur(ctx, inlink->w, inlink->h, gaussian_blur(ctx, width, height,
tmpbuf, inlink->w, tmpbuf, width,
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(width, height,
gradients, inlink->w, gradients, width,
directions,inlink->w, directions,width,
tmpbuf, inlink->w); tmpbuf, width);
/* 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, width * height);
non_maximum_suppression(inlink->w, inlink->h, non_maximum_suppression(width, height,
tmpbuf, inlink->w, tmpbuf, width,
directions,inlink->w, directions,width,
gradients, inlink->w); gradients, width);
/* 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, width, height,
out->data[p], out->linesize[p], out->data[p], out->linesize[p],
tmpbuf, inlink->w); tmpbuf, width);
if (edgedetect->mode == MODE_COLORMIX) { if (edgedetect->mode == MODE_COLORMIX) {
color_mix(inlink->w, inlink->h, color_mix(width, height,
out->data[p], out->linesize[p], out->data[p], out->linesize[p],
in->data[p], in->linesize[p]); in->data[p], in->linesize[p]);
} }