RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

vf_pad: use the name 's' for the pointer to the private context 

This is shorter and consistent across filters.
This commit is contained in:
Anton Khirnov 2013-03-18 20:44:36 +01:00
parent a70519aad1
commit 3062ac4c47
1 changed files with 74 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

148
libavfilter/vf_pad.c
View File

@ -114,9 +114,9 @@ typedef struct {
static av_cold int init(AVFilterContext *ctx)
{
PadContext *pad = ctx->priv;
PadContext *s = ctx->priv;
if (av_parse_color(pad->color, pad->color_str, -1, ctx) < 0)
if (av_parse_color(s->color, s->color_str, -1, ctx) < 0)
return AVERROR(EINVAL);
return 0;
@ -124,27 +124,27 @@ static av_cold int init(AVFilterContext *ctx)
static av_cold void uninit(AVFilterContext *ctx)
{
PadContext *pad = ctx->priv;
PadContext *s = ctx->priv;
int i;
for (i = 0; i < 4; i++) {
av_freep(&pad->line[i]);
pad->line_step[i] = 0;
av_freep(&s->line[i]);
s->line_step[i] = 0;
}
}
static int config_input(AVFilterLink *inlink)
{
AVFilterContext *ctx = inlink->dst;
PadContext *pad = ctx->priv;
PadContext *s = ctx->priv;
const AVPixFmtDescriptor *pix_desc = av_pix_fmt_desc_get(inlink->format);
uint8_t rgba_color[4];
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;
s->hsub = pix_desc->log2_chroma_w;
s->vsub = pix_desc->log2_chroma_h;
var_values[VAR_PI] = M_PI;
var_values[VAR_PHI] = M_PHI;
@ -154,78 +154,78 @@ static int config_input(AVFilterLink *inlink)
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_HSUB] = 1<<s->hsub;
var_values[VAR_VSUB] = 1<<s->vsub;
/* evaluate width and height */
av_expr_parse_and_eval(&res, (expr = pad->w_expr),
av_expr_parse_and_eval(&res, (expr = s->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),
s->w = var_values[VAR_OUT_W] = var_values[VAR_OW] = res;
if ((ret = av_expr_parse_and_eval(&res, (expr = s->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;
s->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),
if ((ret = av_expr_parse_and_eval(&res, (expr = s->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;
s->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),
av_expr_parse_and_eval(&res, (expr = s->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),
s->x = var_values[VAR_X] = res;
if ((ret = av_expr_parse_and_eval(&res, (expr = s->y_expr),
var_names, var_values,
NULL, NULL, NULL, NULL, NULL, 0, ctx)) < 0)
goto eval_fail;
pad->y = var_values[VAR_Y] = res;
s->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),
if ((ret = av_expr_parse_and_eval(&res, (expr = s->x_expr),
var_names, var_values,
NULL, NULL, NULL, NULL, NULL, 0, ctx)) < 0)
goto eval_fail;
pad->x = var_values[VAR_X] = res;
s->x = var_values[VAR_X] = res;
/* sanity check params */
if (pad->w < 0 || pad->h < 0 || pad->x < 0 || pad->y < 0) {
if (s->w < 0 || s->h < 0 || s->x < 0 || s->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->h = inlink->h;
if (!s->w)
s->w = inlink->w;
if (!s->h)
s->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);
s->w &= ~((1 << s->hsub) - 1);
s->h &= ~((1 << s->vsub) - 1);
s->x &= ~((1 << s->hsub) - 1);
s->y &= ~((1 << s->vsub) - 1);
pad->in_w = inlink->w & ~((1 << pad->hsub) - 1);
pad->in_h = inlink->h & ~((1 << pad->vsub) - 1);
s->in_w = inlink->w & ~((1 << s->hsub) - 1);
s->in_h = inlink->h & ~((1 << s->vsub) - 1);
memcpy(rgba_color, pad->color, sizeof(rgba_color));
ff_fill_line_with_color(pad->line, pad->line_step, pad->w, pad->color,
memcpy(rgba_color, s->color, sizeof(rgba_color));
ff_fill_line_with_color(s->line, s->line_step, s->w, s->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",
inlink->w, inlink->h, pad->w, pad->h, pad->x, pad->y,
pad->color[0], pad->color[1], pad->color[2], pad->color[3],
inlink->w, inlink->h, s->w, s->h, s->x, s->y,
s->color[0], s->color[1], s->color[2], s->color[3],
is_packed_rgba ? "rgba" : "yuva");
if (pad->x < 0 || pad->y < 0 ||
pad->w <= 0 || pad->h <= 0 ||
(unsigned)pad->x + (unsigned)inlink->w > pad->w ||
(unsigned)pad->y + (unsigned)inlink->h > pad->h) {
if (s->x < 0 || s->y < 0 ||
s->w <= 0 || s->h <= 0 ||
(unsigned)s->x + (unsigned)inlink->w > s->w ||
(unsigned)s->y + (unsigned)inlink->h > s->h) {
av_log(ctx, AV_LOG_ERROR,
"Input area %d:%d:%d:%d not within the padded area 0:0:%d:%d or zero-sized\n",
pad->x, pad->y, pad->x + inlink->w, pad->y + inlink->h, pad->w, pad->h);
s->x, s->y, s->x + inlink->w, s->y + inlink->h, s->w, s->h);
return AVERROR(EINVAL);
}
@ -240,20 +240,20 @@ eval_fail:
static int config_output(AVFilterLink *outlink)
{
PadContext *pad = outlink->src->priv;
PadContext *s = outlink->src->priv;
outlink->w = pad->w;
outlink->h = pad->h;
outlink->w = s->w;
outlink->h = s->h;
return 0;
}
static AVFrame *get_video_buffer(AVFilterLink *inlink, int w, int h)
{
PadContext *pad = inlink->dst->priv;
PadContext *s = inlink->dst->priv;
AVFrame *frame = ff_get_video_buffer(inlink->dst->outputs[0],
w + (pad->w - pad->in_w),
h + (pad->h - pad->in_h));
w + (s->w - s->in_w),
h + (s->h - s->in_h));
int plane;
if (!frame)
@ -263,11 +263,11 @@ 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;
int hsub = (plane == 1 || plane == 2) ? s->hsub : 0;
int vsub = (plane == 1 || plane == 2) ? s->vsub : 0;
frame->data[plane] += (pad->x >> hsub) * pad->line_step[plane] +
(pad->y >> vsub) * frame->linesize[plane];
frame->data[plane] += (s->x >> hsub) * s->line_step[plane] +
(s->y >> vsub) * frame->linesize[plane];
}
return frame;
@ -342,15 +342,15 @@ static int frame_needs_copy(PadContext *s, AVFrame *frame)
static int filter_frame(AVFilterLink *inlink, AVFrame *in)
{
PadContext *pad = inlink->dst->priv;
PadContext *s = inlink->dst->priv;
AVFrame *out;
int needs_copy = frame_needs_copy(pad, in);
int needs_copy = frame_needs_copy(s, in);
if (needs_copy) {
av_log(inlink->dst, AV_LOG_DEBUG, "Direct padding impossible allocating new frame\n");
out = ff_get_video_buffer(inlink->dst->outputs[0],
FFMAX(inlink->w, pad->w),
FFMAX(inlink->h, pad->h));
FFMAX(inlink->w, s->w),
FFMAX(inlink->h, s->h));
if (!out) {
av_frame_free(&in);
return AVERROR(ENOMEM);
@ -362,45 +362,45 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
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] +
(pad->y >> vsub) * out->linesize[i];
int hsub = (i == 1 || i == 2) ? s->hsub : 0;
int vsub = (i == 1 || i == 2) ? s->vsub : 0;
out->data[i] -= (s->x >> hsub) * s->line_step[i] +
(s->y >> vsub) * out->linesize[i];
}
}
/* top bar */
if (pad->y) {
if (s->y) {
ff_draw_rectangle(out->data, out->linesize,
pad->line, pad->line_step, pad->hsub, pad->vsub,
0, 0, pad->w, pad->y);
s->line, s->line_step, s->hsub, s->vsub,
0, 0, s->w, s->y);
}
/* bottom bar */
if (pad->h > pad->y + pad->in_h) {
if (s->h > s->y + s->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);
s->line, s->line_step, s->hsub, s->vsub,
0, s->y + s->in_h, s->w, s->h - s->y - s->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_draw_rectangle(out->data, out->linesize, s->line, s->line_step,
s->hsub, s->vsub, 0, s->y, s->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);
s->line_step, s->hsub, s->vsub,
s->x, s->y, 0, in->width, in->height);
}
/* 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,
s->line, s->line_step, s->hsub, s->vsub,
s->x + s->in_w, s->y, s->w - s->x - s->in_w,
in->height);
out->width = pad->w;
out->height = pad->h;
out->width = s->w;
out->height = s->h;
if (in != out)
av_frame_free(&in);