* 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_charset.h>
-#include "vlc_image.h"
-#include "vlc_input.h"
-#include "vlc_playlist.h"
+#include <vlc_filter.h>
+#include <vlc_image.h>
+#include <vlc_input.h>
+
+#include <cxcore.h>
+#include <cv.h>
/*****************************************************************************
p_vout->pf_control = Control;
/* Retrieve and apply config */
- if( !(psz_chroma = config_GetPsz( p_vout, "opencv-chroma" )) )
+ psz_chroma = var_InheritString( p_vout, "opencv-chroma" );
+ if( psz_chroma == NULL )
{
msg_Err( p_vout, "configuration variable %s empty, using 'grey'",
"opencv-chroma" );
}
free( psz_chroma);
- if( !(psz_output = config_GetPsz( p_vout, "opencv-output" )) )
+ psz_output = var_InheritString( p_vout, "opencv-output" );
+ if( psz_output == NULL )
{
msg_Err( p_vout, "configuration variable %s empty, using 'input'",
"opencv-output" );
}
free( psz_output);
- if( !(psz_verbosity = config_GetPsz( p_vout, "opencv-verbosity" )) )
+ psz_verbosity = var_InheritString( p_vout, "opencv-verbosity" );
+ if( psz_verbosity == NULL )
{
msg_Err( p_vout, "configuration variable %s empty, using 'input'",
"opencv-verbosity" );
}
free( psz_verbosity);
- p_vout->p_sys->psz_inner_name = config_GetPsz( p_vout, "opencv-filter-name" );
-
+ p_vout->p_sys->psz_inner_name =
+ var_InheritString( p_vout, "opencv-filter-name" );
p_vout->p_sys->f_scale =
- config_GetFloat( p_vout, "opencv-scale" );
+ var_InheritFloat( p_vout, "opencv-scale" );
if (p_vout->p_sys->i_verbosity > VERB_WARN)
msg_Info(p_vout, "Configuration: opencv-scale: %f, opencv-chroma: %d, "
fmt.i_y_offset = fmt.i_y_offset * p_sys->f_scale;
if (p_sys->i_internal_chroma == GREY)
- fmt.i_chroma = VLC_FOURCC('I','4','2','0');
+ fmt.i_chroma = VLC_CODEC_I420;
else if (p_sys->i_internal_chroma == RGB)
- fmt.i_chroma = VLC_FOURCC('R','V','3','2');
+ fmt.i_chroma = VLC_CODEC_RGB32;
}
/* Load the internal opencv filter */
{
msg_Err( p_vout, "can't open internal opencv filter: %s", p_vout->p_sys->psz_inner_name );
p_vout->p_sys->psz_inner_name = NULL;
- vlc_object_detach( p_sys->p_opencv );
vlc_object_release( p_sys->p_opencv );
p_sys->p_opencv = NULL;
}
vout_filter_AllocateDirectBuffers( p_vout, VOUT_MAX_PICTURES );
- vout_filter_AddChild( p_vout, p_vout->p_sys->p_vout, NULL, NULL, true );
+ vout_filter_AddChild( p_vout, p_vout->p_sys->p_vout, NULL );
return VLC_SUCCESS;
}
{
vout_sys_t *p_sys = p_vout->p_sys;
- vout_filter_DelChild( p_vout, p_sys->p_vout, NULL, NULL, true );
+ vout_filter_DelChild( p_vout, p_sys->p_vout, NULL );
vout_CloseAndRelease( p_sys->p_vout );
vout_filter_ReleaseDirectBuffers( p_vout );
//release the internal opencv filter
if( p_sys->p_opencv->p_module )
module_unneed( p_sys->p_opencv, p_sys->p_opencv->p_module );
- vlc_object_detach( p_sys->p_opencv );
vlc_object_release( p_sys->p_opencv );
p_sys->p_opencv = NULL;
}
//rgb2 gives 3 separate planes, this gives 1 interleaved plane
//rv24 gives is about 20% faster but gives r&b the wrong way round
//and I cant think of an easy way to fix this
- fmt_out.i_chroma = VLC_FOURCC('R','V','3','2');
+ fmt_out.i_chroma = VLC_CODEC_RGB32;
}
else if (p_sys->i_internal_chroma == GREY)
{
//take the I (gray) plane (video seems to commonly be in this fmt so usually the
//conversion does nothing)
- fmt_out.i_chroma = VLC_FOURCC('I','4','2','0');
+ fmt_out.i_chroma = VLC_CODEC_I420;
}
//convert from the input image
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 );
}