Hi!
Ramiro Polla wrote:
Hello,
I'm almost back from vacations and want to dig into libavfilter when I
get a chance.
Nice!
- What's missing to get it integrated?
-- Already reviewed, changes needed --
Filter graphs. Thread:
http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/2008-February/042054.html
Filter graph parser. Thread:
http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/2008-February/042055.html
Scale filter. Thread:
http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/2008-February/042056.html
See also Bobby's last message in soc ML.
-- Not yet in reviewed --
ffmpeg.c patch - a tricky one
I have an idea for doing it gradually to minimize regressions, if you
want to work on it, ask me for details first.
vf_*.c
the ffplay.c patch
- How do I test it right now, with some files already in FFmpeg SVN and
some others in SOC SVN?
The idea is to simply get a fresh ffmpeg tree, a fresh soc tree in some
unrelated dir and them simply copy the soc tree over the libavfilter/
dir, overwriting the Makefile and allfilters.c files.
Unfortunately now the build system is a bit broken, so I suggest to
apply the patch I send recently to the list and also the attached one to
the soc tree...
-Vitor
Index: allfilters.c
===================================================================
--- allfilters.c (revision 1949)
+++ allfilters.c (working copy)
@@ -21,15 +21,11 @@
#include "avfilter.h"
-#define REGISTER_VF(X,x) { \
- extern AVFilter avfilter_vf_##x ; \
- if(ENABLE_VF_##X ) avfilter_register(&avfilter_vf_##x ); }
+#define REGISTER_FILTER(X,x,y) { \
+ extern AVFilter avfilter_##y##_##x ; \
+ if(ENABLE_##X##_FILTER ) avfilter_register(&avfilter_##y##_##x ); }
-#define REGISTER_VSRC(X,x) { \
- extern AVFilter avfilter_vsrc_##x ; \
- if(ENABLE_VSRC_##X ) avfilter_register(&avfilter_vsrc_##x ); }
-
void avfilter_register_all(void)
{
static int initialized;
@@ -38,24 +34,24 @@
return;
initialized = 1;
- REGISTER_VF(CROP,crop);
- REGISTER_VF(FIFO,fifo);
- REGISTER_VF(FORMAT,format);
- REGISTER_VF(FPS,fps);
- REGISTER_VF(GRAPH,graph);
- REGISTER_VF(GRAPHDESC,graphdesc);
- REGISTER_VF(GRAPHFILE,graphfile);
- REGISTER_VF(HFLIP,hflip);
- REGISTER_VF(NEGATE,negate);
- REGISTER_VF(NOFORMAT,noformat);
- REGISTER_VF(OVERLAY,overlay);
- REGISTER_VF(ROTATE,rotate);
- REGISTER_VF(SCALE,scale);
- REGISTER_VF(SETPTS,setpts);
- REGISTER_VF(SLICIFY,slicify);
- REGISTER_VF(SPLIT,split);
- REGISTER_VF(TRANSPOSE,transpose);
- REGISTER_VF(VFLIP,vflip);
+ REGISTER_FILTER (CROP,crop,vf);
+ REGISTER_FILTER(FIFO,fifo,vf);
+ REGISTER_FILTER(FORMAT,format,vf);
+ REGISTER_FILTER(FPS,fps,vf);
+ REGISTER_FILTER(GRAPH,graph,vf);
+ REGISTER_FILTER(GRAPHDESC,graphdesc,vf);
+ REGISTER_FILTER(GRAPHFILE,graphfile,vf);
+ REGISTER_FILTER(HFLIP,hflip,vf);
+ REGISTER_FILTER(NEGATE,negate,vf);
+ REGISTER_FILTER(NOFORMAT,noformat,vf);
+ REGISTER_FILTER(OVERLAY,overlay,vf);
+ REGISTER_FILTER(ROTATE,rotate,vf);
+ REGISTER_FILTER(SCALE,scale,vf);
+ REGISTER_FILTER(SETPTS,setpts,vf);
+ REGISTER_FILTER(SLICIFY,slicify,vf);
+ REGISTER_FILTER(SPLIT,split,vf);
+ REGISTER_FILTER(TRANSPOSE,transpose,vf);
+ REGISTER_FILTER(VFLIP,vflip,vf);
- REGISTER_VSRC(MOVIE,movie);
+ REGISTER_FILTER(MOVIE,movie,vsrc);
}
Index: Makefile
===================================================================
--- Makefile (revision 1949)
+++ Makefile (working copy)
@@ -13,22 +13,23 @@
# TODO: real conditional compilation
-OBJS-$(CONFIG_VF_CROP) += vf_crop.o
-OBJS-$(CONFIG_VF_FPS) += vf_fps.o
-OBJS-$(CONFIG_VF_HFLIP) += vf_hflip.o
-OBJS-$(CONFIG_VF_NEGATE) += vf_negate.o
-OBJS-$(CONFIG_VF_FIFO) += vf_fifo.o
-OBJS-$(CONFIG_VF_FORMAT) += vf_format.o
-OBJS-$(CONFIG_VF_OVERLAY) += vf_overlay.o
-OBJS-$(CONFIG_VF_ROTATE) += vf_rotate.o
-OBJS-$(CONFIG_VF_SCALE) += vf_scale.o
-OBJS-$(CONFIG_VF_SETPTS) += vf_setpts.o
-OBJS-$(CONFIG_VF_SLICIFY) += vf_slicify.o
-OBJS-$(CONFIG_VF_SPLIT) += vf_split.o
-OBJS-$(CONFIG_VF_TRANSPOSE) += vf_transpose.o
-OBJS-$(CONFIG_VF_VFLIP) += vf_vflip.o
-OBJS-$(CONFIG_VSRC_MOVIE) += vsrc_movie.o
+OBJS-$(CONFIG_CROP_FILTER) += vf_crop.o
+OBJS-$(CONFIG_FPS_FILTER) += vf_fps.o
+OBJS-$(CONFIG_HFLIP_FILTER) += vf_hflip.o
+OBJS-$(CONFIG_NEGATE_FILTER) += vf_negate.o
+OBJS-$(CONFIG_FIFO_FILTER) += vf_fifo.o
+OBJS-$(CONFIG_FORMAT_FILTER) += vf_format.o
+OBJS-$(CONFIG_OVERLAY_FILTER) += vf_overlay.o
+OBJS-$(CONFIG_ROTATE_FILTER) += vf_rotate.o
+OBJS-$(CONFIG_SCALE_FILTER) += vf_scale.o
+OBJS-$(CONFIG_SETPTS_FILTER) += vf_setpts.o
+OBJS-$(CONFIG_SLICIFY_FILTER) += vf_slicify.o
+OBJS-$(CONFIG_SPLIT_FILTER) += vf_split.o
+OBJS-$(CONFIG_TRANSPOSE_FILTER) += vf_transpose.o
+OBJS-$(CONFIG_VFLIP_FILTER) += vf_vflip.o
+OBJS-$(CONFIG_MOVIE_FILTER) += vsrc_movie.o
+
HEADERS = avfilter.h
EXTRALIBS := -L$(BUILD_ROOT)/libavcodec -lavcodec$(BUILDSUF) \
_______________________________________________
FFmpeg-soc mailing list
[email protected]
https://lists.mplayerhq.hu/mailman/listinfo/ffmpeg-soc
