Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavfi: make filters less verbose.

Browse Source
pull/59/head
Anton Khirnov 13 years ago
parent ce0a975689
commit 1a49a169eb
26 changed files with 37 additions and 38 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      libavfilter/asrc_anullsrc.c
  2. 2
      libavfilter/avfilter.c
  3. 2
      libavfilter/buffersrc.c
  4. 1
      libavfilter/fifo.c
  5. 4
      libavfilter/vf_aspect.c
  6. 2
      libavfilter/vf_blackframe.c
  7. 2
      libavfilter/vf_crop.c
  8. 2
      libavfilter/vf_cropdetect.c
  9. 2
      libavfilter/vf_drawbox.c
  10. 2
      libavfilter/vf_fade.c
  11. 2
      libavfilter/vf_fieldorder.c
  12. 18
      libavfilter/vf_frei0r.c
  13. 2
      libavfilter/vf_gradfun.c
  14. 2
      libavfilter/vf_hqdn3d.c
  15. 6
      libavfilter/vf_libopencv.c
  16. 4
      libavfilter/vf_overlay.c
  17. 2
      libavfilter/vf_pad.c
  18. 2
      libavfilter/vf_scale.c
  19. 2
      libavfilter/vf_setpts.c
  20. 2
      libavfilter/vf_settb.c
  21. 2
      libavfilter/vf_transpose.c
  22. 2
      libavfilter/vf_unsharp.c
  23. 2
      libavfilter/vf_yadif.c
  24. 2
      libavfilter/vsrc_color.c
  25. 2
      libavfilter/vsrc_movie.c
  26. 2
      libavfilter/vsrc_nullsrc.c

2
libavfilter/asrc_anullsrc.c
Unescape View File

