/*
- * copyright (c) 2007 Bobby Bingham
+ * Copyright (c) 2007 Bobby Bingham
*
- * 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
*/
* video crop filter
*/
+/* #define DEBUG */
+
#include "avfilter.h"
#include "libavutil/eval.h"
#include "libavutil/avstring.h"
#include "libavutil/libm.h"
-#include "libavcore/imgutils.h"
+#include "libavutil/imgutils.h"
+#include "libavutil/mathematics.h"
-static const char *var_names[] = {
+static const char *const var_names[] = {
"E",
"PHI",
"PI",
};
enum var_name {
- E,
- PHI,
- PI,
- IN_W, IW,
- IN_H, IH,
- OUT_W, OW,
- OUT_H, OH,
- X,
- Y,
- N,
- POS,
- T,
- VARS_NB
+ VAR_E,
+ VAR_PHI,
+ VAR_PI,
+ 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_N,
+ VAR_POS,
+ VAR_T,
+ VAR_VARS_NB
};
typedef struct {
int hsub, vsub; ///< chroma subsampling
char x_expr[256], y_expr[256], ow_expr[256], oh_expr[256];
AVExpr *x_pexpr, *y_pexpr; /* parsed expressions for x and y */
- double var_values[VARS_NB];
+ double var_values[VAR_VARS_NB];
} CropContext;
static int query_formats(AVFilterContext *ctx)
{
static const enum PixelFormat pix_fmts[] = {
PIX_FMT_RGB48BE, PIX_FMT_RGB48LE,
+ PIX_FMT_BGR48BE, PIX_FMT_BGR48LE,
PIX_FMT_ARGB, PIX_FMT_RGBA,
PIX_FMT_ABGR, PIX_FMT_BGRA,
PIX_FMT_RGB24, PIX_FMT_BGR24,
{
CropContext *crop = ctx->priv;
- av_free_expr(crop->x_pexpr); crop->x_pexpr = NULL;
- av_free_expr(crop->y_pexpr); crop->y_pexpr = NULL;
+ av_expr_free(crop->x_pexpr); crop->x_pexpr = NULL;
+ av_expr_free(crop->y_pexpr); crop->y_pexpr = NULL;
}
static inline int normalize_double(int *n, double d)
const char *expr;
double res;
- crop->var_values[E] = M_E;
- crop->var_values[PHI] = M_PHI;
- crop->var_values[PI] = M_PI;
- crop->var_values[IN_W] = crop->var_values[IW] = ctx->inputs[0]->w;
- crop->var_values[IN_H] = crop->var_values[IH] = ctx->inputs[0]->h;
- crop->var_values[X] = NAN;
- crop->var_values[Y] = NAN;
- crop->var_values[OUT_W] = crop->var_values[OW] = NAN;
- crop->var_values[OUT_H] = crop->var_values[OH] = NAN;
- crop->var_values[N] = 0;
- crop->var_values[T] = NAN;
- crop->var_values[POS] = NAN;
+ 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;
+ crop->var_values[VAR_POS] = NAN;
av_image_fill_max_pixsteps(crop->max_step, NULL, pix_desc);
crop->hsub = av_pix_fmt_descriptors[link->format].log2_chroma_w;
crop->vsub = av_pix_fmt_descriptors[link->format].log2_chroma_h;
- if ((ret = av_parse_and_eval_expr(&res, (expr = crop->ow_expr),
+ if ((ret = av_expr_parse_and_eval(&res, (expr = crop->ow_expr),
var_names, crop->var_values,
NULL, NULL, NULL, NULL, NULL, 0, ctx)) < 0) goto fail_expr;
- crop->var_values[OUT_W] = crop->var_values[OW] = res;
- if ((ret = av_parse_and_eval_expr(&res, (expr = crop->oh_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,
NULL, NULL, NULL, NULL, NULL, 0, ctx)) < 0) goto fail_expr;
- crop->var_values[OUT_H] = crop->var_values[OH] = res;
+ crop->var_values[VAR_OUT_H] = crop->var_values[VAR_OH] = res;
/* evaluate again ow as it may depend on oh */
- if ((ret = av_parse_and_eval_expr(&res, (expr = crop->ow_expr),
+ if ((ret = av_expr_parse_and_eval(&res, (expr = crop->ow_expr),
var_names, crop->var_values,
NULL, NULL, NULL, NULL, NULL, 0, ctx)) < 0) goto fail_expr;
- crop->var_values[OUT_W] = crop->var_values[OW] = res;
- if (normalize_double(&crop->w, crop->var_values[OUT_W]) < 0 ||
- normalize_double(&crop->h, crop->var_values[OUT_H]) < 0) {
+ 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) {
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->w &= ~((1 << crop->hsub) - 1);
crop->h &= ~((1 << crop->vsub) - 1);
- if ((ret = av_parse_expr(&crop->x_pexpr, crop->x_expr, var_names,
+ if ((ret = av_expr_parse(&crop->x_pexpr, crop->x_expr, var_names,
NULL, NULL, NULL, NULL, 0, ctx)) < 0 ||
- (ret = av_parse_expr(&crop->y_pexpr, crop->y_expr, var_names,
+ (ret = av_expr_parse(&crop->y_pexpr, crop->y_expr, var_names,
NULL, NULL, NULL, NULL, 0, ctx)) < 0)
return AVERROR(EINVAL);
+ av_log(ctx, AV_LOG_INFO, "w:%d h:%d -> w:%d h:%d\n",
+ link->w, link->h, crop->w, crop->h);
+
if (crop->w <= 0 || crop->h <= 0 ||
crop->w > link->w || crop->h > link->h) {
av_log(ctx, AV_LOG_ERROR,
{
AVFilterContext *ctx = link->dst;
CropContext *crop = ctx->priv;
- AVFilterBufferRef *ref2 = avfilter_ref_buffer(picref, ~0);
+ AVFilterBufferRef *ref2;
int i;
- picref->video->w = crop->w;
- picref->video->h = crop->h;
+ ref2 = avfilter_ref_buffer(picref, ~0);
+ ref2->video->w = crop->w;
+ ref2->video->h = crop->h;
- /* FIXME: when the TB will be settable */
- crop->var_values[T] = picref->pts == AV_NOPTS_VALUE ? NAN : (double)picref->pts / AV_TIME_BASE;
- crop->var_values[POS] = picref->pos == -1 ? NAN : picref->pos;
- crop->var_values[X] = av_eval_expr(crop->x_pexpr, crop->var_values, NULL);
- crop->var_values[Y] = av_eval_expr(crop->y_pexpr, crop->var_values, NULL);
- crop->var_values[X] = av_eval_expr(crop->x_pexpr, crop->var_values, NULL);
+ crop->var_values[VAR_T] = picref->pts == AV_NOPTS_VALUE ?
+ NAN : picref->pts * av_q2d(link->time_base);
+ crop->var_values[VAR_POS] = picref->pos == -1 ? NAN : picref->pos;
+ 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[X]);
- normalize_double(&crop->y, crop->var_values[Y]);
+ 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;
crop->x &= ~((1 << crop->hsub) - 1);
crop->y &= ~((1 << crop->vsub) - 1);
- av_log(ctx, AV_LOG_DEBUG,
- "n:%d t:%f x:%d y:%d x+w:%d y+h:%d\n",
- (int)crop->var_values[N], crop->var_values[T], crop->x, crop->y, crop->x+crop->w, crop->y+crop->h);
+ 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);
ref2->data[0] += crop->y * ref2->linesize[0];
ref2->data[0] += crop->x * crop->max_step[0];
- if (!(av_pix_fmt_descriptors[link->format].flags & PIX_FMT_PAL)) {
+ if (!(av_pix_fmt_descriptors[link->format].flags & PIX_FMT_PAL ||
+ av_pix_fmt_descriptors[link->format].flags & PIX_FMT_PSEUDOPAL)) {
for (i = 1; i < 3; i ++) {
if (ref2->data[i]) {
ref2->data[i] += (crop->y >> crop->vsub) * ref2->linesize[i];
{
CropContext *crop = link->dst->priv;
- crop->var_values[N] += 1.0;
+ crop->var_values[VAR_N] += 1.0;
avfilter_unref_buffer(link->cur_buf);
avfilter_end_frame(link->dst->outputs[0]);
}
projects / ffmpeg / blobdiff