lavfi: make filters less verbose.

Anton Khirnov committed 14 years ago

Commit 1a49a161 parent ce0a97526 files · +37 −38Browse files

Unified · Split

26 files

libavfilter/asrc_anullsrc.c +1 −1
libavfilter/avfilter.c +1 −1
libavfilter/buffersrc.c +1 −1
libavfilter/fifo.c +0 −1
libavfilter/vf_aspect.c +2 −2
libavfilter/vf_blackframe.c +1 −1
libavfilter/vf_crop.c +1 −1
libavfilter/vf_cropdetect.c +1 −1
libavfilter/vf_drawbox.c +1 −1
libavfilter/vf_fade.c +1 −1
libavfilter/vf_fieldorder.c +1 −1
libavfilter/vf_frei0r.c +9 −9
libavfilter/vf_gradfun.c +1 −1
libavfilter/vf_hqdn3d.c +1 −1
libavfilter/vf_libopencv.c +3 −3
libavfilter/vf_overlay.c +2 −2
libavfilter/vf_pad.c +1 −1
libavfilter/vf_scale.c +1 −1
libavfilter/vf_setpts.c +1 −1
libavfilter/vf_settb.c +1 −1
libavfilter/vf_transpose.c +1 −1
libavfilter/vf_unsharp.c +1 −1
libavfilter/vf_yadif.c +1 −1
libavfilter/vsrc_color.c +1 −1
libavfilter/vsrc_movie.c +1 −1
libavfilter/vsrc_nullsrc.c +1 −1

@@ -68,7 +68,7 @@ static int config_props(AVFilterLink *outlink) · 67 unmodified lines
68	68
69	69	chans_nb = av_get_channel_layout_nb_channels(priv->channel_layout);
70	70	av_get_channel_layout_string(buf, sizeof(buf), chans_nb, priv->channel_layout);
71		− av_log(outlink->src, AV_LOG_INFO,
	71	+ av_log(outlink->src, AV_LOG_VERBOSE,
72	72	"sample_rate:%"PRId64 " channel_layout:%"PRId64 " channel_layout_description:'%s'\n",
73	73	priv->sample_rate, priv->channel_layout, buf);
74	74

libavfilter/avfilter.c+1−1

@@ -101,7 +101,7 @@ int avfilter_insert_filter(AVFilterLink link, AVFilterContext filt, · 100 unmodified lines
101	101	int ret;
102	102	unsigned dstpad_idx = link->dstpad - link->dst->input_pads;
103	103
104		− av_log(link->dst, AV_LOG_INFO, "auto-inserting filter '%s' "
	104	+ av_log(link->dst, AV_LOG_VERBOSE, "auto-inserting filter '%s' "
105	105	"between the filter '%s' and the filter '%s'\n",
106	106	filt->name, link->src->name, link->dst->name);
107	107

libavfilter/buffersrc.c+1−1

@@ -178,7 +178,7 @@ static av_cold int init_video(AVFilterContext ctx, const char args) · 177 unmodified lines
178	178	if (!(c->fifo = av_fifo_alloc(sizeof(AVFilterBufferRef*))))
179	179	return AVERROR(ENOMEM);
180	180
181		− 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);
	181	+ 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);
182	182	return 0;
183	183	}
184	184

libavfilter/fifo.c+0−1

@@ -55,7 +55,6 @@ static av_cold int init(AVFilterContext ctx, const char args) · 54 unmodified lines
55	55	FifoContext *fifo = ctx->priv;
56	56	fifo->last = &fifo->root;
57	57
58		− av_log(ctx, AV_LOG_INFO, "\n");
59	58	return 0;
60	59	}
61	60

libavfilter/vf_aspect.c+2−2

@@ -60,7 +60,7 @@ static av_cold int init(AVFilterContext ctx, const char args) · 59 unmodified lines
60	60	if (aspect->aspect.den == 0)
61	61	aspect->aspect = (AVRational) {0, 1};
62	62
63		− av_log(ctx, AV_LOG_INFO, "a:%d/%d\n", aspect->aspect.num, aspect->aspect.den);
	63	+ av_log(ctx, AV_LOG_VERBOSE, "a:%d/%d\n", aspect->aspect.num, aspect->aspect.den);
