From 9f0e31d29a5f0c1a306ea3f0240edc7932158eaf Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Sun, 18 Jul 2010 22:37:39 +0000 Subject: [PATCH] Make avfilter.c dprintf* functions internal and declare them in an internal.h header, so they can be easily used from other files. Originally committed as revision 24319 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavfilter/avfilter.c | 17 ++++++++--------- libavfilter/avfilter.h | 2 +- libavfilter/internal.h | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 44 insertions(+), 10 deletions(-) create mode 100644 libavfilter/internal.h diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index f442cdc3b4..dc8f90d322 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -24,6 +24,7 @@ #include "libavcodec/imgconvert.h" #include "libavutil/pixdesc.h" #include "avfilter.h" +#include "internal.h" unsigned avfilter_version(void) { return LIBAVFILTER_VERSION_INT; @@ -168,7 +169,7 @@ int avfilter_config_links(AVFilterContext *filter) return 0; } -static void dprintf_picref(void *ctx, AVFilterPicRef *picref, int end) +void ff_dprintf_picref(void *ctx, AVFilterPicRef *picref, int end) { dprintf(ctx, "picref[%p data[%p, %p, %p, %p] linesize[%d, %d, %d, %d] pts:%"PRId64" pos:%"PRId64" a:%d/%d s:%dx%d]%s", @@ -180,7 +181,7 @@ static void dprintf_picref(void *ctx, AVFilterPicRef *picref, int end) end ? "\n" : ""); } -static void dprintf_link(void *ctx, AVFilterLink *link, int end) +void ff_dprintf_link(void *ctx, AVFilterLink *link, int end) { dprintf(ctx, "link[%p s:%dx%d fmt:%-16s %-16s->%-16s]%s", @@ -191,13 +192,11 @@ static void dprintf_link(void *ctx, AVFilterLink *link, int end) end ? "\n" : ""); } -#define DPRINTF_START(ctx, func) dprintf(NULL, "%-16s: ", #func) - AVFilterPicRef *avfilter_get_video_buffer(AVFilterLink *link, int perms, int w, int h) { AVFilterPicRef *ret = NULL; - DPRINTF_START(NULL, get_video_buffer); dprintf_link(NULL, link, 0); dprintf(NULL, " perms:%d w:%d h:%d\n", perms, w, h); + FF_DPRINTF_START(NULL, get_video_buffer); ff_dprintf_link(NULL, link, 0); dprintf(NULL, " perms:%d w:%d h:%d\n", perms, w, h); if(link_dpad(link).get_video_buffer) ret = link_dpad(link).get_video_buffer(link, perms, w, h); @@ -205,14 +204,14 @@ AVFilterPicRef *avfilter_get_video_buffer(AVFilterLink *link, int perms, int w, if(!ret) ret = avfilter_default_get_video_buffer(link, perms, w, h); - DPRINTF_START(NULL, get_video_buffer); dprintf_link(NULL, link, 0); dprintf(NULL, " returning "); dprintf_picref(NULL, ret, 1); + FF_DPRINTF_START(NULL, get_video_buffer); ff_dprintf_link(NULL, link, 0); dprintf(NULL, " returning "); ff_dprintf_picref(NULL, ret, 1); return ret; } int avfilter_request_frame(AVFilterLink *link) { - DPRINTF_START(NULL, request_frame); dprintf_link(NULL, link, 1); + FF_DPRINTF_START(NULL, request_frame); ff_dprintf_link(NULL, link, 1); if(link_spad(link).request_frame) return link_spad(link).request_frame(link); @@ -246,7 +245,7 @@ void avfilter_start_frame(AVFilterLink *link, AVFilterPicRef *picref) void (*start_frame)(AVFilterLink *, AVFilterPicRef *); AVFilterPad *dst = &link_dpad(link); - DPRINTF_START(NULL, start_frame); dprintf_link(NULL, link, 0); dprintf(NULL, " "); dprintf_picref(NULL, picref, 1); + FF_DPRINTF_START(NULL, start_frame); ff_dprintf_link(NULL, link, 0); dprintf(NULL, " "); ff_dprintf_picref(NULL, picref, 1); if(!(start_frame = dst->start_frame)) start_frame = avfilter_default_start_frame; @@ -295,7 +294,7 @@ void avfilter_draw_slice(AVFilterLink *link, int y, int h, int slice_dir) int i, j, vsub; void (*draw_slice)(AVFilterLink *, int, int, int); - DPRINTF_START(NULL, draw_slice); dprintf_link(NULL, link, 0); dprintf(NULL, " y:%d h:%d dir:%d\n", y, h, slice_dir); + FF_DPRINTF_START(NULL, draw_slice); ff_dprintf_link(NULL, link, 0); dprintf(NULL, " y:%d h:%d dir:%d\n", y, h, slice_dir); /* copy the slice if needed for permission reasons */ if(link->srcpic) { diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 3737d465af..f5f9bce674 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -26,7 +26,7 @@ #define LIBAVFILTER_VERSION_MAJOR 1 #define LIBAVFILTER_VERSION_MINOR 25 -#define LIBAVFILTER_VERSION_MICRO 0 +#define LIBAVFILTER_VERSION_MICRO 1 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ LIBAVFILTER_VERSION_MINOR, \ diff --git a/libavfilter/internal.h b/libavfilter/internal.h new file mode 100644 index 0000000000..9ddde36e15 --- /dev/null +++ b/libavfilter/internal.h @@ -0,0 +1,35 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg 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, + * 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 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVFILTER_INTERNAL_H +#define AVFILTER_INTERNAL_H + +/** + * @file + * internal API functions + */ + +#include "avfilter.h" + +void ff_dprintf_picref(void *ctx, AVFilterPicRef *picref, int end); + +void ff_dprintf_link(void *ctx, AVFilterLink *link, int end); + +#define FF_DPRINTF_START(ctx, func) dprintf(NULL, "%-16s: ", #func) + +#endif /* AVFILTER_INTERNAL_H */