vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Fri Nov 25 22:46:06 2016 +0200| [c06e3ed9d9bb9e215a4123751f77f3a1707d8b82] | committer: Rémi Denis-Courmont
Remove most nested headers from <vlc_filter.h> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c06e3ed9d9bb9e215a4123751f77f3a1707d8b82 --- include/vlc_filter.h | 23 ++++++++++++----------- include/vlc_mouse.h | 2 +- modules/hw/vdpau/adjust.c | 1 + modules/hw/vdpau/chroma.c | 1 + modules/hw/vdpau/deinterlace.c | 1 + modules/hw/vdpau/sharpen.c | 1 + modules/text_renderer/freetype/freetype.c | 1 + modules/text_renderer/nsspeechsynthesizer.m | 1 + modules/text_renderer/sapi.cpp | 1 + modules/text_renderer/svg.c | 1 + modules/video_chroma/chain.c | 1 + modules/video_chroma/cvpx_i420.c | 1 + modules/video_chroma/d3d11_surface.c | 1 + modules/video_chroma/dxa9.c | 1 + modules/video_chroma/grey_yuv.c | 1 + modules/video_chroma/i420_10_p010.c | 1 + modules/video_chroma/i420_nv12.c | 1 + modules/video_chroma/i420_rgb.c | 1 + modules/video_chroma/i420_rgb16.c | 1 + modules/video_chroma/i420_rgb16_x86.c | 1 + modules/video_chroma/i420_rgb8.c | 1 + modules/video_chroma/i420_yuy2.c | 1 + modules/video_chroma/i422_i420.c | 1 + modules/video_chroma/i422_yuy2.c | 1 + modules/video_chroma/omxdl.c | 1 + modules/video_chroma/rv32.c | 1 + modules/video_chroma/swscale.c | 1 + modules/video_chroma/yuvp.c | 1 + modules/video_chroma/yuy2_i420.c | 1 + modules/video_chroma/yuy2_i422.c | 1 + modules/video_filter/adjust.c | 2 +- modules/video_filter/adjust_sat_hue.c | 1 + modules/video_filter/alphamask.c | 1 + modules/video_filter/anaglyph.c | 2 +- modules/video_filter/antiflicker.c | 1 + modules/video_filter/audiobargraph_v.c | 2 +- modules/video_filter/ball.c | 6 +++--- modules/video_filter/blend.cpp | 1 + modules/video_filter/blendbench.c | 1 + modules/video_filter/bluescreen.c | 1 + modules/video_filter/canvas.c | 1 + modules/video_filter/colorthres.c | 1 + modules/video_filter/croppadd.c | 1 + modules/video_filter/deinterlace/deinterlace.c | 1 + modules/video_filter/edgedetection.c | 1 + modules/video_filter/erase.c | 2 +- modules/video_filter/extract.c | 6 +++--- modules/video_filter/fps.c | 1 + modules/video_filter/freeze.c | 3 ++- modules/video_filter/gaussianblur.c | 2 +- modules/video_filter/gradfun.c | 1 + modules/video_filter/gradient.c | 2 +- modules/video_filter/grain.c | 2 +- modules/video_filter/hqdn3d.c | 1 + modules/video_filter/invert.c | 2 +- modules/video_filter/logo.c | 3 ++- modules/video_filter/magnify.c | 2 ++ modules/video_filter/marq.c | 1 + modules/video_filter/mirror.c | 1 + modules/video_filter/mosaic.c | 6 +++--- modules/video_filter/motionblur.c | 1 + modules/video_filter/motiondetect.c | 2 +- modules/video_filter/oldmovie.c | 1 + modules/video_filter/opencv_example.cpp | 1 + modules/video_filter/opencv_wrapper.c | 2 +- modules/video_filter/posterize.c | 1 + modules/video_filter/postproc.c | 1 + modules/video_filter/psychedelic.c | 2 +- modules/video_filter/puzzle.c | 2 ++ modules/video_filter/puzzle.h | 5 ++++- modules/video_filter/puzzle_lib.c | 1 + modules/video_filter/puzzle_mgt.c | 1 + modules/video_filter/puzzle_pce.c | 1 + modules/video_filter/remoteosd.c | 4 ++-- modules/video_filter/ripple.c | 1 + modules/video_filter/rotate.c | 1 + modules/video_filter/rss.c | 8 +++----- modules/video_filter/scale.c | 1 + modules/video_filter/scene.c | 2 +- modules/video_filter/sepia.c | 1 + modules/video_filter/sharpen.c | 2 +- modules/video_filter/transform.c | 2 ++ modules/video_filter/vhs.c | 1 + modules/video_filter/wave.c | 2 +- src/misc/filter_chain.c | 1 + 85 files changed, 113 insertions(+), 45 deletions(-) diff --git a/include/vlc_filter.h b/include/vlc_filter.h index 1dde411..0301930 100644 --- a/include/vlc_filter.h +++ b/include/vlc_filter.h @@ -26,9 +26,6 @@ #define VLC_FILTER_H 1 #include <vlc_es.h> -#include <vlc_picture.h> -#include <vlc_subpicture.h> -#include <vlc_mouse.h> /** * \defgroup filter Filters @@ -58,6 +55,7 @@ typedef struct filter_owner_t }; } filter_owner_t; +struct vlc_mouse_t; /** Structure describing a filter * @warning BIG FAT WARNING : the code relies on the first 4 members of @@ -127,12 +125,12 @@ struct filter_t * - Otherwise, the mouse change is not propagated. * If NULL, the mouse state is considered unchanged and will be * propagated. */ - int (*pf_video_mouse)( filter_t *, vlc_mouse_t *, - const vlc_mouse_t *p_old, - const vlc_mouse_t *p_new ); - int (*pf_sub_mouse)( filter_t *, const vlc_mouse_t *p_old, - const vlc_mouse_t *p_new, - const video_format_t * ); + int (*pf_video_mouse)( filter_t *, struct vlc_mouse_t *, + const struct vlc_mouse_t *p_old, + const struct vlc_mouse_t *p_new ); + int (*pf_sub_mouse)( filter_t *, const struct vlc_mouse_t *p_old, + const struct vlc_mouse_t *p_new, + const video_format_t * ); }; /* Input attachments @@ -412,14 +410,17 @@ VLC_API subpicture_t *filter_chain_SubFilter(filter_chain_t *chain, * * The vlc_mouse_t* pointers may be the same. */ -VLC_API int filter_chain_MouseFilter( filter_chain_t *, vlc_mouse_t *, const vlc_mouse_t * ); +VLC_API int filter_chain_MouseFilter( filter_chain_t *, struct vlc_mouse_t *, + const struct vlc_mouse_t * ); /** * Inform the filter chain of mouse state. * * It makes sense only for a sub source chain. */ -VLC_API int filter_chain_MouseEvent( filter_chain_t *, const vlc_mouse_t *, const video_format_t * ); +VLC_API int filter_chain_MouseEvent( filter_chain_t *, + const struct vlc_mouse_t *, + const video_format_t * ); int filter_chain_ForEach( filter_chain_t *chain, int (*cb)( filter_t *, void * ), void *opaque ); diff --git a/include/vlc_mouse.h b/include/vlc_mouse.h index b488535..481c359 100644 --- a/include/vlc_mouse.h +++ b/include/vlc_mouse.h @@ -42,7 +42,7 @@ enum /** * Mouse state */ -typedef struct +typedef struct vlc_mouse_t { /* Coordinate */ int i_x; diff --git a/modules/hw/vdpau/adjust.c b/modules/hw/vdpau/adjust.c index e495fd5..0c11345 100644 --- a/modules/hw/vdpau/adjust.c +++ b/modules/hw/vdpau/adjust.c @@ -29,6 +29,7 @@ #include <vlc_plugin.h> #include <vlc_filter.h> #include <vlc_atomic.h> +#include <vlc_picture.h> #include "vlc_vdpau.h" struct filter_sys_t diff --git a/modules/hw/vdpau/chroma.c b/modules/hw/vdpau/chroma.c index 85b61f4..5d76541 100644 --- a/modules/hw/vdpau/chroma.c +++ b/modules/hw/vdpau/chroma.c @@ -29,6 +29,7 @@ #include <vlc_common.h> #include <vlc_plugin.h> #include <vlc_filter.h> +#include <vlc_picture.h> #include "vlc_vdpau.h" /* Picture history as recommended by VDPAU documentation */ diff --git a/modules/hw/vdpau/deinterlace.c b/modules/hw/vdpau/deinterlace.c index 9dc7264..a1370a7 100644 --- a/modules/hw/vdpau/deinterlace.c +++ b/modules/hw/vdpau/deinterlace.c @@ -28,6 +28,7 @@ #include <vlc_common.h> #include <vlc_plugin.h> #include <vlc_filter.h> +#include <vlc_picture.h> #include "vlc_vdpau.h" struct filter_sys_t diff --git a/modules/hw/vdpau/sharpen.c b/modules/hw/vdpau/sharpen.c index a1f3ad5..df7232b 100644 --- a/modules/hw/vdpau/sharpen.c +++ b/modules/hw/vdpau/sharpen.c @@ -27,6 +27,7 @@ #include <vlc_common.h> #include <vlc_plugin.h> #include <vlc_filter.h> +#include <vlc_picture.h> #include <vlc_atomic.h> #include "vlc_vdpau.h" diff --git a/modules/text_renderer/freetype/freetype.c b/modules/text_renderer/freetype/freetype.c index c75770a..6baf45f 100644 --- a/modules/text_renderer/freetype/freetype.c +++ b/modules/text_renderer/freetype/freetype.c @@ -39,6 +39,7 @@ #include <vlc_plugin.h> #include <vlc_input.h> /* vlc_input_attachment_* */ #include <vlc_filter.h> /* filter_sys_t */ +#include <vlc_subpicture.h> #include <vlc_text_style.h> /* text_style_t*/ #include <vlc_charset.h> diff --git a/modules/text_renderer/nsspeechsynthesizer.m b/modules/text_renderer/nsspeechsynthesizer.m index 6d4bc87..3651ddf 100644 --- a/modules/text_renderer/nsspeechsynthesizer.m +++ b/modules/text_renderer/nsspeechsynthesizer.m @@ -32,6 +32,7 @@ #include <vlc_common.h> #include <vlc_plugin.h> #include <vlc_filter.h> +#include <vlc_subpicture.h> #import <Cocoa/Cocoa.h> diff --git a/modules/text_renderer/sapi.cpp b/modules/text_renderer/sapi.cpp index 9f183b6..d64545a 100644 --- a/modules/text_renderer/sapi.cpp +++ b/modules/text_renderer/sapi.cpp @@ -36,6 +36,7 @@ #include <vlc_plugin.h> #include <vlc_filter.h> #include <vlc_charset.h> +#include <vlc_subpicture.h> #define INITGUID diff --git a/modules/text_renderer/svg.c b/modules/text_renderer/svg.c index deb5dd5..71f2492 100644 --- a/modules/text_renderer/svg.c +++ b/modules/text_renderer/svg.c @@ -33,6 +33,7 @@ #include <vlc_plugin.h> #include <vlc_fs.h> #include <vlc_filter.h> +#include <vlc_subpicture.h> #include <sys/types.h> #include <unistd.h> diff --git a/modules/video_chroma/chain.c b/modules/video_chroma/chain.c index 94413e0..5ef662d 100644 --- a/modules/video_chroma/chain.c +++ b/modules/video_chroma/chain.c @@ -32,6 +32,7 @@ #include <vlc_common.h> #include <vlc_plugin.h> #include <vlc_filter.h> +#include <vlc_picture.h> /***************************************************************************** * Module descriptor diff --git a/modules/video_chroma/cvpx_i420.c b/modules/video_chroma/cvpx_i420.c index 22827a1..1abff9d 100644 --- a/modules/video_chroma/cvpx_i420.c +++ b/modules/video_chroma/cvpx_i420.c @@ -31,6 +31,7 @@ #include <vlc_common.h> #include <vlc_plugin.h> #include <vlc_filter.h> +#include <vlc_picture.h> #include "copy.h" struct picture_sys_t { diff --git a/modules/video_chroma/d3d11_surface.c b/modules/video_chroma/d3d11_surface.c index 270e9e4..f4a27a8 100644 --- a/modules/video_chroma/d3d11_surface.c +++ b/modules/video_chroma/d3d11_surface.c @@ -31,6 +31,7 @@ #include <vlc_common.h> #include <vlc_plugin.h> #include <vlc_filter.h> +#include <vlc_picture.h> #include "copy.h" #include "dxgi_fmt.h" diff --git a/modules/video_chroma/dxa9.c b/modules/video_chroma/dxa9.c index cb3ed8a..ddaa379 100644 --- a/modules/video_chroma/dxa9.c +++ b/modules/video_chroma/dxa9.c @@ -32,6 +32,7 @@ #include <vlc_common.h> #include <vlc_plugin.h> #include <vlc_filter.h> +#include <vlc_picture.h> #include "copy.h" diff --git a/modules/video_chroma/grey_yuv.c b/modules/video_chroma/grey_yuv.c index cfc4c58..0d522d4 100644 --- a/modules/video_chroma/grey_yuv.c +++ b/modules/video_chroma/grey_yuv.c @@ -32,6 +32,7 @@ #include <vlc_common.h> #include <vlc_plugin.h> #include <vlc_filter.h> +#include <vlc_picture.h> #define SRC_FOURCC "GREY" #define DEST_FOURCC "I420,YUY2" diff --git a/modules/video_chroma/i420_10_p010.c b/modules/video_chroma/i420_10_p010.c index 73fe1d4..f73c4d5 100644 --- a/modules/video_chroma/i420_10_p010.c +++ b/modules/video_chroma/i420_10_p010.c @@ -31,6 +31,7 @@ #include <vlc_common.h> #include <vlc_plugin.h> #include <vlc_filter.h> +#include <vlc_picture.h> #include "copy.h" /***************************************************************************** diff --git a/modules/video_chroma/i420_nv12.c b/modules/video_chroma/i420_nv12.c index 92bf7b2..996b372 100644 --- a/modules/video_chroma/i420_nv12.c +++ b/modules/video_chroma/i420_nv12.c @@ -31,6 +31,7 @@ #include <vlc_common.h> #include <vlc_plugin.h> #include <vlc_filter.h> +#include <vlc_picture.h> #include "copy.h" /***************************************************************************** diff --git a/modules/video_chroma/i420_rgb.c b/modules/video_chroma/i420_rgb.c index 0f19b6f..515cbf4 100644 --- a/modules/video_chroma/i420_rgb.c +++ b/modules/video_chroma/i420_rgb.c @@ -35,6 +35,7 @@ #include <vlc_common.h> #include <vlc_plugin.h> #include <vlc_filter.h> +#include <vlc_picture.h> #include <vlc_cpu.h> #include "i420_rgb.h" diff --git a/modules/video_chroma/i420_rgb16.c b/modules/video_chroma/i420_rgb16.c index 25e7206..acf7a04 100644 --- a/modules/video_chroma/i420_rgb16.c +++ b/modules/video_chroma/i420_rgb16.c @@ -28,6 +28,7 @@ #include <vlc_common.h> #include <vlc_filter.h> +#include <vlc_picture.h> #include <vlc_cpu.h> #include "i420_rgb.h" diff --git a/modules/video_chroma/i420_rgb16_x86.c b/modules/video_chroma/i420_rgb16_x86.c index 0b111c3..896694c 100644 --- a/modules/video_chroma/i420_rgb16_x86.c +++ b/modules/video_chroma/i420_rgb16_x86.c @@ -28,6 +28,7 @@ #include <vlc_common.h> #include <vlc_filter.h> +#include <vlc_picture.h> #include <vlc_cpu.h> #include "i420_rgb.h" diff --git a/modules/video_chroma/i420_rgb8.c b/modules/video_chroma/i420_rgb8.c index ddd402c..a012897 100644 --- a/modules/video_chroma/i420_rgb8.c +++ b/modules/video_chroma/i420_rgb8.c @@ -31,6 +31,7 @@ #include <vlc_common.h> #include <vlc_filter.h> +#include <vlc_picture.h> #include "i420_rgb.h" #include "i420_rgb_c.h" diff --git a/modules/video_chroma/i420_yuy2.c b/modules/video_chroma/i420_yuy2.c index c0505e1..cf3b8fb 100644 --- a/modules/video_chroma/i420_yuy2.c +++ b/modules/video_chroma/i420_yuy2.c @@ -33,6 +33,7 @@ #include <vlc_common.h> #include <vlc_plugin.h> #include <vlc_filter.h> +#include <vlc_picture.h> #include <vlc_cpu.h> #if defined (MODULE_NAME_IS_i420_yuy2_altivec) && defined(HAVE_ALTIVEC_H) diff --git a/modules/video_chroma/i422_i420.c b/modules/video_chroma/i422_i420.c index f1b01ef..28912b8 100644 --- a/modules/video_chroma/i422_i420.c +++ b/modules/video_chroma/i422_i420.c @@ -33,6 +33,7 @@ #include <vlc_common.h> #include <vlc_plugin.h> #include <vlc_filter.h> +#include <vlc_picture.h> #define SRC_FOURCC "I422,J422" #define DEST_FOURCC "I420,IYUV,J420,YV12,YUVA" diff --git a/modules/video_chroma/i422_yuy2.c b/modules/video_chroma/i422_yuy2.c index 9b712d1..9ca5e78 100644 --- a/modules/video_chroma/i422_yuy2.c +++ b/modules/video_chroma/i422_yuy2.c @@ -33,6 +33,7 @@ #include <vlc_common.h> #include <vlc_plugin.h> #include <vlc_filter.h> +#include <vlc_picture.h> #include <vlc_cpu.h> #include "i422_yuy2.h" diff --git a/modules/video_chroma/omxdl.c b/modules/video_chroma/omxdl.c index 7f2b0e8..5964551 100644 --- a/modules/video_chroma/omxdl.c +++ b/modules/video_chroma/omxdl.c @@ -25,6 +25,7 @@ #include <vlc_common.h> #include <vlc_plugin.h> #include <vlc_filter.h> +#include <vlc_picture.h> #include <omxtypes.h> #include <omxIP.h> diff --git a/modules/video_chroma/rv32.c b/modules/video_chroma/rv32.c index 70ef8b7..5b8e315 100644 --- a/modules/video_chroma/rv32.c +++ b/modules/video_chroma/rv32.c @@ -31,6 +31,7 @@ #include <vlc_common.h> #include <vlc_plugin.h> #include <vlc_filter.h> +#include <vlc_picture.h> /**************************************************************************** * Local prototypes diff --git a/modules/video_chroma/swscale.c b/modules/video_chroma/swscale.c index c1d7d8f..1741eef 100644 --- a/modules/video_chroma/swscale.c +++ b/modules/video_chroma/swscale.c @@ -33,6 +33,7 @@ #include <vlc_common.h> #include <vlc_plugin.h> #include <vlc_filter.h> +#include <vlc_picture.h> #include <vlc_cpu.h> #include <libswscale/swscale.h> diff --git a/modules/video_chroma/yuvp.c b/modules/video_chroma/yuvp.c index cf22aa5..a48322a 100644 --- a/modules/video_chroma/yuvp.c +++ b/modules/video_chroma/yuvp.c @@ -31,6 +31,7 @@ #include <vlc_common.h> #include <vlc_plugin.h> #include <vlc_filter.h> +#include <vlc_picture.h> #include <assert.h> /* TODO: diff --git a/modules/video_chroma/yuy2_i420.c b/modules/video_chroma/yuy2_i420.c index f720610..40c548b 100644 --- a/modules/video_chroma/yuy2_i420.c +++ b/modules/video_chroma/yuy2_i420.c @@ -32,6 +32,7 @@ #include <vlc_common.h> #include <vlc_plugin.h> #include <vlc_filter.h> +#include <vlc_picture.h> #define SRC_FOURCC "YUY2,YUNV,YVYU,UYVY,UYNV,Y422" #define DEST_FOURCC "I420" diff --git a/modules/video_chroma/yuy2_i422.c b/modules/video_chroma/yuy2_i422.c index 41d36fd..524b489 100644 --- a/modules/video_chroma/yuy2_i422.c +++ b/modules/video_chroma/yuy2_i422.c @@ -32,6 +32,7 @@ #include <vlc_common.h> #include <vlc_plugin.h> #include <vlc_filter.h> +#include <vlc_picture.h> #define SRC_FOURCC "YUY2,YUNV,YVYU,UYVY,UYNV,Y422" #define DEST_FOURCC "I422" diff --git a/modules/video_filter/adjust.c b/modules/video_filter/adjust.c index 4fa140f..7b5c784 100644 --- a/modules/video_filter/adjust.c +++ b/modules/video_filter/adjust.c @@ -35,8 +35,8 @@ #include <vlc_common.h> #include <vlc_plugin.h> - #include <vlc_filter.h> +#include <vlc_picture.h> #include "filter_picture.h" #include "adjust_sat_hue.h" diff --git a/modules/video_filter/adjust_sat_hue.c b/modules/video_filter/adjust_sat_hue.c index 589e3cb..f7a3d61 100644 --- a/modules/video_filter/adjust_sat_hue.c +++ b/modules/video_filter/adjust_sat_hue.c @@ -28,6 +28,7 @@ #include <assert.h> #include <vlc_filter.h> +#include <vlc_picture.h> #include "filter_picture.h" #include "adjust_sat_hue.h" diff --git a/modules/video_filter/alphamask.c b/modules/video_filter/alphamask.c index 7e61f79..716f8b3 100644 --- a/modules/video_filter/alphamask.c +++ b/modules/video_filter/alphamask.c @@ -34,6 +34,7 @@ #include <vlc_image.h> #include <vlc_filter.h> +#include <vlc_picture.h> #include <vlc_url.h> #define ALPHAMASK_HELP N_( \ diff --git a/modules/video_filter/anaglyph.c b/modules/video_filter/anaglyph.c index 501f1f2..4d05ab1 100644 --- a/modules/video_filter/anaglyph.c +++ b/modules/video_filter/anaglyph.c @@ -27,8 +27,8 @@ #include <vlc_common.h> #include <vlc_plugin.h> - #include <vlc_filter.h> +#include <vlc_picture.h> #include "filter_picture.h" static int Create(vlc_object_t *); diff --git a/modules/video_filter/antiflicker.c b/modules/video_filter/antiflicker.c index ffbec52..4df37ab 100644 --- a/modules/video_filter/antiflicker.c +++ b/modules/video_filter/antiflicker.c @@ -33,6 +33,7 @@ #include <vlc_plugin.h> #include <vlc_filter.h> #include <vlc_atomic.h> +#include <vlc_picture.h> #include "filter_picture.h" /***************************************************************************** diff --git a/modules/video_filter/audiobargraph_v.c b/modules/video_filter/audiobargraph_v.c index 1b8ac4f..8e6623d 100644 --- a/modules/video_filter/audiobargraph_v.c +++ b/modules/video_filter/audiobargraph_v.c @@ -34,7 +34,7 @@ #include <vlc_common.h> #include <vlc_plugin.h> #include <vlc_filter.h> - +#include <vlc_subpicture.h> #include <vlc_image.h> /***************************************************************************** diff --git a/modules/video_filter/ball.c b/modules/video_filter/ball.c index a0fcd36..c4c1f47 100644 --- a/modules/video_filter/ball.c +++ b/modules/video_filter/ball.c @@ -38,10 +38,10 @@ #include <vlc_common.h> #include <vlc_plugin.h> - -#include "vlc_filter.h" +#include <vlc_picture.h> +#include <vlc_filter.h> #include "filter_picture.h" -#include "vlc_image.h" +#include <vlc_image.h> enum { RED, GREEN, BLUE, WHITE }; diff --git a/modules/video_filter/blend.cpp b/modules/video_filter/blend.cpp index 0da5a0e..cea8cd6 100644 --- a/modules/video_filter/blend.cpp +++ b/modules/video_filter/blend.cpp @@ -31,6 +31,7 @@ #include <vlc_common.h> #include <vlc_plugin.h> #include <vlc_filter.h> +#include <vlc_picture.h> #include "filter_picture.h" /***************************************************************************** diff --git a/modules/video_filter/blendbench.c b/modules/video_filter/blendbench.c index 299e942..47bf893 100644 --- a/modules/video_filter/blendbench.c +++ b/modules/video_filter/blendbench.c @@ -35,6 +35,7 @@ #include <vlc_modules.h> #include <vlc_filter.h> +#include <vlc_picture.h> #include <vlc_image.h> /***************************************************************************** diff --git a/modules/video_filter/bluescreen.c b/modules/video_filter/bluescreen.c index 9cd4802..8fe5d86 100644 --- a/modules/video_filter/bluescreen.c +++ b/modules/video_filter/bluescreen.c @@ -32,6 +32,7 @@ #include <vlc_common.h> #include <vlc_plugin.h> #include <vlc_filter.h> +#include <vlc_picture.h> #define BLUESCREEN_HELP N_( \ "This effect, also known as \"greenscreen\" or \"chroma key\" blends " \ diff --git a/modules/video_filter/canvas.c b/modules/video_filter/canvas.c index 9e9b660..b0d7d32 100644 --- a/modules/video_filter/canvas.c +++ b/modules/video_filter/canvas.c @@ -34,6 +34,7 @@ #include <vlc_common.h> #include <vlc_plugin.h> #include <vlc_filter.h> +#include <vlc_picture.h> /***************************************************************************** * Local and extern prototypes. diff --git a/modules/video_filter/colorthres.c b/modules/video_filter/colorthres.c index 19a495b..314ac80 100644 --- a/modules/video_filter/colorthres.c +++ b/modules/video_filter/colorthres.c @@ -37,6 +37,7 @@ #include <vlc_sout.h> #include <vlc_atomic.h> #include <vlc_filter.h> +#include <vlc_picture.h> #include "filter_picture.h" /***************************************************************************** diff --git a/modules/video_filter/croppadd.c b/modules/video_filter/croppadd.c index 8623a7b..f0145bb 100644 --- a/modules/video_filter/croppadd.c +++ b/modules/video_filter/croppadd.c @@ -33,6 +33,7 @@ #include <vlc_common.h> #include <vlc_plugin.h> #include <vlc_filter.h> +#include <vlc_picture.h> #include "filter_picture.h" /**************************************************************************** diff --git a/modules/video_filter/deinterlace/deinterlace.c b/modules/video_filter/deinterlace/deinterlace.c index f041264..9123add 100644 --- a/modules/video_filter/deinterlace/deinterlace.c +++ b/modules/video_filter/deinterlace/deinterlace.c @@ -39,6 +39,7 @@ #include <vlc_common.h> #include <vlc_plugin.h> #include <vlc_filter.h> +#include <vlc_picture.h> #include <vlc_cpu.h> #include <vlc_mouse.h> diff --git a/modules/video_filter/edgedetection.c b/modules/video_filter/edgedetection.c index 2b1d8fd..bea5010 100644 --- a/modules/video_filter/edgedetection.c +++ b/modules/video_filter/edgedetection.c @@ -31,6 +31,7 @@ #include <vlc_common.h> #include <vlc_plugin.h> #include <vlc_filter.h> +#include <vlc_picture.h> /***************************************************************************** * Module descriptor diff --git a/modules/video_filter/erase.c b/modules/video_filter/erase.c index 8f6edfe..2bce92b 100644 --- a/modules/video_filter/erase.c +++ b/modules/video_filter/erase.c @@ -33,8 +33,8 @@ #include <vlc_plugin.h> #include <vlc_sout.h> #include <vlc_image.h> - #include <vlc_filter.h> +#include <vlc_picture.h> #include <vlc_url.h> #include "filter_picture.h" diff --git a/modules/video_filter/extract.c b/modules/video_filter/extract.c index 43dfde1..87da7c7 100644 --- a/modules/video_filter/extract.c +++ b/modules/video_filter/extract.c @@ -29,14 +29,14 @@ # include "config.h" #endif +#include <math.h> + #include <vlc_common.h> #include <vlc_plugin.h> - #include <vlc_filter.h> +#include <vlc_picture.h> #include "filter_picture.h" -#include "math.h" - /***************************************************************************** * Local prototypes *****************************************************************************/ diff --git a/modules/video_filter/fps.c b/modules/video_filter/fps.c index 0f0c568..2c301e2 100644 --- a/modules/video_filter/fps.c +++ b/modules/video_filter/fps.c @@ -31,6 +31,7 @@ #include <vlc_common.h> #include <vlc_plugin.h> #include <vlc_filter.h> +#include <vlc_picture.h> static int Open( vlc_object_t *p_this); static void Close( vlc_object_t *p_this); diff --git a/modules/video_filter/freeze.c b/modules/video_filter/freeze.c index 8ad641f..a8b2087 100644 --- a/modules/video_filter/freeze.c +++ b/modules/video_filter/freeze.c @@ -32,7 +32,8 @@ #include <vlc_common.h> #include <vlc_plugin.h> #include <vlc_filter.h> - +#include <vlc_mouse.h> +#include <vlc_picture.h> #include "filter_picture.h" #ifndef MOD diff --git a/modules/video_filter/gaussianblur.c b/modules/video_filter/gaussianblur.c index 293a3c2..de3bcf4 100644 --- a/modules/video_filter/gaussianblur.c +++ b/modules/video_filter/gaussianblur.c @@ -32,8 +32,8 @@ #include <vlc_common.h> #include <vlc_plugin.h> #include <vlc_memory.h> - #include <vlc_filter.h> +#include <vlc_picture.h> #include "filter_picture.h" #include <math.h> /* exp(), sqrt() */ diff --git a/modules/video_filter/gradfun.c b/modules/video_filter/gradfun.c index f9e6b91..0b8f36e 100644 --- a/modules/video_filter/gradfun.c +++ b/modules/video_filter/gradfun.c @@ -35,6 +35,7 @@ #include <vlc_plugin.h> #include <vlc_cpu.h> #include <vlc_filter.h> +#include <vlc_picture.h> /***************************************************************************** * Module descriptor diff --git a/modules/video_filter/gradient.c b/modules/video_filter/gradient.c index 0394f97..55a84e9 100644 --- a/modules/video_filter/gradient.c +++ b/modules/video_filter/gradient.c @@ -35,8 +35,8 @@ #include <vlc_common.h> #include <vlc_plugin.h> #include <vlc_sout.h> - #include <vlc_filter.h> +#include <vlc_picture.h> #include "filter_picture.h" enum { GRADIENT, EDGE, HOUGH }; diff --git a/modules/video_filter/grain.c b/modules/video_filter/grain.c index 3d6dee5..fc8c7fb 100644 --- a/modules/video_filter/grain.c +++ b/modules/video_filter/grain.c @@ -35,7 +35,7 @@ #include <vlc_plugin.h> #include <vlc_filter.h> #include <vlc_cpu.h> - +#include <vlc_picture.h> #include <vlc_rand.h> /***************************************************************************** diff --git a/modules/video_filter/hqdn3d.c b/modules/video_filter/hqdn3d.c index e566f1b..c9b9baf 100644 --- a/modules/video_filter/hqdn3d.c +++ b/modules/video_filter/hqdn3d.c @@ -32,6 +32,7 @@ #include <vlc_common.h> #include <vlc_plugin.h> #include <vlc_filter.h> +#include <vlc_picture.h> #include "filter_picture.h" diff --git a/modules/video_filter/invert.c b/modules/video_filter/invert.c index bd5bd52..8e41f46 100644 --- a/modules/video_filter/invert.c +++ b/modules/video_filter/invert.c @@ -31,8 +31,8 @@ #include <vlc_common.h> #include <vlc_plugin.h> - #include <vlc_filter.h> +#include <vlc_picture.h> #include "filter_picture.h" /***************************************************************************** diff --git a/modules/video_filter/logo.c b/modules/video_filter/logo.c index 0404e8d..edc5936 100644 --- a/modules/video_filter/logo.c +++ b/modules/video_filter/logo.c @@ -34,8 +34,9 @@ #include <vlc_common.h> #include <vlc_plugin.h> #include <vlc_filter.h> +#include <vlc_mouse.h> +#include <vlc_subpicture.h> #include <vlc_url.h> - #include <vlc_image.h> #ifdef LoadImage diff --git a/modules/video_filter/magnify.c b/modules/video_filter/magnify.c index 0a9fac4..d11f540 100644 --- a/modules/video_filter/magnify.c +++ b/modules/video_filter/magnify.c @@ -35,6 +35,8 @@ #include <vlc_plugin.h> #include <vlc_image.h> #include <vlc_filter.h> +#include <vlc_mouse.h> +#include <vlc_picture.h> #include "filter_picture.h" /***************************************************************************** diff --git a/modules/video_filter/marq.c b/modules/video_filter/marq.c index 761d203..28c04f8 100644 --- a/modules/video_filter/marq.c +++ b/modules/video_filter/marq.c @@ -39,6 +39,7 @@ #include <vlc_block.h> #include <vlc_fs.h> #include <vlc_strings.h> +#include <vlc_subpicture.h> /***************************************************************************** * Local prototypes diff --git a/modules/video_filter/mirror.c b/modules/video_filter/mirror.c index d1482f4..719428e 100644 --- a/modules/video_filter/mirror.c +++ b/modules/video_filter/mirror.c @@ -35,6 +35,7 @@ #include <vlc_plugin.h> #include <vlc_atomic.h> #include <vlc_filter.h> +#include <vlc_picture.h> #include "filter_picture.h" /***************************************************************************** diff --git a/modules/video_filter/mosaic.c b/modules/video_filter/mosaic.c index 87c8efb..30e2b35 100644 --- a/modules/video_filter/mosaic.c +++ b/modules/video_filter/mosaic.c @@ -29,14 +29,14 @@ # include "config.h" #endif -#include <vlc_common.h> -#include <vlc_plugin.h> - #include <math.h> #include <limits.h> /* INT_MAX */ +#include <vlc_common.h> +#include <vlc_plugin.h> #include <vlc_filter.h> #include <vlc_image.h> +#include <vlc_subpicture.h> #include "mosaic.h" diff --git a/modules/video_filter/motionblur.c b/modules/video_filter/motionblur.c index 8389015..fc3eee9 100644 --- a/modules/video_filter/motionblur.c +++ b/modules/video_filter/motionblur.c @@ -35,6 +35,7 @@ #include <vlc_sout.h> #include <vlc_filter.h> #include <vlc_atomic.h> +#include <vlc_picture.h> #include "filter_picture.h" /***************************************************************************** diff --git a/modules/video_filter/motiondetect.c b/modules/video_filter/motiondetect.c index f6b3dbc..fee7e60 100644 --- a/modules/video_filter/motiondetect.c +++ b/modules/video_filter/motiondetect.c @@ -32,8 +32,8 @@ #include <vlc_common.h> #include <vlc_plugin.h> #include <vlc_sout.h> - #include <vlc_filter.h> +#include <vlc_picture.h> #include "filter_picture.h" /***************************************************************************** diff --git a/modules/video_filter/oldmovie.c b/modules/video_filter/oldmovie.c index 0f1d22a..f78e0f3 100644 --- a/modules/video_filter/oldmovie.c +++ b/modules/video_filter/oldmovie.c @@ -34,6 +34,7 @@ #include <vlc_common.h> #include <vlc_plugin.h> #include <vlc_filter.h> +#include <vlc_picture.h> #include <vlc_rand.h> #include <vlc_mtime.h> diff --git a/modules/video_filter/opencv_example.cpp b/modules/video_filter/opencv_example.cpp index b2a332d..a7a0bd7 100644 --- a/modules/video_filter/opencv_example.cpp +++ b/modules/video_filter/opencv_example.cpp @@ -35,6 +35,7 @@ #include <vlc_common.h> #include <vlc_plugin.h> #include <vlc_filter.h> +#include <vlc_picture.h> #include <vlc_vout.h> #include <vlc_image.h> #include "filter_event_info.h" diff --git a/modules/video_filter/opencv_wrapper.c b/modules/video_filter/opencv_wrapper.c index dc6f63c..c9c0b22 100644 --- a/modules/video_filter/opencv_wrapper.c +++ b/modules/video_filter/opencv_wrapper.c @@ -34,7 +34,7 @@ #include <vlc_plugin.h> #include <vlc_vout.h> #include <vlc_modules.h> - +#include <vlc_picture.h> #include <vlc_filter.h> #include <vlc_image.h> #include "filter_picture.h" diff --git a/modules/video_filter/posterize.c b/modules/video_filter/posterize.c index 21da2d9..2eab2d7 100644 --- a/modules/video_filter/posterize.c +++ b/modules/video_filter/posterize.c @@ -35,6 +35,7 @@ #include <vlc_plugin.h> #include <vlc_atomic.h> #include <vlc_filter.h> +#include <vlc_picture.h> #include "filter_picture.h" /***************************************************************************** diff --git a/modules/video_filter/postproc.c b/modules/video_filter/postproc.c index 6325c93..65968bf 100644 --- a/modules/video_filter/postproc.c +++ b/modules/video_filter/postproc.c @@ -38,6 +38,7 @@ #include <vlc_common.h> #include <vlc_plugin.h> #include <vlc_filter.h> +#include <vlc_picture.h> #include <vlc_cpu.h> #include "filter_picture.h" diff --git a/modules/video_filter/psychedelic.c b/modules/video_filter/psychedelic.c index 8c671d4..3619a81 100644 --- a/modules/video_filter/psychedelic.c +++ b/modules/video_filter/psychedelic.c @@ -34,8 +34,8 @@ #include <vlc_common.h> #include <vlc_plugin.h> - #include <vlc_filter.h> +#include <vlc_picture.h> #include <vlc_image.h> #include "filter_picture.h" diff --git a/modules/video_filter/puzzle.c b/modules/video_filter/puzzle.c index bf43926..22b3b9f 100644 --- a/modules/video_filter/puzzle.c +++ b/modules/video_filter/puzzle.c @@ -35,6 +35,8 @@ #include <vlc_common.h> #include <vlc_plugin.h> #include <vlc_filter.h> +#include <vlc_mouse.h> +#include <vlc_picture.h> #include <vlc_rand.h> #include "filter_picture.h" diff --git a/modules/video_filter/puzzle.h b/modules/video_filter/puzzle.h index f4638b1..2b9da63 100644 --- a/modules/video_filter/puzzle.h +++ b/modules/video_filter/puzzle.h @@ -71,8 +71,11 @@ struct filter_sys_t { point_t **ps_bezier_pts_H; }; +struct vlc_mouse_t; + picture_t *Filter( filter_t *, picture_t * ); int puzzle_Callback( vlc_object_t *, char const *, vlc_value_t, vlc_value_t, void * ); -int puzzle_mouse( filter_t *, vlc_mouse_t *, const vlc_mouse_t *, const vlc_mouse_t * ); +int puzzle_mouse( filter_t *, struct vlc_mouse_t *, const struct vlc_mouse_t *, + const struct vlc_mouse_t * ); #endif diff --git a/modules/video_filter/puzzle_lib.c b/modules/video_filter/puzzle_lib.c index 0790c55..369ec4e 100644 --- a/modules/video_filter/puzzle_lib.c +++ b/modules/video_filter/puzzle_lib.c @@ -35,6 +35,7 @@ #include <vlc_common.h> #include <vlc_plugin.h> #include <vlc_filter.h> +#include <vlc_picture.h> #include <vlc_rand.h> #include "filter_picture.h" diff --git a/modules/video_filter/puzzle_mgt.c b/modules/video_filter/puzzle_mgt.c index d770d7a..2e085e8 100644 --- a/modules/video_filter/puzzle_mgt.c +++ b/modules/video_filter/puzzle_mgt.c @@ -35,6 +35,7 @@ #include <vlc_common.h> #include <vlc_plugin.h> #include <vlc_filter.h> +#include <vlc_picture.h> #include <vlc_rand.h> #include "filter_picture.h" diff --git a/modules/video_filter/puzzle_pce.c b/modules/video_filter/puzzle_pce.c index d11cecb..5cb29c4 100644 --- a/modules/video_filter/puzzle_pce.c +++ b/modules/video_filter/puzzle_pce.c @@ -33,6 +33,7 @@ #include <vlc_common.h> #include <vlc_plugin.h> #include <vlc_filter.h> +#include <vlc_picture.h> #include <vlc_rand.h> #include "filter_picture.h" diff --git a/modules/video_filter/remoteosd.c b/modules/video_filter/remoteosd.c index 2229748..1e23a3e 100644 --- a/modules/video_filter/remoteosd.c +++ b/modules/video_filter/remoteosd.c @@ -52,10 +52,10 @@ #include <vlc_common.h> #include <vlc_plugin.h> - #include <vlc_filter.h> +#include <vlc_mouse.h> +#include <vlc_subpicture.h> #include <vlc_keys.h> /* KEY_MODIFIER_CTRL */ - #include <vlc_network.h> /* net_*, htonl */ #include <gcrypt.h> /* to encrypt password */ #include <vlc_gcrypt.h> diff --git a/modules/video_filter/ripple.c b/modules/video_filter/ripple.c index afcf634..e0f8bf3 100644 --- a/modules/video_filter/ripple.c +++ b/modules/video_filter/ripple.c @@ -35,6 +35,7 @@ #include <vlc_common.h> #include <vlc_plugin.h> #include <vlc_filter.h> +#include <vlc_picture.h> #include "filter_picture.h" /***************************************************************************** diff --git a/modules/video_filter/rotate.c b/modules/video_filter/rotate.c index e4608ec..84e66b0 100644 --- a/modules/video_filter/rotate.c +++ b/modules/video_filter/rotate.c @@ -36,6 +36,7 @@ #include <vlc_plugin.h> #include <vlc_atomic.h> #include <vlc_filter.h> +#include <vlc_picture.h> #include "filter_picture.h" #include "../control/motionlib.h" diff --git a/modules/video_filter/rss.c b/modules/video_filter/rss.c index 95124da..8a7ddf8 100644 --- a/modules/video_filter/rss.c +++ b/modules/video_filter/rss.c @@ -35,20 +35,18 @@ # include "config.h" #endif +#include <time.h> + #include <vlc_common.h> #include <vlc_plugin.h> - #include <vlc_filter.h> +#include <vlc_subpicture.h> #include <vlc_block.h> - #include <vlc_stream.h> #include <vlc_xml.h> #include <vlc_charset.h> - #include <vlc_image.h> -#include <time.h> - /***************************************************************************** * Local prototypes *****************************************************************************/ diff --git a/modules/video_filter/scale.c b/modules/video_filter/scale.c index 818aa28..9156bc9 100644 --- a/modules/video_filter/scale.c +++ b/modules/video_filter/scale.c @@ -33,6 +33,7 @@ #include <vlc_common.h> #include <vlc_plugin.h> #include <vlc_filter.h> +#include <vlc_picture.h> /**************************************************************************** * Local prototypes diff --git a/modules/video_filter/scene.c b/modules/video_filter/scene.c index cfb2d1a..9f920bf 100644 --- a/modules/video_filter/scene.c +++ b/modules/video_filter/scene.c @@ -35,8 +35,8 @@ #include <vlc_common.h> #include <vlc_plugin.h> - #include <vlc_filter.h> +#include <vlc_picture.h> #include "filter_picture.h" #include <vlc_image.h> #include <vlc_strings.h> diff --git a/modules/video_filter/sepia.c b/modules/video_filter/sepia.c index 7dc7f6b..2a00130 100644 --- a/modules/video_filter/sepia.c +++ b/modules/video_filter/sepia.c @@ -32,6 +32,7 @@ #include <vlc_common.h> #include <vlc_plugin.h> #include <vlc_filter.h> +#include <vlc_picture.h> #include <vlc_cpu.h> #include <vlc_atomic.h> diff --git a/modules/video_filter/sharpen.c b/modules/video_filter/sharpen.c index 7c8ae52..e578e7f 100644 --- a/modules/video_filter/sharpen.c +++ b/modules/video_filter/sharpen.c @@ -39,8 +39,8 @@ #include <vlc_common.h> #include <vlc_plugin.h> - #include <vlc_filter.h> +#include <vlc_picture.h> #include "filter_picture.h" #define SIG_TEXT N_("Sharpen strength (0-2)") diff --git a/modules/video_filter/transform.c b/modules/video_filter/transform.c index 7b93955..7c88f23 100644 --- a/modules/video_filter/transform.c +++ b/modules/video_filter/transform.c @@ -35,6 +35,8 @@ #include <vlc_common.h> #include <vlc_plugin.h> #include <vlc_filter.h> +#include <vlc_mouse.h> +#include <vlc_picture.h> /***************************************************************************** * Module descriptor diff --git a/modules/video_filter/vhs.c b/modules/video_filter/vhs.c index b111224..51bbcaa 100644 --- a/modules/video_filter/vhs.c +++ b/modules/video_filter/vhs.c @@ -32,6 +32,7 @@ #include <vlc_common.h> #include <vlc_plugin.h> #include <vlc_filter.h> +#include <vlc_picture.h> #include <vlc_rand.h> #include <vlc_mtime.h> diff --git a/modules/video_filter/wave.c b/modules/video_filter/wave.c index af0476a..8fce371 100644 --- a/modules/video_filter/wave.c +++ b/modules/video_filter/wave.c @@ -34,8 +34,8 @@ #include <vlc_common.h> #include <vlc_plugin.h> - #include <vlc_filter.h> +#include <vlc_picture.h> #include "filter_picture.h" /***************************************************************************** diff --git a/src/misc/filter_chain.c b/src/misc/filter_chain.c index ffeae7f..49debed 100644 --- a/src/misc/filter_chain.c +++ b/src/misc/filter_chain.c @@ -27,6 +27,7 @@ #include <vlc_filter.h> #include <vlc_modules.h> +#include <vlc_mouse.h> #include <vlc_spu.h> #include <libvlc.h> #include <assert.h> _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
