/*
- * copyright (c) 2008 vmrsss
- * copyright (c) 2009 Stefano Sabatini
+ * Copyright (c) 2008 vmrsss
+ * Copyright (c) 2009 Stefano Sabatini
*
- * This file is part of FFmpeg.
+ * This file is part of Libav.
*
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav 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.
*
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav 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 FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
/**
* @file
- * video padding filter and color source
+ * video padding filter
*/
#include "avfilter.h"
-#include "parseutils.h"
+#include "formats.h"
+#include "internal.h"
+#include "video.h"
+#include "libavutil/avstring.h"
+#include "libavutil/common.h"
+#include "libavutil/eval.h"
#include "libavutil/pixdesc.h"
#include "libavutil/colorspace.h"
-#include "libavcodec/avcodec.h"
-
-enum { RED = 0, GREEN, BLUE, ALPHA };
-
-static int fill_line_with_color(uint8_t *line[4], int line_step[4], int w, uint8_t color[4],
- enum PixelFormat pix_fmt, uint8_t rgba_color[4], int *is_packed_rgba)
-{
- uint8_t rgba_map[4] = {0};
- int i;
- const AVPixFmtDescriptor *pix_desc = &av_pix_fmt_descriptors[pix_fmt];
- int hsub = pix_desc->log2_chroma_w;
-
- *is_packed_rgba = 1;
- switch (pix_fmt) {
- case PIX_FMT_ARGB: rgba_map[ALPHA] = 0; rgba_map[RED ] = 1; rgba_map[GREEN] = 2; rgba_map[BLUE ] = 3; break;
- case PIX_FMT_ABGR: rgba_map[ALPHA] = 0; rgba_map[BLUE ] = 1; rgba_map[GREEN] = 2; rgba_map[RED ] = 3; break;
- case PIX_FMT_RGBA:
- case PIX_FMT_RGB24: rgba_map[RED ] = 0; rgba_map[GREEN] = 1; rgba_map[BLUE ] = 2; rgba_map[ALPHA] = 3; break;
- case PIX_FMT_BGRA:
- case PIX_FMT_BGR24: rgba_map[BLUE ] = 0; rgba_map[GREEN] = 1; rgba_map[RED ] = 2; rgba_map[ALPHA] = 3; break;
- default:
- *is_packed_rgba = 0;
- }
-
- if (*is_packed_rgba) {
- line_step[0] = (av_get_bits_per_pixel(pix_desc))>>3;
- for (i = 0; i < 4; i++)
- color[rgba_map[i]] = rgba_color[i];
-
- line[0] = av_malloc(w * line_step[0]);
- for (i = 0; i < w; i++)
- memcpy(line[0] + i * line_step[0], color, line_step[0]);
- } else {
- int plane;
-
- color[RED ] = RGB_TO_Y_CCIR(rgba_color[0], rgba_color[1], rgba_color[2]);
- color[GREEN] = RGB_TO_U_CCIR(rgba_color[0], rgba_color[1], rgba_color[2], 0);
- color[BLUE ] = RGB_TO_V_CCIR(rgba_color[0], rgba_color[1], rgba_color[2], 0);
- color[ALPHA] = rgba_color[3];
-
- for (plane = 0; plane < 4; plane++) {
- int line_size;
- int hsub1 = (plane == 1 || plane == 2) ? hsub : 0;
-
- line_step[plane] = 1;
- line_size = (w >> hsub1) * line_step[plane];
- line[plane] = av_malloc(line_size);
- memset(line[plane], color[plane], line_size);
- }
- }
-
- return 0;
-}
-
-static void draw_rectangle(AVFilterPicRef *outpic, uint8_t *line[4], int line_step[4],
- int hsub, int vsub, int x, int y, int w, int h)
-{
- int i, plane;
- uint8_t *p;
-
- for (plane = 0; plane < 4 && outpic->data[plane]; plane++) {
- int hsub1 = plane == 1 || plane == 2 ? hsub : 0;
- int vsub1 = plane == 1 || plane == 2 ? vsub : 0;
+#include "libavutil/avassert.h"
+#include "libavutil/imgutils.h"
+#include "libavutil/parseutils.h"
+#include "libavutil/mathematics.h"
+#include "drawutils.h"
+
+static const char *const var_names[] = {
+ "PI",
+ "PHI",
+ "E",
+ "in_w", "iw",
+ "in_h", "ih",
+ "out_w", "ow",
+ "out_h", "oh",
+ "x",
+ "y",
+ "a",
+ "hsub",
+ "vsub",
+ NULL
+};
- p = outpic->data[plane] + (y >> vsub1) * outpic->linesize[plane];
- for (i = 0; i < (h >> vsub1); i++) {
- memcpy(p + (x >> hsub1) * line_step[plane], line[plane], (w >> hsub1) * line_step[plane]);
- p += outpic->linesize[plane];
- }
- }
-}
+enum var_name {
+ VAR_PI,
+ VAR_PHI,
+ VAR_E,
+ VAR_IN_W, VAR_IW,
+ VAR_IN_H, VAR_IH,
+ VAR_OUT_W, VAR_OW,
+ VAR_OUT_H, VAR_OH,
+ VAR_X,
+ VAR_Y,
+ VAR_A,
+ VAR_HSUB,
+ VAR_VSUB,
+ VARS_NB
+};
static int query_formats(AVFilterContext *ctx)
{
- static const enum PixelFormat pix_fmts[] = {
- PIX_FMT_ARGB, PIX_FMT_RGBA,
- PIX_FMT_ABGR, PIX_FMT_BGRA,
- PIX_FMT_RGB24, PIX_FMT_BGR24,
-
- PIX_FMT_YUV444P, PIX_FMT_YUV422P,
- PIX_FMT_YUV420P, PIX_FMT_YUV411P,
- PIX_FMT_YUV410P, PIX_FMT_YUV440P,
- PIX_FMT_YUVJ444P, PIX_FMT_YUVJ422P,
- PIX_FMT_YUVJ420P, PIX_FMT_YUVJ440P,
- PIX_FMT_YUVA420P,
-
- PIX_FMT_NONE
+ 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
};
- avfilter_set_common_formats(ctx, avfilter_make_format_list(pix_fmts));
+ ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
return 0;
}
-#if CONFIG_PAD_FILTER
-
typedef struct {
int w, h; ///< output dimensions, a value of 0 will result in the input size
int x, y; ///< offsets of the input area with respect to the padded area
int in_w, in_h; ///< width and height for the padded input video, which has to be aligned to the chroma values in order to avoid chroma issues
+ char w_expr[256]; ///< width expression string
+ char h_expr[256]; ///< height expression string
+ char x_expr[256]; ///< width expression string
+ char y_expr[256]; ///< height expression string
+
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
} PadContext;
-static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
+static av_cold int init(AVFilterContext *ctx, const char *args)
{
PadContext *pad = ctx->priv;
char color_string[128] = "black";
+ av_strlcpy(pad->w_expr, "iw", sizeof(pad->w_expr));
+ av_strlcpy(pad->h_expr, "ih", sizeof(pad->h_expr));
+ av_strlcpy(pad->x_expr, "0" , sizeof(pad->w_expr));
+ av_strlcpy(pad->y_expr, "0" , sizeof(pad->h_expr));
+
if (args)
- sscanf(args, "%d:%d:%d:%d:%s", &pad->w, &pad->h, &pad->x, &pad->y, color_string);
+ sscanf(args, "%255[^:]:%255[^:]:%255[^:]:%255[^:]:%255s",
+ pad->w_expr, pad->h_expr, pad->x_expr, pad->y_expr, color_string);
- if (av_parse_color(pad->color, color_string, ctx) < 0)
+ if (av_parse_color(pad->color, color_string, -1, ctx) < 0)
return AVERROR(EINVAL);
- /* sanity check params */
- if (pad->w < 0 || pad->h < 0) {
- av_log(ctx, AV_LOG_ERROR, "Negative size values are not acceptable.\n");
- return AVERROR(EINVAL);
- }
-
return 0;
}
{
AVFilterContext *ctx = inlink->dst;
PadContext *pad = ctx->priv;
- const AVPixFmtDescriptor *pix_desc = &av_pix_fmt_descriptors[inlink->format];
+ const AVPixFmtDescriptor *pix_desc = av_pix_fmt_desc_get(inlink->format);
uint8_t rgba_color[4];
- int is_packed_rgba;
+ int ret, is_packed_rgba;
+ double var_values[VARS_NB], res;
+ char *expr;
pad->hsub = pix_desc->log2_chroma_w;
pad->vsub = pix_desc->log2_chroma_h;
+ 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;
+
+ /* evaluate width and height */
+ av_expr_parse_and_eval(&res, (expr = pad->w_expr),
+ var_names, var_values,
+ NULL, NULL, NULL, NULL, NULL, 0, ctx);
+ pad->w = var_values[VAR_OUT_W] = var_values[VAR_OW] = res;
+ if ((ret = av_expr_parse_and_eval(&res, (expr = pad->h_expr),
+ var_names, var_values,
+ NULL, NULL, NULL, NULL, NULL, 0, ctx)) < 0)
+ goto eval_fail;
+ pad->h = var_values[VAR_OUT_H] = var_values[VAR_OH] = res;
+ /* evaluate the width again, as it may depend on the evaluated output height */
+ if ((ret = av_expr_parse_and_eval(&res, (expr = pad->w_expr),
+ var_names, var_values,
+ NULL, NULL, NULL, NULL, NULL, 0, ctx)) < 0)
+ goto eval_fail;
+ pad->w = var_values[VAR_OUT_W] = var_values[VAR_OW] = res;
+
+ /* evaluate x and y */
+ av_expr_parse_and_eval(&res, (expr = pad->x_expr),
+ var_names, var_values,
+ NULL, NULL, NULL, NULL, NULL, 0, ctx);
+ pad->x = var_values[VAR_X] = res;
+ if ((ret = av_expr_parse_and_eval(&res, (expr = pad->y_expr),
+ var_names, var_values,
+ NULL, NULL, NULL, NULL, NULL, 0, ctx)) < 0)
+ goto eval_fail;
+ pad->y = var_values[VAR_Y] = res;
+ /* evaluate x again, as it may depend on the evaluated y value */
+ if ((ret = av_expr_parse_and_eval(&res, (expr = pad->x_expr),
+ var_names, var_values,
+ NULL, NULL, NULL, NULL, NULL, 0, ctx)) < 0)
+ goto eval_fail;
+ pad->x = var_values[VAR_X] = res;
+
+ /* sanity check params */
+ if (pad->w < 0 || pad->h < 0 || pad->x < 0 || pad->y < 0) {
+ av_log(ctx, AV_LOG_ERROR, "Negative values are not acceptable.\n");
+ return AVERROR(EINVAL);
+ }
+
if (!pad->w)
pad->w = inlink->w;
if (!pad->h)
pad->in_h = inlink->h & ~((1 << pad->vsub) - 1);
memcpy(rgba_color, pad->color, sizeof(rgba_color));
- fill_line_with_color(pad->line, pad->line_step, pad->w, pad->color,
- inlink->format, rgba_color, &is_packed_rgba);
+ 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_INFO, "w:%d h:%d x:%d y:%d color:0x%02X%02X%02X%02X[%s]\n",
- pad->w, pad->h, pad->x, pad->y,
+ 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",
+ 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");
}
return 0;
+
+eval_fail:
+ av_log(NULL, AV_LOG_ERROR,
+ "Error when evaluating the expression '%s'\n", expr);
+ return ret;
+
}
static int config_output(AVFilterLink *outlink)
return 0;
}
-static AVFilterPicRef *get_video_buffer(AVFilterLink *inlink, int perms, int w, int h)
+static AVFilterBufferRef *get_video_buffer(AVFilterLink *inlink, int perms, int w, int h)
{
PadContext *pad = inlink->dst->priv;
- AVFilterPicRef *picref = avfilter_get_video_buffer(inlink->dst->outputs[0], perms,
- w + (pad->w - pad->in_w),
- h + (pad->h - pad->in_h));
+ AVFilterBufferRef *picref = ff_get_video_buffer(inlink->dst->outputs[0], perms,
+ w + (pad->w - pad->in_w),
+ h + (pad->h - pad->in_h));
int plane;
+ if (!picref)
+ return NULL;
+
+ picref->video->w = w;
+ picref->video->h = h;
+
for (plane = 0; plane < 4 && picref->data[plane]; plane++) {
int hsub = (plane == 1 || plane == 2) ? pad->hsub : 0;
int vsub = (plane == 1 || plane == 2) ? pad->vsub : 0;
return picref;
}
-static void start_frame(AVFilterLink *inlink, AVFilterPicRef *inpicref)
+static int does_clip(PadContext *pad, AVFilterBufferRef *outpicref, int plane, int hsub, int vsub, int x, int y)
{
- PadContext *pad = inlink->dst->priv;
- AVFilterPicRef *outpicref = avfilter_ref_pic(inpicref, ~0);
- int plane;
+ int64_t x_in_buf, y_in_buf;
- inlink->dst->outputs[0]->outpic = outpicref;
+ x_in_buf = outpicref->data[plane] - outpicref->buf->data[plane]
+ + (x >> hsub) * pad ->line_step[plane]
+ + (y >> vsub) * outpicref->linesize [plane];
- for (plane = 0; plane < 4 && outpicref->data[plane]; plane++) {
- int hsub = (plane == 1 || plane == 2) ? pad->hsub : 0;
- int vsub = (plane == 1 || plane == 2) ? pad->vsub : 0;
+ if(x_in_buf < 0 || x_in_buf % pad->line_step[plane])
+ return 1;
+ x_in_buf /= pad->line_step[plane];
- outpicref->data[plane] -= (pad->x >> hsub) * pad->line_step[plane] +
- (pad->y >> vsub) * outpicref->linesize[plane];
- }
+ av_assert0(outpicref->buf->linesize[plane]>0); //while reference can use negative linesize the main buffer should not
- avfilter_start_frame(inlink->dst->outputs[0], outpicref);
-}
+ y_in_buf = x_in_buf / outpicref->buf->linesize[plane];
+ x_in_buf %= outpicref->buf->linesize[plane];
-static void end_frame(AVFilterLink *link)
-{
- avfilter_end_frame(link->dst->outputs[0]);
- avfilter_unref_pic(link->cur_pic);
+ if( y_in_buf<<vsub >= outpicref->buf->h
+ || x_in_buf<<hsub >= outpicref->buf->w)
+ return 1;
+ return 0;
}
-static void draw_send_bar_slice(AVFilterLink *link, int y, int h, int slice_dir, int before_slice)
+static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *in)
{
- PadContext *pad = link->dst->priv;
- int bar_y, bar_h = 0;
-
- if (slice_dir * before_slice == 1 && y == pad->y) {
- /* top bar */
- bar_y = 0;
- bar_h = pad->y;
- } else if (slice_dir * before_slice == -1 && (y + h) == (pad->y + pad->in_h)) {
- /* bottom bar */
- bar_y = pad->y + pad->in_h;
- bar_h = pad->h - pad->in_h - pad->y;
- }
+ PadContext *pad = inlink->dst->priv;
+ AVFilterBufferRef *out = avfilter_ref_buffer(in, ~0);
+ int plane, needs_copy;
- if (bar_h) {
- draw_rectangle(link->dst->outputs[0]->outpic,
- pad->line, pad->line_step, pad->hsub, pad->vsub,
- 0, bar_y, pad->w, bar_h);
- avfilter_draw_slice(link->dst->outputs[0], bar_y, bar_h, slice_dir);
+ if (!out) {
+ avfilter_unref_bufferp(&in);
+ return AVERROR(ENOMEM);
}
-}
-
-static void draw_slice(AVFilterLink *link, int y, int h, int slice_dir)
-{
- PadContext *pad = link->dst->priv;
- AVFilterPicRef *outpic = link->dst->outputs[0]->outpic;
-
- y += pad->y;
-
- y &= ~((1 << pad->vsub) - 1);
- h &= ~((1 << pad->vsub) - 1);
-
- if (!h)
- return;
- draw_send_bar_slice(link, y, h, slice_dir, 1);
-
- /* left border */
- draw_rectangle(outpic, pad->line, pad->line_step, pad->hsub, pad->vsub,
- 0, y, pad->x, h);
- /* right border */
- draw_rectangle(outpic, pad->line, pad->line_step, pad->hsub, pad->vsub,
- pad->x + pad->in_w, y, pad->w - pad->x - pad->in_w, h);
- avfilter_draw_slice(link->dst->outputs[0], y, h, slice_dir);
-
- draw_send_bar_slice(link, y, h, slice_dir, -1);
-}
-AVFilter avfilter_vf_pad = {
- .name = "pad",
- .description = NULL_IF_CONFIG_SMALL("Pad input image to width:height[:x:y[:color]] (default x and y: 0, default color: black)."),
-
- .priv_size = sizeof(PadContext),
- .init = init,
- .uninit = uninit,
- .query_formats = query_formats,
-
- .inputs = (AVFilterPad[]) {{ .name = "default",
- .type = AVMEDIA_TYPE_VIDEO,
- .config_props = config_input,
- .get_video_buffer = get_video_buffer,
- .start_frame = start_frame,
- .draw_slice = draw_slice,
- .end_frame = end_frame, },
- { .name = NULL}},
-
- .outputs = (AVFilterPad[]) {{ .name = "default",
- .type = AVMEDIA_TYPE_VIDEO,
- .config_props = config_output, },
- { .name = NULL}},
-};
-
-#endif /* CONFIG_PAD_FILTER */
-
-#if CONFIG_COLOR_FILTER
+ for (plane = 0; plane < 4 && out->data[plane]; plane++) {
+ int hsub = (plane == 1 || plane == 2) ? pad->hsub : 0;
+ int vsub = (plane == 1 || plane == 2) ? pad->vsub : 0;
-typedef struct {
- int w, h;
- uint8_t color[4];
- AVRational time_base;
- uint8_t *line[4];
- int line_step[4];
- int hsub, vsub; ///< chroma subsampling values
- uint64_t pts;
-} ColorContext;
+ av_assert0(out->buf->w > 0 && out->buf->h > 0);
-static av_cold int color_init(AVFilterContext *ctx, const char *args, void *opaque)
-{
- ColorContext *color = ctx->priv;
- char color_string[128] = "black";
- char frame_size [128] = "320x240";
- char frame_rate [128] = "25";
- AVRational frame_rate_q;
- int ret;
+ if (out->format != out->buf->format) //unsupported currently
+ break;
- if (args)
- sscanf(args, "%127[^:]:%127[^:]:%127s", color_string, frame_size, frame_rate);
+ out->data[plane] -= (pad->x >> hsub) * pad->line_step[plane] +
+ (pad->y >> vsub) * out->linesize [plane];
- if (av_parse_video_frame_size(&color->w, &color->h, frame_size) < 0) {
- av_log(ctx, AV_LOG_ERROR, "Invalid frame size: %s\n", frame_size);
- return AVERROR(EINVAL);
+ if (does_clip(pad, out, plane, hsub, vsub, 0, 0) ||
+ does_clip(pad, out, plane, hsub, vsub, 0, pad->h - 1) ||
+ does_clip(pad, out, plane, hsub, vsub, pad->w - 1, 0) ||
+ does_clip(pad, out, plane, hsub, vsub, pad->w - 1, pad->h - 1))
+ break;
}
+ needs_copy = plane < 4 && out->data[plane];
+ if (needs_copy) {
+ av_log(inlink->dst, AV_LOG_DEBUG, "Direct padding impossible allocating new frame\n");
+ avfilter_unref_buffer(out);
+ out = ff_get_video_buffer(inlink->dst->outputs[0], AV_PERM_WRITE | AV_PERM_NEG_LINESIZES,
+ FFMAX(inlink->w, pad->w),
+ FFMAX(inlink->h, pad->h));
+ if (!out) {
+ avfilter_unref_bufferp(&in);
+ return AVERROR(ENOMEM);
+ }
- if (av_parse_video_frame_rate(&frame_rate_q, frame_rate) < 0 ||
- frame_rate_q.den <= 0 || frame_rate_q.num <= 0) {
- av_log(ctx, AV_LOG_ERROR, "Invalid frame rate: %s\n", frame_rate);
- return AVERROR(EINVAL);
+ avfilter_copy_buffer_ref_props(out, in);
}
- color->time_base.num = frame_rate_q.den;
- color->time_base.den = frame_rate_q.num;
- if ((ret = av_parse_color(color->color, color_string, ctx)) < 0)
- return ret;
+ out->video->w = pad->w;
+ out->video->h = pad->h;
- return 0;
-}
-
-static av_cold void color_uninit(AVFilterContext *ctx)
-{
- ColorContext *color = ctx->priv;
- int i;
-
- for (i = 0; i < 4; i++) {
- av_freep(&color->line[i]);
- color->line_step[i] = 0;
+ /* top bar */
+ if (pad->y) {
+ ff_draw_rectangle(out->data, out->linesize,
+ pad->line, pad->line_step, pad->hsub, pad->vsub,
+ 0, 0, pad->w, pad->y);
}
-}
-
-static int color_config_props(AVFilterLink *inlink)
-{
- AVFilterContext *ctx = inlink->src;
- ColorContext *color = ctx->priv;
- uint8_t rgba_color[4];
- int is_packed_rgba;
- const AVPixFmtDescriptor *pix_desc = &av_pix_fmt_descriptors[inlink->format];
- color->hsub = pix_desc->log2_chroma_w;
- color->vsub = pix_desc->log2_chroma_h;
+ /* 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,
+ 0, pad->y + pad->in_h, pad->w, pad->h - pad->y - pad->in_h);
+ }
- color->w &= ~((1 << color->hsub) - 1);
- color->h &= ~((1 << color->vsub) - 1);
- if (avcodec_check_dimensions(ctx, color->w, color->h) < 0)
- return AVERROR(EINVAL);
+ /* left border */
+ ff_draw_rectangle(out->data, out->linesize, pad->line, pad->line_step,
+ pad->hsub, pad->vsub, 0, pad->y, pad->x, in->video->h);
- memcpy(rgba_color, color->color, sizeof(rgba_color));
- fill_line_with_color(color->line, color->line_step, color->w, color->color,
- inlink->format, rgba_color, &is_packed_rgba);
+ 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->video->w, in->video->h);
+ }
- av_log(ctx, AV_LOG_INFO, "w:%d h:%d r:%d/%d color:0x%02x%02x%02x%02x[%s]\n",
- color->w, color->h, color->time_base.den, color->time_base.num,
- color->color[0], color->color[1], color->color[2], color->color[3],
- is_packed_rgba ? "rgba" : "yuva");
- inlink->w = color->w;
- inlink->h = color->h;
+ /* right border */
+ ff_draw_rectangle(out->data, out->linesize,
+ pad->line, pad->line_step, pad->hsub, pad->vsub,
+ pad->x + pad->in_w, pad->y, pad->w - pad->x - pad->in_w,
+ in->video->h);
- return 0;
+ avfilter_unref_bufferp(&in);
+ return ff_filter_frame(inlink->dst->outputs[0], out);
}
-static int color_request_frame(AVFilterLink *link)
-{
- ColorContext *color = link->src->priv;
- AVFilterPicRef *picref = avfilter_get_video_buffer(link, AV_PERM_WRITE, color->w, color->h);
- picref->pixel_aspect = (AVRational) {1, 1};
- picref->pts = av_rescale_q(color->pts++, color->time_base, AV_TIME_BASE_Q);
- picref->pos = 0;
-
- avfilter_start_frame(link, avfilter_ref_pic(picref, ~0));
- draw_rectangle(picref,
- color->line, color->line_step, color->hsub, color->vsub,
- 0, 0, color->w, color->h);
- avfilter_draw_slice(link, 0, color->h, 1);
- avfilter_end_frame(link);
- avfilter_unref_pic(picref);
-
- return 0;
-}
+static const AVFilterPad avfilter_vf_pad_inputs[] = {
+ {
+ .name = "default",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .config_props = config_input,
+ .get_video_buffer = get_video_buffer,
+ .filter_frame = filter_frame,
+ },
+ { NULL }
+};
-AVFilter avfilter_vsrc_color = {
- .name = "color",
- .description = NULL_IF_CONFIG_SMALL("Provide an uniformly colored input, syntax is: [color[:size[:rate]]]"),
+static const AVFilterPad avfilter_vf_pad_outputs[] = {
+ {
+ .name = "default",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .config_props = config_output,
+ },
+ { NULL }
+};
- .priv_size = sizeof(ColorContext),
- .init = color_init,
- .uninit = color_uninit,
+AVFilter avfilter_vf_pad = {
+ .name = "pad",
+ .description = NULL_IF_CONFIG_SMALL("Pad input image to width:height[:x:y[:color]] (default x and y: 0, default color: black)."),
+ .priv_size = sizeof(PadContext),
+ .init = init,
+ .uninit = uninit,
.query_formats = query_formats,
- .inputs = (AVFilterPad[]) {{ .name = NULL}},
+ .inputs = avfilter_vf_pad_inputs,
- .outputs = (AVFilterPad[]) {{ .name = "default",
- .type = CODEC_TYPE_VIDEO,
- .request_frame = color_request_frame,
- .config_props = color_config_props },
- { .name = NULL}},
+ .outputs = avfilter_vf_pad_outputs,
};
-
-#endif /* CONFIG_COLOR_FILTER */