@ -68,7 +68,7 @@ static int config_props(AVFilterLink *outlink)
chans_nb = av_get_channel_layout_nb_channels(priv->channel_layout);
av_get_channel_layout_string(buf, sizeof(buf), chans_nb, priv->channel_layout);
av_log(outlink->src, AV_LOG_INFO,
av_log(outlink->src, AV_LOG_VERBOSE,
"sample_rate:%"PRId64 " channel_layout:%"PRId64 " channel_layout_description:'%s'\n",
priv->sample_rate, priv->channel_layout, buf);

2
libavfilter/avfilter.c
Unescape View File

@ -101,7 +101,7 @@ int avfilter_insert_filter(AVFilterLink *link, AVFilterContext *filt,
int ret;
unsigned dstpad_idx = link->dstpad - link->dst->input_pads;
av_log(link->dst, AV_LOG_INFO, "auto-inserting filter '%s' "
av_log(link->dst, AV_LOG_VERBOSE, "auto-inserting filter '%s' "
"between the filter '%s' and the filter '%s'\n",
filt->name, link->src->name, link->dst->name);

2
libavfilter/buffersrc.c
Unescape View File

@ -178,7 +178,7 @@ static av_cold int init_video(AVFilterContext *ctx, const char *args)
if (!(c->fifo = av_fifo_alloc(sizeof(AVFilterBufferRef*))))
return AVERROR(ENOMEM);
av_log(ctx, AV_LOG_INFO, "w:%d h:%d pixfmt:%s\n", c->w, c->h, av_pix_fmt_descriptors[c->pix_fmt].name);
av_log(ctx, AV_LOG_VERBOSE, "w:%d h:%d pixfmt:%s\n", c->w, c->h, av_pix_fmt_descriptors[c->pix_fmt].name);
return 0;
}

1
libavfilter/fifo.c
Unescape View File

@ -55,7 +55,6 @@ static av_cold int init(AVFilterContext *ctx, const char *args)
FifoContext *fifo = ctx->priv;
fifo->last = &fifo->root;
av_log(ctx, AV_LOG_INFO, "\n");
return 0;
}

4
libavfilter/vf_aspect.c
Unescape View File

@ -60,7 +60,7 @@ static av_cold int init(AVFilterContext *ctx, const char *args)
if (aspect->aspect.den == 0)
aspect->aspect = (AVRational) {0, 1};
av_log(ctx, AV_LOG_INFO, "a:%d/%d\n", aspect->aspect.num, aspect->aspect.den);
av_log(ctx, AV_LOG_VERBOSE, "a:%d/%d\n", aspect->aspect.num, aspect->aspect.den);
return 0;
}
@ -83,7 +83,7 @@ static int setdar_config_props(AVFilterLink *inlink)
aspect->aspect.num * inlink->h,
aspect->aspect.den * inlink->w, 100);
av_log(inlink->dst, AV_LOG_INFO, "w:%d h:%d -> dar:%d/%d sar:%d/%d\n",
av_log(inlink->dst, AV_LOG_VERBOSE, "w:%d h:%d -> dar:%d/%d sar:%d/%d\n",
inlink->w, inlink->h, dar.num, dar.den, aspect->aspect.num, aspect->aspect.den);
inlink->sample_aspect_ratio = aspect->aspect;

2
libavfilter/vf_blackframe.c
Unescape View File

@ -63,7 +63,7 @@ static av_cold int init(AVFilterContext *ctx, const char *args)
if (args)
sscanf(args, "%u:%u", &blackframe->bamount, &blackframe->bthresh);
av_log(ctx, AV_LOG_INFO, "bamount:%u bthresh:%u\n",
av_log(ctx, AV_LOG_VERBOSE, "bamount:%u bthresh:%u\n",
blackframe->bamount, blackframe->bthresh);
if (blackframe->bamount > 100 || blackframe->bthresh > 255) {

2
libavfilter/vf_crop.c
Unescape View File

@ -207,7 +207,7 @@ static int config_input(AVFilterLink *link)
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",
av_log(ctx, AV_LOG_VERBOSE, "w:%d h:%d -> w:%d h:%d\n",
link->w, link->h, crop->w, crop->h);
if (crop->w <= 0 || crop->h <= 0 ||

2
libavfilter/vf_cropdetect.c
Unescape View File

@ -92,7 +92,7 @@ static av_cold int init(AVFilterContext *ctx, const char *args)
if (args)
sscanf(args, "%d:%d:%d", &cd->limit, &cd->round, &cd->reset_count);
av_log(ctx, AV_LOG_INFO, "limit:%d round:%d reset_count:%d\n",
av_log(ctx, AV_LOG_VERBOSE, "limit:%d round:%d reset_count:%d\n",
cd->limit, cd->round, cd->reset_count);
return 0;

2
libavfilter/vf_drawbox.c
Unescape View File

@ -87,7 +87,7 @@ static int config_input(AVFilterLink *inlink)
if (drawbox->w == 0) drawbox->w = inlink->w;
if (drawbox->h == 0) drawbox->h = inlink->h;
av_log(inlink->dst, AV_LOG_INFO, "x:%d y:%d w:%d h:%d color:0x%02X%02X%02X%02X\n",
av_log(inlink->dst, AV_LOG_VERBOSE, "x:%d y:%d w:%d h:%d color:0x%02X%02X%02X%02X\n",
drawbox->w, drawbox->y, drawbox->w, drawbox->h,
drawbox->yuv_color[Y], drawbox->yuv_color[U], drawbox->yuv_color[V], drawbox->yuv_color[A]);

2
libavfilter/vf_fade.c
Unescape View File

@ -64,7 +64,7 @@ static av_cold int init(AVFilterContext *ctx, const char *args)
}
fade->stop_frame = fade->start_frame + nb_frames;
av_log(ctx, AV_LOG_INFO,
av_log(ctx, AV_LOG_VERBOSE,
"type:%s start_frame:%d nb_frames:%d\n",
in_out, fade->start_frame, nb_frames);
return 0;

2
libavfilter/vf_fieldorder.c
Unescape View File

@ -58,7 +58,7 @@ static av_cold int init(AVFilterContext *ctx, const char *args)
return AVERROR(EINVAL);
}
av_log(ctx, AV_LOG_INFO, "output field order: %s\n",
av_log(ctx, AV_LOG_VERBOSE, "output field order: %s\n",
fieldorder->dst_tff ? tff : bff);
return 0;

18
libavfilter/vf_frei0r.c
Unescape View File

@ -146,7 +146,7 @@ static int set_params(AVFilterContext *ctx, const char *params)
return ret;
}
av_log(ctx, AV_LOG_INFO,
av_log(ctx, AV_LOG_VERBOSE,
"idx:%d name:'%s' type:%s explanation:'%s' ",
i, info.name,
info.type == F0R_PARAM_BOOL ? "bool" :
@ -157,7 +157,7 @@ static int set_params(AVFilterContext *ctx, const char *params)
info.explanation);
#ifdef DEBUG
av_log(ctx, AV_LOG_INFO, "value:");
av_log(ctx, AV_LOG_DEBUG, "value:");
switch (info.type) {
void *v;
double d;
@ -168,31 +168,31 @@ static int set_params(AVFilterContext *ctx, const char *params)
case F0R_PARAM_BOOL:
v = &d;
frei0r->get_param_value(frei0r->instance, v, i);
av_log(ctx, AV_LOG_INFO, "%s", d >= 0.5 && d <= 1.0 ? "y" : "n");
av_log(ctx, AV_LOG_DEBUG, "%s", d >= 0.5 && d <= 1.0 ? "y" : "n");
break;
case F0R_PARAM_DOUBLE:
v = &d;
frei0r->get_param_value(frei0r->instance, v, i);
av_log(ctx, AV_LOG_INFO, "%f", d);
av_log(ctx, AV_LOG_DEBUG, "%f", d);
break;
case F0R_PARAM_COLOR:
v = &col;
frei0r->get_param_value(frei0r->instance, v, i);
av_log(ctx, AV_LOG_INFO, "%f/%f/%f", col.r, col.g, col.b);
av_log(ctx, AV_LOG_DEBUG, "%f/%f/%f", col.r, col.g, col.b);
break;
case F0R_PARAM_POSITION:
v = &pos;
frei0r->get_param_value(frei0r->instance, v, i);
av_log(ctx, AV_LOG_INFO, "%lf/%lf", pos.x, pos.y);
av_log(ctx, AV_LOG_DEBUG, "%lf/%lf", pos.x, pos.y);
break;
default: /* F0R_PARAM_STRING */
v = s;
frei0r->get_param_value(frei0r->instance, v, i);
av_log(ctx, AV_LOG_INFO, "'%s'\n", s);
av_log(ctx, AV_LOG_DEBUG, "'%s'\n", s);
break;
}
#endif
av_log(ctx, AV_LOG_INFO, "\n");
av_log(ctx, AV_LOG_VERBOSE, "\n");
}
return 0;
@ -266,7 +266,7 @@ static av_cold int frei0r_init(AVFilterContext *ctx,
return AVERROR(EINVAL);
}
av_log(ctx, AV_LOG_INFO,
av_log(ctx, AV_LOG_VERBOSE,
"name:%s author:'%s' explanation:'%s' color_model:%s "
"frei0r_version:%d version:%d.%d num_params:%d\n",
pi->name, pi->author, pi->explanation,

2
libavfilter/vf_gradfun.c
Unescape View File

@ -142,7 +142,7 @@ static av_cold int init(AVFilterContext *ctx, const char *args)
if (HAVE_SSE && cpu_flags & AV_CPU_FLAG_SSE2)
gf->blur_line = ff_gradfun_blur_line_sse2;
av_log(ctx, AV_LOG_INFO, "threshold:%.2f radius:%d\n", thresh, gf->radius);
av_log(ctx, AV_LOG_VERBOSE, "threshold:%.2f radius:%d\n", thresh, gf->radius);
return 0;
}

2
libavfilter/vf_hqdn3d.c
Unescape View File

@ -238,7 +238,7 @@ static int init(AVFilterContext *ctx, const char *args)
}
}
av_log(ctx, AV_LOG_INFO, "ls:%lf cs:%lf lt:%lf ct:%lf\n",
av_log(ctx, AV_LOG_VERBOSE, "ls:%lf cs:%lf lt:%lf ct:%lf\n",
LumSpac, ChromSpac, LumTmp, ChromTmp);
if (LumSpac < 0 || ChromSpac < 0 || isnan(ChromTmp)) {
av_log(ctx, AV_LOG_ERROR,

6
libavfilter/vf_libopencv.c
Unescape View File

@ -121,7 +121,7 @@ static av_cold int smooth_init(AVFilterContext *ctx, const char *args)
return AVERROR(EINVAL);
}
av_log(ctx, AV_LOG_INFO, "type:%s param1:%d param2:%d param3:%f param4:%f\n",
av_log(ctx, AV_LOG_VERBOSE, "type:%s param1:%d param2:%d param3:%f param4:%f\n",
type_str, smooth->param1, smooth->param2, smooth->param3, smooth->param4);
return 0;
}
@ -239,7 +239,7 @@ static int parse_iplconvkernel(IplConvKernel **kernel, char *buf, void *log_ctx)
if (!*kernel)
return AVERROR(ENOMEM);
av_log(log_ctx, AV_LOG_INFO, "Structuring element: w:%d h:%d x:%d y:%d shape:%s\n",
av_log(log_ctx, AV_LOG_VERBOSE, "Structuring element: w:%d h:%d x:%d y:%d shape:%s\n",
rows, cols, anchor_x, anchor_y, shape_str);
return 0;
}
@ -269,7 +269,7 @@ static av_cold int dilate_init(AVFilterContext *ctx, const char *args)
av_free(kernel_str);
sscanf(buf, ":%d", &dilate->nb_iterations);
av_log(ctx, AV_LOG_INFO, "iterations_nb:%d\n", dilate->nb_iterations);
av_log(ctx, AV_LOG_VERBOSE, "iterations_nb:%d\n", dilate->nb_iterations);
if (dilate->nb_iterations <= 0) {
av_log(ctx, AV_LOG_ERROR, "Invalid non-positive value '%d' for nb_iterations\n",
dilate->nb_iterations);

4
libavfilter/vf_overlay.c
Unescape View File

@ -151,7 +151,7 @@ static int config_input_overlay(AVFilterLink *inlink)
goto fail;
over->x = res;
av_log(ctx, AV_LOG_INFO,
av_log(ctx, AV_LOG_VERBOSE,
"main w:%d h:%d fmt:%s overlay x:%d y:%d w:%d h:%d fmt:%s\n",
ctx->inputs[MAIN]->w, ctx->inputs[MAIN]->h,
av_pix_fmt_descriptors[ctx->inputs[MAIN]->format].name,
@ -190,7 +190,7 @@ static int config_output(AVFilterLink *outlink)
av_gcd((int64_t)tb1.num * tb2.den,
(int64_t)tb2.num * tb1.den),
(int64_t)tb1.den * tb2.den, INT_MAX);
av_log(ctx, AV_LOG_INFO,
av_log(ctx, AV_LOG_VERBOSE,
"main_tb:%d/%d overlay_tb:%d/%d -> tb:%d/%d exact:%d\n",
tb1.num, tb1.den, tb2.num, tb2.den, tb->num, tb->den, exact);
if (!exact)

2
libavfilter/vf_pad.c
Unescape View File

@ -220,7 +220,7 @@ static int config_input(AVFilterLink *inlink)
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 -> 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[%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");

2
libavfilter/vf_scale.c
Unescape View File

@ -215,7 +215,7 @@ static int config_props(AVFilterLink *outlink)
outlink->h = h;
/* TODO: make algorithm configurable */
av_log(ctx, AV_LOG_INFO, "w:%d h:%d fmt:%s -> w:%d h:%d fmt:%s flags:0x%0x\n",
av_log(ctx, AV_LOG_VERBOSE, "w:%d h:%d fmt:%s -> w:%d h:%d fmt:%s flags:0x%0x\n",
inlink ->w, inlink ->h, av_pix_fmt_descriptors[ inlink->format].name,
outlink->w, outlink->h, av_pix_fmt_descriptors[outlink->format].name,
scale->flags);

2
libavfilter/vf_setpts.c
Unescape View File

@ -94,7 +94,7 @@ static int config_input(AVFilterLink *inlink)
setpts->var_values[VAR_TB] = av_q2d(inlink->time_base);
av_log(inlink->src, AV_LOG_INFO, "TB:%f\n", setpts->var_values[VAR_TB]);
av_log(inlink->src, AV_LOG_VERBOSE, "TB:%f\n", setpts->var_values[VAR_TB]);
return 0;
}

2
libavfilter/vf_settb.c
Unescape View File

@ -97,7 +97,7 @@ static int config_output_props(AVFilterLink *outlink)
}
outlink->time_base = time_base;
av_log(outlink->src, AV_LOG_INFO, "tb:%d/%d -> tb:%d/%d\n",
av_log(outlink->src, AV_LOG_VERBOSE, "tb:%d/%d -> tb:%d/%d\n",
inlink ->time_base.num, inlink ->time_base.den,
outlink->time_base.num, outlink->time_base.den);

2
libavfilter/vf_transpose.c
Unescape View File

@ -110,7 +110,7 @@ static int config_props_output(AVFilterLink *outlink)
} else
outlink->sample_aspect_ratio = inlink->sample_aspect_ratio;
av_log(ctx, AV_LOG_INFO, "w:%d h:%d dir:%d -> w:%d h:%d rotation:%s vflip:%d\n",
av_log(ctx, AV_LOG_VERBOSE, "w:%d h:%d dir:%d -> w:%d h:%d rotation:%s vflip:%d\n",
inlink->w, inlink->h, trans->dir, outlink->w, outlink->h,
trans->dir == 1 || trans->dir == 3 ? "clockwise" : "counterclockwise",
trans->dir == 0 || trans->dir == 3);

2
libavfilter/vf_unsharp.c
Unescape View File

@ -177,7 +177,7 @@ static void init_filter_param(AVFilterContext *ctx, FilterParam *fp, const char
effect = fp->amount == 0 ? "none" : fp->amount < 0 ? "blur" : "sharpen";
av_log(ctx, AV_LOG_INFO, "effect:%s type:%s msize_x:%d msize_y:%d amount:%0.2f\n",
av_log(ctx, AV_LOG_VERBOSE, "effect:%s type:%s msize_x:%d msize_y:%d amount:%0.2f\n",
effect, effect_type, fp->msize_x, fp->msize_y, fp->amount / 65535.0);
for (z = 0; z < 2 * fp->steps_y; z++)

2
libavfilter/vf_yadif.c
Unescape View File

@ -414,7 +414,7 @@ static av_cold int init(AVFilterContext *ctx, const char *args)
else if (HAVE_MMX && cpu_flags & AV_CPU_FLAG_MMX)
yadif->filter_line = ff_yadif_filter_line_mmx;
av_log(ctx, AV_LOG_INFO, "mode:%d parity:%d auto_enable:%d\n", yadif->mode, yadif->parity, yadif->auto_enable);
av_log(ctx, AV_LOG_VERBOSE, "mode:%d parity:%d auto_enable:%d\n", yadif->mode, yadif->parity, yadif->auto_enable);
return 0;
}

2
libavfilter/vsrc_color.c
Unescape View File

@ -127,7 +127,7 @@ static int color_config_props(AVFilterLink *inlink)
ff_fill_line_with_color(color->line, color->line_step, color->w, color->color,
inlink->format, rgba_color, &is_packed_rgba, NULL);
av_log(ctx, AV_LOG_INFO, "w:%d h:%d r:%d/%d color:0x%02x%02x%02x%02x[%s]\n",
av_log(ctx, AV_LOG_VERBOSE, "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");

2
libavfilter/vsrc_movie.c
Unescape View File

@ -155,7 +155,7 @@ static int movie_init(AVFilterContext *ctx)
movie->w = movie->codec_ctx->width;
movie->h = movie->codec_ctx->height;
av_log(ctx, AV_LOG_INFO, "seek_point:%"PRIi64" format_name:%s file_name:%s stream_index:%d\n",
av_log(ctx, AV_LOG_VERBOSE, "seek_point:%"PRIi64" format_name:%s file_name:%s stream_index:%d\n",
movie->seek_point, movie->format_name, movie->file_name,
movie->stream_index);

2
libavfilter/vsrc_nullsrc.c
Unescape View File

@ -100,7 +100,7 @@ static int config_props(AVFilterLink *outlink)
outlink->h = priv->h;
outlink->time_base = tb;
av_log(outlink->src, AV_LOG_INFO, "w:%d h:%d tb:%d/%d\n", priv->w, priv->h,
av_log(outlink->src, AV_LOG_VERBOSE, "w:%d h:%d tb:%d/%d\n", priv->w, priv->h,
tb.num, tb.den);
return 0;

Write Preview
Loading…
Cancel
Save