* Preamble
*****************************************************************************/
-#include <cxcore.h>
-#include <cv.h>
-#include <highgui.h>
-
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_vout.h>
+#include <vlc_modules.h>
#include <math.h>
#include <time.h>
#include <vlc_filter.h>
-#include "filter_common.h"
#include <vlc_image.h>
#include <vlc_input.h>
-#include <vlc_playlist.h>
+
+#include <cxcore.h>
+#include <cv.h>
/*****************************************************************************
N_("Scale factor (0.1-2.0)"),
N_("Ammount by which to scale the picture before sending it to the internal OpenCV filter"),
false )
- add_string( "opencv-chroma", "input", NULL,
+ add_string( "opencv-chroma", "input",
N_("OpenCV filter chroma"),
N_("Chroma to convert picture to before sending it to the internal OpenCV filter"), false);
change_string_list( chroma_list, chroma_list_text, 0);
- add_string( "opencv-output", "input", NULL,
+ add_string( "opencv-output", "input",
N_("Wrapper filter output"),
N_("Determines what (if any) video is displayed by the wrapper filter"), false);
change_string_list( output_list, output_list_text, 0);
- add_string( "opencv-verbosity", "error", NULL,
+ add_string( "opencv-verbosity", "error",
N_("Wrapper filter verbosity"),
N_("Determines wrapper filter verbosity level"), false);
change_string_list( verbosity_list, verbosity_list_text, 0);
- add_string( "opencv-filter-name", "none", NULL,
+ add_string( "opencv-filter-name", "none",
N_("OpenCV internal filter name"),
N_("Name of internal OpenCV plugin filter to use"), false);
vlc_module_end ()
//Hack the above opencv image array into a picture_t so that it can be sent to
//another video filter
- p_sys->hacked_pic.p_data_orig = p_sys->p_cv_image;
p_sys->hacked_pic.i_planes = planes;
p_sys->hacked_pic.format.i_chroma = fmt_out.i_chroma;
if ((p_vout->p_sys->p_opencv) && (p_vout->p_sys->p_opencv->p_module))
p_vout->p_sys->p_opencv->pf_video_filter( p_vout->p_sys->p_opencv, &(p_vout->p_sys->hacked_pic));
//copy the processed image into the output image
- if ((p_vout->p_sys->p_proc_image) && (p_vout->p_sys->p_proc_image->p_data))
+ if ((p_vout->p_sys->p_proc_image) && (p_vout->p_sys->p_proc_image->i_planes > 0))
picture_Copy( p_outpic, p_vout->p_sys->p_proc_image );
}