From a2a696990c07862da42662403449fc4f7ee533e8 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Mon, 18 Mar 2013 20:44:36 +0100 Subject: [PATCH 1/3] vf_blackframe: use the name 's' for the pointer to the private context This is shorter and consistent across filters. --- libavfilter/vf_blackframe.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libavfilter/vf_blackframe.c b/libavfilter/vf_blackframe.c index 54e75bbb03..1b1e796dff 100644 --- a/libavfilter/vf_blackframe.c +++ b/libavfilter/vf_blackframe.c @@ -61,25 +61,25 @@ static int query_formats(AVFilterContext *ctx) static int filter_frame(AVFilterLink *inlink, AVFrame *frame) { AVFilterContext *ctx = inlink->dst; - BlackFrameContext *blackframe = ctx->priv; + BlackFrameContext *s = ctx->priv; int x, i; int pblack = 0; uint8_t *p = frame->data[0]; for (i = 0; i < frame->height; i++) { for (x = 0; x < inlink->w; x++) - blackframe->nblack += p[x] < blackframe->bthresh; + s->nblack += p[x] < s->bthresh; p += frame->linesize[0]; } - pblack = blackframe->nblack * 100 / (inlink->w * inlink->h); - if (pblack >= blackframe->bamount) + pblack = s->nblack * 100 / (inlink->w * inlink->h); + if (pblack >= s->bamount) av_log(ctx, AV_LOG_INFO, "frame:%u pblack:%u pts:%"PRId64" t:%f\n", - blackframe->frame, pblack, frame->pts, + s->frame, pblack, frame->pts, frame->pts == AV_NOPTS_VALUE ? -1 : frame->pts * av_q2d(inlink->time_base)); - blackframe->frame++; - blackframe->nblack = 0; + s->frame++; + s->nblack = 0; return ff_filter_frame(inlink->dst->outputs[0], frame); } From 762df56ef9f115a640e9abe0a37f7de26a3775e1 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Mon, 18 Mar 2013 20:44:36 +0100 Subject: [PATCH 2/3] vf_boxblur: use the name 's' for the pointer to the private context This is shorter and consistent across filters. --- libavfilter/vf_boxblur.c | 90 ++++++++++++++++++++-------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/libavfilter/vf_boxblur.c b/libavfilter/vf_boxblur.c index 75e1c9c690..44c148b9e4 100644 --- a/libavfilter/vf_boxblur.c +++ b/libavfilter/vf_boxblur.c @@ -82,24 +82,24 @@ typedef struct { static av_cold int init(AVFilterContext *ctx) { - BoxBlurContext *boxblur = ctx->priv; + BoxBlurContext *s = ctx->priv; - if (!boxblur->luma_radius_expr) { + if (!s->luma_radius_expr) { av_log(ctx, AV_LOG_ERROR, "Luma radius expression is not set.\n"); return AVERROR(EINVAL); } - if (!boxblur->chroma_radius_expr) { - boxblur->chroma_radius_expr = av_strdup(boxblur->luma_radius_expr); - if (!boxblur->chroma_radius_expr) + if (!s->chroma_radius_expr) { + s->chroma_radius_expr = av_strdup(s->luma_radius_expr); + if (!s->chroma_radius_expr) return AVERROR(ENOMEM); - boxblur->chroma_param.power = boxblur->luma_param.power; + s->chroma_param.power = s->luma_param.power; } - if (!boxblur->alpha_radius_expr) { - boxblur->alpha_radius_expr = av_strdup(boxblur->luma_radius_expr); - if (!boxblur->alpha_radius_expr) + if (!s->alpha_radius_expr) { + s->alpha_radius_expr = av_strdup(s->luma_radius_expr); + if (!s->alpha_radius_expr) return AVERROR(ENOMEM); - boxblur->alpha_param.power = boxblur->luma_param.power; + s->alpha_param.power = s->luma_param.power; } return 0; @@ -107,10 +107,10 @@ static av_cold int init(AVFilterContext *ctx) static av_cold void uninit(AVFilterContext *ctx) { - BoxBlurContext *boxblur = ctx->priv; + BoxBlurContext *s = ctx->priv; - av_freep(&boxblur->temp[0]); - av_freep(&boxblur->temp[1]); + av_freep(&s->temp[0]); + av_freep(&s->temp[1]); } static int query_formats(AVFilterContext *ctx) @@ -132,37 +132,37 @@ static int config_input(AVFilterLink *inlink) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format); AVFilterContext *ctx = inlink->dst; - BoxBlurContext *boxblur = ctx->priv; + BoxBlurContext *s = ctx->priv; int w = inlink->w, h = inlink->h; int cw, ch; double var_values[VARS_NB], res; char *expr; int ret; - av_freep(&boxblur->temp[0]); - av_freep(&boxblur->temp[1]); - if (!(boxblur->temp[0] = av_malloc(FFMAX(w, h)))) + av_freep(&s->temp[0]); + av_freep(&s->temp[1]); + if (!(s->temp[0] = av_malloc(FFMAX(w, h)))) return AVERROR(ENOMEM); - if (!(boxblur->temp[1] = av_malloc(FFMAX(w, h)))) { - av_freep(&boxblur->temp[0]); + if (!(s->temp[1] = av_malloc(FFMAX(w, h)))) { + av_freep(&s->temp[0]); return AVERROR(ENOMEM); } - boxblur->hsub = desc->log2_chroma_w; - boxblur->vsub = desc->log2_chroma_h; + s->hsub = desc->log2_chroma_w; + s->vsub = desc->log2_chroma_h; var_values[VAR_W] = inlink->w; var_values[VAR_H] = inlink->h; - var_values[VAR_CW] = cw = w>>boxblur->hsub; - var_values[VAR_CH] = ch = h>>boxblur->vsub; - var_values[VAR_HSUB] = 1<hsub; - var_values[VAR_VSUB] = 1<vsub; + var_values[VAR_CW] = cw = w>>s->hsub; + var_values[VAR_CH] = ch = h>>s->vsub; + var_values[VAR_HSUB] = 1<hsub; + var_values[VAR_VSUB] = 1<vsub; #define EVAL_RADIUS_EXPR(comp) \ - expr = boxblur->comp##_radius_expr; \ + expr = s->comp##_radius_expr; \ ret = av_expr_parse_and_eval(&res, expr, var_names, var_values, \ NULL, NULL, NULL, NULL, NULL, 0, ctx); \ - boxblur->comp##_param.radius = res; \ + s->comp##_param.radius = res; \ if (ret < 0) { \ av_log(NULL, AV_LOG_ERROR, \ "Error when evaluating " #comp " radius expression '%s'\n", expr); \ @@ -177,30 +177,30 @@ static int config_input(AVFilterLink *inlink) "chroma_radius:%d chroma_power:%d " "alpha_radius:%d alpha_power:%d " "w:%d chroma_w:%d h:%d chroma_h:%d\n", - boxblur->luma_param .radius, boxblur->luma_param .power, - boxblur->chroma_param.radius, boxblur->chroma_param.power, - boxblur->alpha_param .radius, boxblur->alpha_param .power, + s->luma_param .radius, s->luma_param .power, + s->chroma_param.radius, s->chroma_param.power, + s->alpha_param .radius, s->alpha_param .power, w, cw, h, ch); #define CHECK_RADIUS_VAL(w_, h_, comp) \ - if (boxblur->comp##_param.radius < 0 || \ - 2*boxblur->comp##_param.radius > FFMIN(w_, h_)) { \ + if (s->comp##_param.radius < 0 || \ + 2*s->comp##_param.radius > FFMIN(w_, h_)) { \ av_log(ctx, AV_LOG_ERROR, \ "Invalid " #comp " radius value %d, must be >= 0 and <= %d\n", \ - boxblur->comp##_param.radius, FFMIN(w_, h_)/2); \ + s->comp##_param.radius, FFMIN(w_, h_)/2); \ return AVERROR(EINVAL); \ } CHECK_RADIUS_VAL(w, h, luma); CHECK_RADIUS_VAL(cw, ch, chroma); CHECK_RADIUS_VAL(w, h, alpha); - boxblur->radius[Y] = boxblur->luma_param.radius; - boxblur->radius[U] = boxblur->radius[V] = boxblur->chroma_param.radius; - boxblur->radius[A] = boxblur->alpha_param.radius; + s->radius[Y] = s->luma_param.radius; + s->radius[U] = s->radius[V] = s->chroma_param.radius; + s->radius[A] = s->alpha_param.radius; - boxblur->power[Y] = boxblur->luma_param.power; - boxblur->power[U] = boxblur->power[V] = boxblur->chroma_param.power; - boxblur->power[A] = boxblur->alpha_param.power; + s->power[Y] = s->luma_param.power; + s->power[U] = s->power[V] = s->chroma_param.power; + s->power[A] = s->alpha_param.power; return 0; } @@ -301,11 +301,11 @@ static void vblur(uint8_t *dst, int dst_linesize, const uint8_t *src, int src_li static int filter_frame(AVFilterLink *inlink, AVFrame *in) { AVFilterContext *ctx = inlink->dst; - BoxBlurContext *boxblur = ctx->priv; + BoxBlurContext *s = ctx->priv; AVFilterLink *outlink = inlink->dst->outputs[0]; AVFrame *out; int plane; - int cw = inlink->w >> boxblur->hsub, ch = in->height >> boxblur->vsub; + int cw = inlink->w >> s->hsub, ch = in->height >> s->vsub; int w[4] = { inlink->w, cw, cw, inlink->w }; int h[4] = { in->height, ch, ch, in->height }; @@ -319,14 +319,14 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) for (plane = 0; in->data[plane] && plane < 4; plane++) hblur(out->data[plane], out->linesize[plane], in ->data[plane], in ->linesize[plane], - w[plane], h[plane], boxblur->radius[plane], boxblur->power[plane], - boxblur->temp); + w[plane], h[plane], s->radius[plane], s->power[plane], + s->temp); for (plane = 0; in->data[plane] && plane < 4; plane++) vblur(out->data[plane], out->linesize[plane], out->data[plane], out->linesize[plane], - w[plane], h[plane], boxblur->radius[plane], boxblur->power[plane], - boxblur->temp); + w[plane], h[plane], s->radius[plane], s->power[plane], + s->temp); av_frame_free(&in); From 7f83959598b6565baa0091e5739dd9091ab7a990 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Mon, 18 Mar 2013 20:44:36 +0100 Subject: [PATCH 3/3] vf_crop: use the name 's' for the pointer to the private context This is shorter and consistent across filters. --- libavfilter/vf_crop.c | 152 ++++++++++++++++++++++-------------------- 1 file changed, 79 insertions(+), 73 deletions(-) diff --git a/libavfilter/vf_crop.c b/libavfilter/vf_crop.c index c10c431daa..d94f62043f 100644 --- a/libavfilter/vf_crop.c +++ b/libavfilter/vf_crop.c @@ -117,10 +117,12 @@ static int query_formats(AVFilterContext *ctx) static av_cold void uninit(AVFilterContext *ctx) { - CropContext *crop = ctx->priv; + CropContext *s = ctx->priv; - av_expr_free(crop->x_pexpr); crop->x_pexpr = NULL; - av_expr_free(crop->y_pexpr); crop->y_pexpr = NULL; + av_expr_free(s->x_pexpr); + s->x_pexpr = NULL; + av_expr_free(s->y_pexpr); + s->y_pexpr = NULL; } static inline int normalize_double(int *n, double d) @@ -141,74 +143,74 @@ static inline int normalize_double(int *n, double d) static int config_input(AVFilterLink *link) { AVFilterContext *ctx = link->dst; - CropContext *crop = ctx->priv; + CropContext *s = ctx->priv; const AVPixFmtDescriptor *pix_desc = av_pix_fmt_desc_get(link->format); int ret; const char *expr; double res; - crop->var_values[VAR_E] = M_E; - crop->var_values[VAR_PHI] = M_PHI; - crop->var_values[VAR_PI] = M_PI; - crop->var_values[VAR_IN_W] = crop->var_values[VAR_IW] = ctx->inputs[0]->w; - crop->var_values[VAR_IN_H] = crop->var_values[VAR_IH] = ctx->inputs[0]->h; - crop->var_values[VAR_X] = NAN; - crop->var_values[VAR_Y] = NAN; - crop->var_values[VAR_OUT_W] = crop->var_values[VAR_OW] = NAN; - crop->var_values[VAR_OUT_H] = crop->var_values[VAR_OH] = NAN; - crop->var_values[VAR_N] = 0; - crop->var_values[VAR_T] = NAN; - - av_image_fill_max_pixsteps(crop->max_step, NULL, pix_desc); - crop->hsub = pix_desc->log2_chroma_w; - crop->vsub = pix_desc->log2_chroma_h; - - if ((ret = av_expr_parse_and_eval(&res, (expr = crop->ow_expr), - var_names, crop->var_values, + s->var_values[VAR_E] = M_E; + s->var_values[VAR_PHI] = M_PHI; + s->var_values[VAR_PI] = M_PI; + s->var_values[VAR_IN_W] = s->var_values[VAR_IW] = ctx->inputs[0]->w; + s->var_values[VAR_IN_H] = s->var_values[VAR_IH] = ctx->inputs[0]->h; + s->var_values[VAR_X] = NAN; + s->var_values[VAR_Y] = NAN; + s->var_values[VAR_OUT_W] = s->var_values[VAR_OW] = NAN; + s->var_values[VAR_OUT_H] = s->var_values[VAR_OH] = NAN; + s->var_values[VAR_N] = 0; + s->var_values[VAR_T] = NAN; + + av_image_fill_max_pixsteps(s->max_step, NULL, pix_desc); + s->hsub = pix_desc->log2_chroma_w; + s->vsub = pix_desc->log2_chroma_h; + + if ((ret = av_expr_parse_and_eval(&res, (expr = s->ow_expr), + var_names, s->var_values, NULL, NULL, NULL, NULL, NULL, 0, ctx)) < 0) goto fail_expr; - crop->var_values[VAR_OUT_W] = crop->var_values[VAR_OW] = res; - if ((ret = av_expr_parse_and_eval(&res, (expr = crop->oh_expr), - var_names, crop->var_values, + s->var_values[VAR_OUT_W] = s->var_values[VAR_OW] = res; + if ((ret = av_expr_parse_and_eval(&res, (expr = s->oh_expr), + var_names, s->var_values, NULL, NULL, NULL, NULL, NULL, 0, ctx)) < 0) goto fail_expr; - crop->var_values[VAR_OUT_H] = crop->var_values[VAR_OH] = res; + s->var_values[VAR_OUT_H] = s->var_values[VAR_OH] = res; /* evaluate again ow as it may depend on oh */ - if ((ret = av_expr_parse_and_eval(&res, (expr = crop->ow_expr), - var_names, crop->var_values, + if ((ret = av_expr_parse_and_eval(&res, (expr = s->ow_expr), + var_names, s->var_values, NULL, NULL, NULL, NULL, NULL, 0, ctx)) < 0) goto fail_expr; - crop->var_values[VAR_OUT_W] = crop->var_values[VAR_OW] = res; - if (normalize_double(&crop->w, crop->var_values[VAR_OUT_W]) < 0 || - normalize_double(&crop->h, crop->var_values[VAR_OUT_H]) < 0) { + s->var_values[VAR_OUT_W] = s->var_values[VAR_OW] = res; + if (normalize_double(&s->w, s->var_values[VAR_OUT_W]) < 0 || + normalize_double(&s->h, s->var_values[VAR_OUT_H]) < 0) { av_log(ctx, AV_LOG_ERROR, "Too big value or invalid expression for out_w/ow or out_h/oh. " "Maybe the expression for out_w:'%s' or for out_h:'%s' is self-referencing.\n", - crop->ow_expr, crop->oh_expr); + s->ow_expr, s->oh_expr); return AVERROR(EINVAL); } - crop->w &= ~((1 << crop->hsub) - 1); - crop->h &= ~((1 << crop->vsub) - 1); + s->w &= ~((1 << s->hsub) - 1); + s->h &= ~((1 << s->vsub) - 1); - if ((ret = av_expr_parse(&crop->x_pexpr, crop->x_expr, var_names, + if ((ret = av_expr_parse(&s->x_pexpr, s->x_expr, var_names, NULL, NULL, NULL, NULL, 0, ctx)) < 0 || - (ret = av_expr_parse(&crop->y_pexpr, crop->y_expr, var_names, + (ret = av_expr_parse(&s->y_pexpr, s->y_expr, var_names, NULL, NULL, NULL, NULL, 0, ctx)) < 0) return AVERROR(EINVAL); av_log(ctx, AV_LOG_VERBOSE, "w:%d h:%d -> w:%d h:%d\n", - link->w, link->h, crop->w, crop->h); + link->w, link->h, s->w, s->h); - if (crop->w <= 0 || crop->h <= 0 || - crop->w > link->w || crop->h > link->h) { + if (s->w <= 0 || s->h <= 0 || + s->w > link->w || s->h > link->h) { av_log(ctx, AV_LOG_ERROR, "Invalid too big or non positive size for width '%d' or height '%d'\n", - crop->w, crop->h); + s->w, s->h); return AVERROR(EINVAL); } /* set default, required in the case the first computed value for x/y is NAN */ - crop->x = (link->w - crop->w) / 2; - crop->y = (link->h - crop->h) / 2; - crop->x &= ~((1 << crop->hsub) - 1); - crop->y &= ~((1 << crop->vsub) - 1); + s->x = (link->w - s->w) / 2; + s->y = (link->h - s->h) / 2; + s->x &= ~((1 << s->hsub) - 1); + s->y &= ~((1 << s->vsub) - 1); return 0; fail_expr: @@ -218,10 +220,10 @@ fail_expr: static int config_output(AVFilterLink *link) { - CropContext *crop = link->src->priv; + CropContext *s = link->src->priv; - link->w = crop->w; - link->h = crop->h; + link->w = s->w; + link->h = s->h; return 0; } @@ -229,52 +231,56 @@ static int config_output(AVFilterLink *link) static int filter_frame(AVFilterLink *link, AVFrame *frame) { AVFilterContext *ctx = link->dst; - CropContext *crop = ctx->priv; + CropContext *s = ctx->priv; const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(link->format); int i; - frame->width = crop->w; - frame->height = crop->h; + frame->width = s->w; + frame->height = s->h; - crop->var_values[VAR_T] = frame->pts == AV_NOPTS_VALUE ? + s->var_values[VAR_T] = frame->pts == AV_NOPTS_VALUE ? NAN : frame->pts * av_q2d(link->time_base); - crop->var_values[VAR_X] = av_expr_eval(crop->x_pexpr, crop->var_values, NULL); - crop->var_values[VAR_Y] = av_expr_eval(crop->y_pexpr, crop->var_values, NULL); - crop->var_values[VAR_X] = av_expr_eval(crop->x_pexpr, crop->var_values, NULL); - - normalize_double(&crop->x, crop->var_values[VAR_X]); - normalize_double(&crop->y, crop->var_values[VAR_Y]); - - if (crop->x < 0) crop->x = 0; - if (crop->y < 0) crop->y = 0; - if ((unsigned)crop->x + (unsigned)crop->w > link->w) crop->x = link->w - crop->w; - if ((unsigned)crop->y + (unsigned)crop->h > link->h) crop->y = link->h - crop->h; - crop->x &= ~((1 << crop->hsub) - 1); - crop->y &= ~((1 << crop->vsub) - 1); + s->var_values[VAR_X] = av_expr_eval(s->x_pexpr, s->var_values, NULL); + s->var_values[VAR_Y] = av_expr_eval(s->y_pexpr, s->var_values, NULL); + s->var_values[VAR_X] = av_expr_eval(s->x_pexpr, s->var_values, NULL); + + normalize_double(&s->x, s->var_values[VAR_X]); + normalize_double(&s->y, s->var_values[VAR_Y]); + + if (s->x < 0) + s->x = 0; + if (s->y < 0) + s->y = 0; + if ((unsigned)s->x + (unsigned)s->w > link->w) + s->x = link->w - s->w; + if ((unsigned)s->y + (unsigned)s->h > link->h) + s->y = link->h - s->h; + s->x &= ~((1 << s->hsub) - 1); + s->y &= ~((1 << s->vsub) - 1); av_dlog(ctx, "n:%d t:%f x:%d y:%d x+w:%d y+h:%d\n", - (int)crop->var_values[VAR_N], crop->var_values[VAR_T], crop->x, - crop->y, crop->x+crop->w, crop->y+crop->h); + (int)s->var_values[VAR_N], s->var_values[VAR_T], s->x, + s->y, s->x+s->w, s->y+s->h); - frame->data[0] += crop->y * frame->linesize[0]; - frame->data[0] += crop->x * crop->max_step[0]; + frame->data[0] += s->y * frame->linesize[0]; + frame->data[0] += s->x * s->max_step[0]; if (!(desc->flags & AV_PIX_FMT_FLAG_PAL || desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL)) { for (i = 1; i < 3; i ++) { if (frame->data[i]) { - frame->data[i] += (crop->y >> crop->vsub) * frame->linesize[i]; - frame->data[i] += (crop->x * crop->max_step[i]) >> crop->hsub; + frame->data[i] += (s->y >> s->vsub) * frame->linesize[i]; + frame->data[i] += (s->x * s->max_step[i]) >> s->hsub; } } } /* alpha plane */ if (frame->data[3]) { - frame->data[3] += crop->y * frame->linesize[3]; - frame->data[3] += crop->x * crop->max_step[3]; + frame->data[3] += s->y * frame->linesize[3]; + frame->data[3] += s->x * s->max_step[3]; } - crop->var_values[VAR_N] += 1.0; + s->var_values[VAR_N] += 1.0; return ff_filter_frame(link->dst->outputs[0], frame); }