diff options
Diffstat (limited to 'libavfilter/vf_pad.c')
-rw-r--r-- | libavfilter/vf_pad.c | 180 |
1 files changed, 68 insertions, 112 deletions
diff --git a/libavfilter/vf_pad.c b/libavfilter/vf_pad.c index 1e283f6850..7159c37c9a 100644 --- a/libavfilter/vf_pad.c +++ b/libavfilter/vf_pad.c @@ -2,20 +2,20 @@ * Copyright (c) 2008 vmrsss * Copyright (c) 2009 Stefano Sabatini * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -35,6 +35,7 @@ #include "libavutil/colorspace.h" #include "libavutil/avassert.h" #include "libavutil/imgutils.h" +#include "libavutil/opt.h" #include "libavutil/parseutils.h" #include "libavutil/mathematics.h" #include "libavutil/opt.h" @@ -42,9 +43,6 @@ #include "drawutils.h" static const char *const var_names[] = { - "PI", - "PHI", - "E", "in_w", "iw", "in_h", "ih", "out_w", "ow", @@ -52,15 +50,14 @@ static const char *const var_names[] = { "x", "y", "a", + "sar", + "dar", "hsub", "vsub", NULL }; enum var_name { - VAR_PI, - VAR_PHI, - VAR_E, VAR_IN_W, VAR_IW, VAR_IN_H, VAR_IH, VAR_OUT_W, VAR_OW, @@ -68,6 +65,8 @@ enum var_name { VAR_X, VAR_Y, VAR_A, + VAR_SAR, + VAR_DAR, VAR_HSUB, VAR_VSUB, VARS_NB @@ -75,22 +74,7 @@ enum var_name { static int query_formats(AVFilterContext *ctx) { - static const enum AVPixelFormat pix_fmts[] = { - AV_PIX_FMT_ARGB, AV_PIX_FMT_RGBA, - AV_PIX_FMT_ABGR, AV_PIX_FMT_BGRA, - AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24, - - AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV422P, - AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV411P, - AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUV440P, - AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUVJ422P, - AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ440P, - AV_PIX_FMT_YUVA420P, - - AV_PIX_FMT_NONE - }; - - ff_set_common_formats(ctx, ff_make_format_list(pix_fmts)); + ff_set_common_formats(ctx, ff_draw_supported_pixel_formats(0)); return 0; } @@ -105,57 +89,42 @@ typedef struct { char *x_expr; ///< width expression string char *y_expr; ///< height expression string char *color_str; - - uint8_t color[4]; ///< color expressed either in YUVA or RGBA colorspace for the padding area - uint8_t *line[4]; - int line_step[4]; - int hsub, vsub; ///< chroma subsampling values + uint8_t rgba_color[4]; ///< color for the padding area + FFDrawContext draw; + FFDrawColor color; } PadContext; static av_cold int init(AVFilterContext *ctx, const char *args) { PadContext *pad = ctx->priv; - if (av_parse_color(pad->color, pad->color_str, -1, ctx) < 0) + if (av_parse_color(pad->rgba_color, pad->color_str, -1, ctx) < 0) return AVERROR(EINVAL); return 0; } -static av_cold void uninit(AVFilterContext *ctx) -{ - PadContext *pad = ctx->priv; - int i; - - for (i = 0; i < 4; i++) { - av_freep(&pad->line[i]); - pad->line_step[i] = 0; - } -} - static int config_input(AVFilterLink *inlink) { AVFilterContext *ctx = inlink->dst; PadContext *pad = ctx->priv; - const AVPixFmtDescriptor *pix_desc = av_pix_fmt_desc_get(inlink->format); - uint8_t rgba_color[4]; - int ret, is_packed_rgba; + int ret; double var_values[VARS_NB], res; char *expr; - pad->hsub = pix_desc->log2_chroma_w; - pad->vsub = pix_desc->log2_chroma_h; + ff_draw_init(&pad->draw, inlink->format, 0); + ff_draw_color(&pad->draw, &pad->color, pad->rgba_color); - var_values[VAR_PI] = M_PI; - var_values[VAR_PHI] = M_PHI; - var_values[VAR_E] = M_E; var_values[VAR_IN_W] = var_values[VAR_IW] = inlink->w; var_values[VAR_IN_H] = var_values[VAR_IH] = inlink->h; var_values[VAR_OUT_W] = var_values[VAR_OW] = NAN; var_values[VAR_OUT_H] = var_values[VAR_OH] = NAN; var_values[VAR_A] = (double) inlink->w / inlink->h; - var_values[VAR_HSUB] = 1<<pad->hsub; - var_values[VAR_VSUB] = 1<<pad->vsub; + var_values[VAR_SAR] = inlink->sample_aspect_ratio.num ? + (double) inlink->sample_aspect_ratio.num / inlink->sample_aspect_ratio.den : 1; + var_values[VAR_DAR] = var_values[VAR_A] * var_values[VAR_SAR]; + var_values[VAR_HSUB] = 1 << pad->draw.hsub_max; + var_values[VAR_VSUB] = 1 << pad->draw.vsub_max; /* evaluate width and height */ av_expr_parse_and_eval(&res, (expr = pad->w_expr), @@ -202,22 +171,16 @@ static int config_input(AVFilterLink *inlink) if (!pad->h) pad->h = inlink->h; - pad->w &= ~((1 << pad->hsub) - 1); - pad->h &= ~((1 << pad->vsub) - 1); - pad->x &= ~((1 << pad->hsub) - 1); - pad->y &= ~((1 << pad->vsub) - 1); - - pad->in_w = inlink->w & ~((1 << pad->hsub) - 1); - pad->in_h = inlink->h & ~((1 << pad->vsub) - 1); + pad->w = ff_draw_round_to_sub(&pad->draw, 0, -1, pad->w); + pad->h = ff_draw_round_to_sub(&pad->draw, 1, -1, pad->h); + pad->x = ff_draw_round_to_sub(&pad->draw, 0, -1, pad->x); + pad->y = ff_draw_round_to_sub(&pad->draw, 1, -1, pad->y); + pad->in_w = ff_draw_round_to_sub(&pad->draw, 0, -1, inlink->w); + pad->in_h = ff_draw_round_to_sub(&pad->draw, 1, -1, inlink->h); - memcpy(rgba_color, pad->color, sizeof(rgba_color)); - ff_fill_line_with_color(pad->line, pad->line_step, pad->w, pad->color, - inlink->format, rgba_color, &is_packed_rgba, NULL); - - av_log(ctx, AV_LOG_VERBOSE, "w:%d h:%d -> w:%d h:%d x:%d y:%d color:0x%02X%02X%02X%02X[%s]\n", + av_log(ctx, AV_LOG_VERBOSE, "w:%d h:%d -> w:%d h:%d x:%d y:%d color:0x%02X%02X%02X%02X\n", inlink->w, inlink->h, pad->w, pad->h, pad->x, pad->y, - pad->color[0], pad->color[1], pad->color[2], pad->color[3], - is_packed_rgba ? "rgba" : "yuva"); + pad->rgba_color[0], pad->rgba_color[1], pad->rgba_color[2], pad->rgba_color[3]); if (pad->x < 0 || pad->y < 0 || pad->w <= 0 || pad->h <= 0 || @@ -263,11 +226,10 @@ static AVFrame *get_video_buffer(AVFilterLink *inlink, int w, int h) frame->height = h; for (plane = 0; plane < 4 && frame->data[plane]; plane++) { - int hsub = (plane == 1 || plane == 2) ? pad->hsub : 0; - int vsub = (plane == 1 || plane == 2) ? pad->vsub : 0; - - frame->data[plane] += (pad->x >> hsub) * pad->line_step[plane] + - (pad->y >> vsub) * frame->linesize[plane]; + int hsub = pad->draw.hsub[plane]; + int vsub = pad->draw.vsub[plane]; + frame->data[plane] += (pad->x >> hsub) * pad->draw.pixelstep[plane] + + (pad->y >> vsub) * frame->linesize[plane]; } return frame; @@ -288,22 +250,22 @@ static int buffer_needs_copy(PadContext *s, AVFrame *frame, AVBufferRef *buf) /* for each plane in this buffer, check that it can be padded without * going over buffer bounds or other planes */ for (i = 0; i < FF_ARRAY_ELEMS(planes) && planes[i] >= 0; i++) { - int hsub = (planes[i] == 1 || planes[i] == 2) ? s->hsub : 0; - int vsub = (planes[i] == 1 || planes[i] == 2) ? s->vsub : 0; + int hsub = s->draw.hsub[planes[i]]; + int vsub = s->draw.vsub[planes[i]]; uint8_t *start = frame->data[planes[i]]; - uint8_t *end = start + (frame->height >> hsub) * + uint8_t *end = start + (frame->height >> vsub) * frame->linesize[planes[i]]; /* amount of free space needed before the start and after the end * of the plane */ - ptrdiff_t req_start = (s->x >> hsub) * s->line_step[planes[i]] + + ptrdiff_t req_start = (s->x >> hsub) * s->draw.pixelstep[planes[i]] + (s->y >> vsub) * frame->linesize[planes[i]]; ptrdiff_t req_end = ((s->w - s->x - frame->width) >> hsub) * - s->line_step[planes[i]] + + s->draw.pixelstep[planes[i]] + (s->y >> vsub) * frame->linesize[planes[i]]; - if (frame->linesize[planes[i]] < (s->w >> hsub) * s->line_step[planes[i]]) + if (frame->linesize[planes[i]] < (s->w >> hsub) * s->draw.pixelstep[planes[i]]) return 1; if (start - buf->data < req_start || (buf->data + buf->size) - end < req_end) @@ -311,9 +273,9 @@ static int buffer_needs_copy(PadContext *s, AVFrame *frame, AVBufferRef *buf) #define SIGN(x) ((x) > 0 ? 1 : -1) for (j = 0; j < FF_ARRAY_ELEMS(planes) && planes[j] >= 0; j++) { - int hsub1 = (planes[j] == 1 || planes[j] == 2) ? s->hsub : 0; + int vsub1 = s->draw.vsub[planes[j]]; uint8_t *start1 = frame->data[planes[j]]; - uint8_t *end1 = start1 + (frame->height >> hsub1) * + uint8_t *end1 = start1 + (frame->height >> vsub1) * frame->linesize[planes[j]]; if (i == j) continue; @@ -334,7 +296,7 @@ static int frame_needs_copy(PadContext *s, AVFrame *frame) if (!av_frame_is_writable(frame)) return 1; - for (i = 0; i < FF_ARRAY_ELEMS(frame->buf) && frame->buf[i]; i++) + for (i = 0; i < 4 && frame->buf[i]; i++) if (buffer_needs_copy(s, frame, frame->buf[i])) return 1; return 0; @@ -361,41 +323,40 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) int i; out = in; - for (i = 0; i < FF_ARRAY_ELEMS(out->data) && out->data[i]; i++) { - int hsub = (i == 1 || i == 2) ? pad->hsub : 0; - int vsub = (i == 1 || i == 2) ? pad->vsub : 0; - out->data[i] -= (pad->x >> hsub) * pad->line_step[i] + + for (i = 0; i < 4 && out->data[i]; i++) { + int hsub = pad->draw.hsub[i]; + int vsub = pad->draw.vsub[i]; + out->data[i] -= (pad->x >> hsub) * pad->draw.pixelstep[i] + (pad->y >> vsub) * out->linesize[i]; } } /* top bar */ if (pad->y) { - ff_draw_rectangle(out->data, out->linesize, - pad->line, pad->line_step, pad->hsub, pad->vsub, + ff_fill_rectangle(&pad->draw, &pad->color, + out->data, out->linesize, 0, 0, pad->w, pad->y); } /* bottom bar */ if (pad->h > pad->y + pad->in_h) { - ff_draw_rectangle(out->data, out->linesize, - pad->line, pad->line_step, pad->hsub, pad->vsub, + ff_fill_rectangle(&pad->draw, &pad->color, + out->data, out->linesize, 0, pad->y + pad->in_h, pad->w, pad->h - pad->y - pad->in_h); } /* left border */ - ff_draw_rectangle(out->data, out->linesize, pad->line, pad->line_step, - pad->hsub, pad->vsub, 0, pad->y, pad->x, in->height); + ff_fill_rectangle(&pad->draw, &pad->color, out->data, out->linesize, + 0, pad->y, pad->x, in->height); if (needs_copy) { - ff_copy_rectangle(out->data, out->linesize, in->data, in->linesize, - pad->line_step, pad->hsub, pad->vsub, - pad->x, pad->y, 0, in->width, in->height); + ff_copy_rectangle2(&pad->draw, + out->data, out->linesize, in->data, in->linesize, + pad->x, pad->y, 0, 0, in->width, in->height); } /* right border */ - ff_draw_rectangle(out->data, out->linesize, - pad->line, pad->line_step, pad->hsub, pad->vsub, + ff_fill_rectangle(&pad->draw, &pad->color, out->data, out->linesize, pad->x + pad->in_w, pad->y, pad->w - pad->x - pad->in_w, in->height); @@ -408,24 +369,20 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) } #define OFFSET(x) offsetof(PadContext, x) -#define FLAGS AV_OPT_FLAG_VIDEO_PARAM -static const AVOption options[] = { - { "width", "Output video width", OFFSET(w_expr), AV_OPT_TYPE_STRING, { .str = "iw" }, .flags = FLAGS }, - { "height", "Output video height", OFFSET(h_expr), AV_OPT_TYPE_STRING, { .str = "ih" }, .flags = FLAGS }, - { "x", "Horizontal position of the left edge of the input video in the " - "output video", OFFSET(x_expr), AV_OPT_TYPE_STRING, { .str = "0" }, .flags = FLAGS }, - { "y", "Vertical position of the top edge of the input video in the " - "output video", OFFSET(y_expr), AV_OPT_TYPE_STRING, { .str = "0" }, .flags = FLAGS }, - { "color", "Color of the padded area", OFFSET(color_str), AV_OPT_TYPE_STRING, { .str = "black" }, .flags = FLAGS }, +#define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM + +static const AVOption pad_options[] = { + { "width", "set the pad area width expression", OFFSET(w_expr), AV_OPT_TYPE_STRING, {.str = "iw"}, CHAR_MIN, CHAR_MAX, FLAGS }, + { "w", "set the pad area width expression", OFFSET(w_expr), AV_OPT_TYPE_STRING, {.str = "iw"}, CHAR_MIN, CHAR_MAX, FLAGS }, + { "height", "set the pad area height expression", OFFSET(h_expr), AV_OPT_TYPE_STRING, {.str = "ih"}, CHAR_MIN, CHAR_MAX, FLAGS }, + { "h", "set the pad area height expression", OFFSET(h_expr), AV_OPT_TYPE_STRING, {.str = "ih"}, CHAR_MIN, CHAR_MAX, FLAGS }, + { "x", "set the x offset expression for the input image position", OFFSET(x_expr), AV_OPT_TYPE_STRING, {.str = "0"}, CHAR_MIN, CHAR_MAX, FLAGS }, + { "y", "set the y offset expression for the input image position", OFFSET(y_expr), AV_OPT_TYPE_STRING, {.str = "0"}, CHAR_MIN, CHAR_MAX, FLAGS }, + { "color", "set the color of the padded area border", OFFSET(color_str), AV_OPT_TYPE_STRING, {.str = "black"}, .flags = FLAGS }, { NULL }, }; -static const AVClass pad_class = { - .class_name = "pad", - .item_name = av_default_item_name, - .option = options, - .version = LIBAVUTIL_VERSION_INT, -}; +AVFILTER_DEFINE_CLASS(pad); static const AVFilterPad avfilter_vf_pad_inputs[] = { { @@ -454,7 +411,6 @@ AVFilter avfilter_vf_pad = { .priv_size = sizeof(PadContext), .priv_class = &pad_class, .init = init, - .uninit = uninit, .query_formats = query_formats, .inputs = avfilter_vf_pad_inputs, |