From 1a3eb042c704dea190c644def5b32c9cee8832b8 Mon Sep 17 00:00:00 2001 From: Vittorio Giovara Date: Mon, 16 Mar 2015 08:57:35 +0000 Subject: Replace av_dlog with normal av_log at trace level This applies to every library where performance is not critical. --- libavfilter/avfilter.c | 4 ++-- libavfilter/internal.h | 2 +- libavfilter/setpts.c | 2 +- libavfilter/vf_crop.c | 2 +- libavfilter/vf_drawtext.c | 2 +- libavfilter/vf_fieldorder.c | 2 +- libavfilter/vsrc_movie.c | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) (limited to 'libavfilter') diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index fd73cd0083..8ede145686 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -225,7 +225,7 @@ int avfilter_config_links(AVFilterContext *filter) void ff_dlog_link(void *ctx, AVFilterLink *link, int end) { if (link->type == AVMEDIA_TYPE_VIDEO) { - av_dlog(ctx, + av_log(ctx, AV_LOG_TRACE, "link[%p s:%dx%d fmt:%-16s %-16s->%-16s]%s", link, link->w, link->h, av_get_pix_fmt_name(link->format), @@ -236,7 +236,7 @@ void ff_dlog_link(void *ctx, AVFilterLink *link, int end) char buf[128]; av_get_channel_layout_string(buf, sizeof(buf), -1, link->channel_layout); - av_dlog(ctx, + av_log(ctx, AV_LOG_TRACE, "link[%p r:%d cl:%s fmt:%-16s %-16s->%-16s]%s", link, link->sample_rate, buf, av_get_sample_fmt_name(link->format), diff --git a/libavfilter/internal.h b/libavfilter/internal.h index 6a752dc7e4..4ddedbb4b3 100644 --- a/libavfilter/internal.h +++ b/libavfilter/internal.h @@ -145,7 +145,7 @@ void ff_avfilter_default_free_buffer(AVFilterBuffer *buf); /** Tell is a format is contained in the provided list terminated by -1. */ int ff_fmt_is_in(int fmt, const int *fmts); -#define FF_DPRINTF_START(ctx, func) av_dlog(NULL, "%-16s: ", #func) +#define FF_DPRINTF_START(ctx, func) av_log(NULL, AV_LOG_TRACE, "%-16s: ", #func) void ff_dlog_link(void *ctx, AVFilterLink *link, int end); diff --git a/libavfilter/setpts.c b/libavfilter/setpts.c index fa7a0be0a9..98bafc284a 100644 --- a/libavfilter/setpts.c +++ b/libavfilter/setpts.c @@ -143,7 +143,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) d = av_expr_eval(setpts->expr, setpts->var_values, NULL); frame->pts = D2TS(d); - av_dlog(inlink->dst, + av_log(inlink->dst, AV_LOG_TRACE, "n:%"PRId64" interlaced:%d pts:%"PRId64" t:%f -> pts:%"PRId64" t:%f\n", (int64_t)setpts->var_values[VAR_N], (int)setpts->var_values[VAR_INTERLACED], diff --git a/libavfilter/vf_crop.c b/libavfilter/vf_crop.c index 9e820d753f..4122d52f88 100644 --- a/libavfilter/vf_crop.c +++ b/libavfilter/vf_crop.c @@ -265,7 +265,7 @@ static int filter_frame(AVFilterLink *link, AVFrame *frame) 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", + av_log(ctx, AV_LOG_TRACE, "n:%d t:%f x:%d y:%d x+w:%d y+h:%d\n", (int)s->var_values[VAR_N], s->var_values[VAR_T], s->x, s->y, s->x+s->w, s->y+s->h); diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c index 0befb5657d..82e805b394 100644 --- a/libavfilter/vf_drawtext.c +++ b/libavfilter/vf_drawtext.c @@ -927,7 +927,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) 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", + av_log(ctx, AV_LOG_TRACE, "n:%d t:%f x:%d y:%d x+w:%d y+h:%d\n", (int)s->var_values[VAR_N], s->var_values[VAR_T], s->x, s->y, s->x+s->w, s->y+s->h); diff --git a/libavfilter/vf_fieldorder.c b/libavfilter/vf_fieldorder.c index c05d08154e..dd4f8cc694 100644 --- a/libavfilter/vf_fieldorder.c +++ b/libavfilter/vf_fieldorder.c @@ -102,7 +102,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) return ff_filter_frame(outlink, frame); } - av_dlog(ctx, + av_log(ctx, AV_LOG_TRACE, "picture will move %s one line\n", s->dst_tff ? "up" : "down"); h = frame->height; diff --git a/libavfilter/vsrc_movie.c b/libavfilter/vsrc_movie.c index 0e5df327d8..a99be39758 100644 --- a/libavfilter/vsrc_movie.c +++ b/libavfilter/vsrc_movie.c @@ -222,7 +222,7 @@ static int movie_get_frame(AVFilterLink *outlink) if (frame_decoded) { if (movie->frame->pkt_pts != AV_NOPTS_VALUE) movie->frame->pts = movie->frame->pkt_pts; - av_dlog(outlink->src, + av_log(outlink->src, AV_LOG_TRACE, "movie_get_frame(): file:'%s' pts:%"PRId64" time:%f aspect:%d/%d\n", movie->file_name, movie->frame->pts, (double)movie->frame->pts * -- cgit v1.2.3