64	64	return 0;
65	65	}
66	66
@@ -83,7 +83,7 @@ static int setdar_config_props(AVFilterLink *inlink) · 16 unmodified lines
83	83	aspect->aspect.num * inlink->h,
84	84	aspect->aspect.den * inlink->w, 100);
85	85
86		− av_log(inlink->dst, AV_LOG_INFO, "w:%d h:%d -> dar:%d/%d sar:%d/%d\n",
	86	+ av_log(inlink->dst, AV_LOG_VERBOSE, "w:%d h:%d -> dar:%d/%d sar:%d/%d\n",
87	87	inlink->w, inlink->h, dar.num, dar.den, aspect->aspect.num, aspect->aspect.den);
88	88
89	89	inlink->sample_aspect_ratio = aspect->aspect;

libavfilter/vf_blackframe.c+1−1

@@ -63,7 +63,7 @@ static av_cold int init(AVFilterContext ctx, const char args) · 62 unmodified lines
63	63	if (args)
64	64	sscanf(args, "%u:%u", &blackframe->bamount, &blackframe->bthresh);
65	65
66		− av_log(ctx, AV_LOG_INFO, "bamount:%u bthresh:%u\n",
	66	+ av_log(ctx, AV_LOG_VERBOSE, "bamount:%u bthresh:%u\n",
67	67	blackframe->bamount, blackframe->bthresh);
68	68
69	69	if (blackframe->bamount > 100 \|\| blackframe->bthresh > 255) {

libavfilter/vf_crop.c+1−1

@@ -207,7 +207,7 @@ static int config_input(AVFilterLink *link) · 206 unmodified lines
207	207	NULL, NULL, NULL, NULL, 0, ctx)) < 0)
208	208	return AVERROR(EINVAL);
209	209
210		− av_log(ctx, AV_LOG_INFO, "w:%d h:%d -> w:%d h:%d\n",
	210	+ av_log(ctx, AV_LOG_VERBOSE, "w:%d h:%d -> w:%d h:%d\n",
211	211	link->w, link->h, crop->w, crop->h);
212	212
213	213	if (crop->w <= 0 \|\| crop->h <= 0 \|\|

libavfilter/vf_cropdetect.c+1−1

@@ -92,7 +92,7 @@ static av_cold int init(AVFilterContext ctx, const char args) · 91 unmodified lines
92	92	if (args)
93	93	sscanf(args, "%d:%d:%d", &cd->limit, &cd->round, &cd->reset_count);
94	94
95		− av_log(ctx, AV_LOG_INFO, "limit:%d round:%d reset_count:%d\n",
	95	+ av_log(ctx, AV_LOG_VERBOSE, "limit:%d round:%d reset_count:%d\n",
96	96	cd->limit, cd->round, cd->reset_count);
97	97
98	98	return 0;

libavfilter/vf_drawbox.c+1−1

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

libavfilter/vf_fade.c+1−1

@@ -64,7 +64,7 @@ static av_cold int init(AVFilterContext ctx, const char args) · 63 unmodified lines
64	64	}
65	65	fade->stop_frame = fade->start_frame + nb_frames;
66	66
67		− av_log(ctx, AV_LOG_INFO,
	67	+ av_log(ctx, AV_LOG_VERBOSE,
68	68	"type:%s start_frame:%d nb_frames:%d\n",
69	69	in_out, fade->start_frame, nb_frames);
70	70	return 0;

libavfilter/vf_fieldorder.c+1−1

@@ -58,7 +58,7 @@ static av_cold int init(AVFilterContext ctx, const char args) · 57 unmodified lines
58	58	return AVERROR(EINVAL);
59	59	}
60	60
61		− av_log(ctx, AV_LOG_INFO, "output field order: %s\n",
	61	+ av_log(ctx, AV_LOG_VERBOSE, "output field order: %s\n",
62	62	fieldorder->dst_tff ? tff : bff);
63	63
64	64	return 0;

libavfilter/vf_frei0r.c+9−9

@@ -146,7 +146,7 @@ static int set_params(AVFilterContext ctx, const char params) · 145 unmodified lines
146	146	return ret;
147	147	}
148	148
149		− av_log(ctx, AV_LOG_INFO,
	149	+ av_log(ctx, AV_LOG_VERBOSE,
150	150	"idx:%d name:'%s' type:%s explanation:'%s' ",
151	151	i, info.name,
152	152	info.type == F0R_PARAM_BOOL ? "bool" :
@@ -157,7 +157,7 @@ static int set_params(AVFilterContext ctx, const char params) · 4 unmodified lines
157	157	info.explanation);
158	158
159	159	#ifdef DEBUG
160		− av_log(ctx, AV_LOG_INFO, "value:");
	160	+ av_log(ctx, AV_LOG_DEBUG, "value:");
161	161	switch (info.type) {
162	162	void *v;
163	163	double d;
@@ -168,31 +168,31 @@ static int set_params(AVFilterContext ctx, const char params) · 4 unmodified lines
168	168	case F0R_PARAM_BOOL:
169	169	v = &d;
170	170	frei0r->get_param_value(frei0r->instance, v, i);
171		− av_log(ctx, AV_LOG_INFO, "%s", d >= 0.5 && d <= 1.0 ? "y" : "n");
	171	+ av_log(ctx, AV_LOG_DEBUG, "%s", d >= 0.5 && d <= 1.0 ? "y" : "n");
172	172	break;
173	173	case F0R_PARAM_DOUBLE:
174	174	v = &d;
175	175	frei0r->get_param_value(frei0r->instance, v, i);
176		− av_log(ctx, AV_LOG_INFO, "%f", d);
	176	+ av_log(ctx, AV_LOG_DEBUG, "%f", d);
177	177	break;
178	178	case F0R_PARAM_COLOR:
179	179	v = &col;
180	180	frei0r->get_param_value(frei0r->instance, v, i);
181		− av_log(ctx, AV_LOG_INFO, "%f/%f/%f", col.r, col.g, col.b);
	181	+ av_log(ctx, AV_LOG_DEBUG, "%f/%f/%f", col.r, col.g, col.b);
182	182	break;
183	183	case F0R_PARAM_POSITION:
184	184	v = &pos;
185	185	frei0r->get_param_value(frei0r->instance, v, i);
186		− av_log(ctx, AV_LOG_INFO, "%lf/%lf", pos.x, pos.y);
	186	+ av_log(ctx, AV_LOG_DEBUG, "%lf/%lf", pos.x, pos.y);
187	187	break;
188	188	default: /* F0R_PARAM_STRING */
189	189	v = s;
190	190	frei0r->get_param_value(frei0r->instance, v, i);
191		− av_log(ctx, AV_LOG_INFO, "'%s'\n", s);
	191	+ av_log(ctx, AV_LOG_DEBUG, "'%s'\n", s);
192	192	break;
193	193	}
194	194	#endif
195		− av_log(ctx, AV_LOG_INFO, "\n");
	195	+ av_log(ctx, AV_LOG_VERBOSE, "\n");
196	196	}
197	197
198	198	return 0;
@@ -266,7 +266,7 @@ static av_cold int frei0r_init(AVFilterContext *ctx, · 67 unmodified lines
266	266	return AVERROR(EINVAL);
267	267	}
268	268
269		− av_log(ctx, AV_LOG_INFO,
	269	+ av_log(ctx, AV_LOG_VERBOSE,
270	270	"name:%s author:'%s' explanation:'%s' color_model:%s "
271	271	"frei0r_version:%d version:%d.%d num_params:%d\n",
272	272	pi->name, pi->author, pi->explanation,

libavfilter/vf_gradfun.c+1−1

@@ -142,7 +142,7 @@ static av_cold int init(AVFilterContext ctx, const char args) · 141 unmodified lines
142	142	if (HAVE_SSE && cpu_flags & AV_CPU_FLAG_SSE2)
143	143	gf->blur_line = ff_gradfun_blur_line_sse2;
144	144
145		− av_log(ctx, AV_LOG_INFO, "threshold:%.2f radius:%d\n", thresh, gf->radius);
	145	+ av_log(ctx, AV_LOG_VERBOSE, "threshold:%.2f radius:%d\n", thresh, gf->radius);
146	146
147	147	return 0;
148	148	}

libavfilter/vf_hqdn3d.c+1−1

@@ -238,7 +238,7 @@ static int init(AVFilterContext ctx, const char args) · 237 unmodified lines
238	238	}
239	239	}
240	240
241		− av_log(ctx, AV_LOG_INFO, "ls:%lf cs:%lf lt:%lf ct:%lf\n",
	241	+ av_log(ctx, AV_LOG_VERBOSE, "ls:%lf cs:%lf lt:%lf ct:%lf\n",
242	242	LumSpac, ChromSpac, LumTmp, ChromTmp);
243	243	if (LumSpac < 0 \|\| ChromSpac < 0 \|\| isnan(ChromTmp)) {
244	244	av_log(ctx, AV_LOG_ERROR,

libavfilter/vf_libopencv.c+3−3

@@ -121,7 +121,7 @@ static av_cold int smooth_init(AVFilterContext ctx, const char args) · 120 unmodified lines
121	121	return AVERROR(EINVAL);
122	122	}
123	123
124		− av_log(ctx, AV_LOG_INFO, "type:%s param1:%d param2:%d param3:%f param4:%f\n",
	124	+ av_log(ctx, AV_LOG_VERBOSE, "type:%s param1:%d param2:%d param3:%f param4:%f\n",
125	125	type_str, smooth->param1, smooth->param2, smooth->param3, smooth->param4);
126	126	return 0;
127	127	}
@@ -239,7 +239,7 @@ static int parse_iplconvkernel(IplConvKernel *kernel, char buf, void *log_ctx) · 111 unmodified lines
239	239	if (!*kernel)
240	240	return AVERROR(ENOMEM);
241	241
242		− av_log(log_ctx, AV_LOG_INFO, "Structuring element: w:%d h:%d x:%d y:%d shape:%s\n",
	242	+ av_log(log_ctx, AV_LOG_VERBOSE, "Structuring element: w:%d h:%d x:%d y:%d shape:%s\n",
243	243	rows, cols, anchor_x, anchor_y, shape_str);
244	244	return 0;
245	245	}
@@ -269,7 +269,7 @@ static av_cold int dilate_init(AVFilterContext ctx, const char args) · 23 unmodified lines
269	269	av_free(kernel_str);
270	270
271	271	sscanf(buf, ":%d", &dilate->nb_iterations);
272		− av_log(ctx, AV_LOG_INFO, "iterations_nb:%d\n", dilate->nb_iterations);
	272	+ av_log(ctx, AV_LOG_VERBOSE, "iterations_nb:%d\n", dilate->nb_iterations);
273	273	if (dilate->nb_iterations <= 0) {
274	274	av_log(ctx, AV_LOG_ERROR, "Invalid non-positive value '%d' for nb_iterations\n",
275	275	dilate->nb_iterations);

libavfilter/vf_overlay.c+2−2

@@ -151,7 +151,7 @@ static int config_input_overlay(AVFilterLink *inlink) · 150 unmodified lines
151	151	goto fail;
152	152	over->x = res;
153	153
154		− av_log(ctx, AV_LOG_INFO,
	154	+ av_log(ctx, AV_LOG_VERBOSE,
155	155	"main w:%d h:%d fmt:%s overlay x:%d y:%d w:%d h:%d fmt:%s\n",
156	156	ctx->inputs[MAIN]->w, ctx->inputs[MAIN]->h,
157	157	av_pix_fmt_descriptors[ctx->inputs[MAIN]->format].name,
@@ -190,7 +190,7 @@ static int config_output(AVFilterLink *outlink) · 32 unmodified lines
190	190	av_gcd((int64_t)tb1.num * tb2.den,
191	191	(int64_t)tb2.num * tb1.den),
192	192	(int64_t)tb1.den * tb2.den, INT_MAX);
193		− av_log(ctx, AV_LOG_INFO,
	193	+ av_log(ctx, AV_LOG_VERBOSE,
194	194	"main_tb:%d/%d overlay_tb:%d/%d -> tb:%d/%d exact:%d\n",
195	195	tb1.num, tb1.den, tb2.num, tb2.den, tb->num, tb->den, exact);
196	196	if (!exact)

libavfilter/vf_pad.c+1−1

@@ -220,7 +220,7 @@ static int config_input(AVFilterLink *inlink) · 219 unmodified lines
220	220	ff_fill_line_with_color(pad->line, pad->line_step, pad->w, pad->color,
221	221	inlink->format, rgba_color, &is_packed_rgba, NULL);
222	222
223		− 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",
	223	+ 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",
224	224	inlink->w, inlink->h, pad->w, pad->h, pad->x, pad->y,
225	225	pad->color[0], pad->color[1], pad->color[2], pad->color[3],
226	226	is_packed_rgba ? "rgba" : "yuva");

libavfilter/vf_scale.c+1−1

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

libavfilter/vf_setpts.c+1−1

@@ -94,7 +94,7 @@ static int config_input(AVFilterLink *inlink) · 93 unmodified lines
94	94
95	95	setpts->var_values[VAR_TB] = av_q2d(inlink->time_base);
96	96
97		− av_log(inlink->src, AV_LOG_INFO, "TB:%f\n", setpts->var_values[VAR_TB]);
	97	+ av_log(inlink->src, AV_LOG_VERBOSE, "TB:%f\n", setpts->var_values[VAR_TB]);
98	98	return 0;
99	99	}
100	100

libavfilter/vf_settb.c+1−1

@@ -97,7 +97,7 @@ static int config_output_props(AVFilterLink *outlink) · 96 unmodified lines
97	97	}
98	98
99	99	outlink->time_base = time_base;
100		− av_log(outlink->src, AV_LOG_INFO, "tb:%d/%d -> tb:%d/%d\n",
	100	+ av_log(outlink->src, AV_LOG_VERBOSE, "tb:%d/%d -> tb:%d/%d\n",
101	101	inlink ->time_base.num, inlink ->time_base.den,
102	102	outlink->time_base.num, outlink->time_base.den);
103	103

libavfilter/vf_transpose.c+1−1

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

libavfilter/vf_unsharp.c+1−1

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

libavfilter/vf_yadif.c+1−1

@@ -414,7 +414,7 @@ static av_cold int init(AVFilterContext ctx, const char args) · 413 unmodified lines
414	414	else if (HAVE_MMX && cpu_flags & AV_CPU_FLAG_MMX)
415	415	yadif->filter_line = ff_yadif_filter_line_mmx;
416	416
417		− av_log(ctx, AV_LOG_INFO, "mode:%d parity:%d auto_enable:%d\n", yadif->mode, yadif->parity, yadif->auto_enable);
	417	+ av_log(ctx, AV_LOG_VERBOSE, "mode:%d parity:%d auto_enable:%d\n", yadif->mode, yadif->parity, yadif->auto_enable);
418	418
419	419	return 0;
420	420	}

libavfilter/vsrc_color.c+1−1

@@ -127,7 +127,7 @@ static int color_config_props(AVFilterLink *inlink) · 126 unmodified lines
127	127	ff_fill_line_with_color(color->line, color->line_step, color->w, color->color,
128	128	inlink->format, rgba_color, &is_packed_rgba, NULL);
129	129
130		− av_log(ctx, AV_LOG_INFO, "w:%d h:%d r:%d/%d color:0x%02x%02x%02x%02x[%s]\n",
	130	+ av_log(ctx, AV_LOG_VERBOSE, "w:%d h:%d r:%d/%d color:0x%02x%02x%02x%02x[%s]\n",
131	131	color->w, color->h, color->time_base.den, color->time_base.num,
132	132	color->color[0], color->color[1], color->color[2], color->color[3],
133	133	is_packed_rgba ? "rgba" : "yuva");

libavfilter/vsrc_movie.c+1−1

@@ -155,7 +155,7 @@ static int movie_init(AVFilterContext *ctx) · 154 unmodified lines
155	155	movie->w = movie->codec_ctx->width;
156	156	movie->h = movie->codec_ctx->height;
157	157
158		− av_log(ctx, AV_LOG_INFO, "seek_point:%"PRIi64" format_name:%s file_name:%s stream_index:%d\n",
	158	+ av_log(ctx, AV_LOG_VERBOSE, "seek_point:%"PRIi64" format_name:%s file_name:%s stream_index:%d\n",
159	159	movie->seek_point, movie->format_name, movie->file_name,
160	160	movie->stream_index);
161	161

libavfilter/vsrc_nullsrc.c+1−1

@@ -100,7 +100,7 @@ static int config_props(AVFilterLink *outlink) · 99 unmodified lines
100	100	outlink->h = priv->h;
101	101	outlink->time_base = tb;
102	102
103		− av_log(outlink->src, AV_LOG_INFO, "w:%d h:%d tb:%d/%d\n", priv->w, priv->h,
	103	+ av_log(outlink->src, AV_LOG_VERBOSE, "w:%d h:%d tb:%d/%d\n", priv->w, priv->h,
104	104	tb.num, tb.den);
105	105
106	106	return 0;

lavfi: make filters less verbose.

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code