diff options
| author | Stefano Sabatini <stefasab@gmail.com> | 2012-10-30 20:14:07 +0100 |
|---|---|---|
| committer | Stefano Sabatini <stefasab@gmail.com> | 2012-10-31 12:14:21 +0100 |
| commit | 1b3fdd9731012a4ae2d5b3ee5460c910d808da8e (patch) | |
| tree | 61e86b2968c7e19830a6a32e498ffb3533c5b24e /libavfilter | |
| parent | 652fab5996a3e283df69ed51132745ba45086251 (diff) | |
| download | ffmpeg-1b3fdd9731012a4ae2d5b3ee5460c910d808da8e.tar.gz | |
lavfi/drawbox: implement color=invert mode
Based on a libmpcodecs/vf_rectangle.c feature.
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/version.h | 2 | ||||
| -rw-r--r-- | libavfilter/vf_drawbox.c | 12 |
2 files changed, 12 insertions, 2 deletions
diff --git a/libavfilter/version.h b/libavfilter/version.h index 0bfae301ee..cb7b2a424e 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -30,7 +30,7 @@ #define LIBAVFILTER_VERSION_MAJOR 3 #define LIBAVFILTER_VERSION_MINOR 21 -#define LIBAVFILTER_VERSION_MICRO 101 +#define LIBAVFILTER_VERSION_MICRO 102 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ LIBAVFILTER_VERSION_MINOR, \ diff --git a/libavfilter/vf_drawbox.c b/libavfilter/vf_drawbox.c index a93620fd1b..ef1bc32ca5 100644 --- a/libavfilter/vf_drawbox.c +++ b/libavfilter/vf_drawbox.c @@ -41,6 +41,7 @@ typedef struct { int x, y, w, h; char *color_str; unsigned char yuv_color[4]; + int invert_color; ///< invert luma color int vsub, hsub; ///< chroma subsampling } DrawBoxContext; @@ -72,7 +73,9 @@ static av_cold int init(AVFilterContext *ctx, const char *args) if ((ret = av_opt_set_from_string(drawbox, args, shorthand, "=", ":")) < 0) return ret; - if (av_parse_color(rgba_color, drawbox->color_str, -1, ctx) < 0) + if (!strcmp(drawbox->color_str, "invert")) + drawbox->invert_color = 1; + else if (av_parse_color(rgba_color, drawbox->color_str, -1, ctx) < 0) return AVERROR(EINVAL); drawbox->yuv_color[Y] = RGB_TO_Y_CCIR(rgba_color[0], rgba_color[1], rgba_color[2]); @@ -135,6 +138,12 @@ static int draw_slice(AVFilterLink *inlink, int y0, int h, int slice_dir) row[plane] = picref->data[plane] + picref->linesize[plane] * (y >> drawbox->vsub); + if (drawbox->invert_color) { + for (x = FFMAX(xb, 0); x < (xb + drawbox->w) && x < picref->video->w; x++) + if ((y - yb < 3) || (yb + drawbox->h - y < 4) || + (x - xb < 3) || (xb + drawbox->w - x < 4)) + row[0][x] = 0xff - row[0][x]; + } else { for (x = FFMAX(xb, 0); x < (xb + drawbox->w) && x < picref->video->w; x++) { double alpha = (double)drawbox->yuv_color[A] / 255; @@ -145,6 +154,7 @@ static int draw_slice(AVFilterLink *inlink, int y0, int h, int slice_dir) row[2][x >> drawbox->hsub] = (1 - alpha) * row[2][x >> drawbox->hsub] + alpha * drawbox->yuv_color[V]; } } + } } return ff_draw_slice(inlink->dst->outputs[0], y0, h, 1); |