X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Fopencv_wrapper.c;h=5025c02c23479478007b08318881d254ccfb0fe3;hb=c60652e38ac6afd74bd8225e9dae5406f13aaa4f;hp=c44f9517e1976406781ccbe06921702f9a28f5bc;hpb=df61d33b06e2b3cbbe746b2f5a9bea5b370c24ff;p=vlc diff --git a/modules/video_filter/opencv_wrapper.c b/modules/video_filter/opencv_wrapper.c index c44f9517e1..5025c02c23 100644 --- a/modules/video_filter/opencv_wrapper.c +++ b/modules/video_filter/opencv_wrapper.c @@ -24,26 +24,24 @@ * Preamble *****************************************************************************/ -#include -#include -#include - #ifdef HAVE_CONFIG_H # include "config.h" #endif -#include +#include +#include #include +#include #include #include -#include "vlc_filter.h" -#include "filter_common.h" -#include -#include "vlc_image.h" -#include "vlc_input.h" -#include "vlc_playlist.h" +#include +#include +#include + +#include +#include /***************************************************************************** @@ -56,8 +54,6 @@ static int Init ( vout_thread_t * ); static void End ( vout_thread_t * ); static void Render ( vout_thread_t *, picture_t * ); -static int SendEvents( vlc_object_t *, char const *, - vlc_value_t, vlc_value_t, void * ); static void ReleaseImages( vout_thread_t *p_vout ); static void VlcPictureToIplImage( vout_thread_t *p_vout, picture_t *p_in ); @@ -65,30 +61,30 @@ static void VlcPictureToIplImage( vout_thread_t *p_vout, picture_t *p_in ); * Module descriptor *****************************************************************************/ -static char *chroma_list[] = { "input", "I420", "RGB32"}; -static char *chroma_list_text[] = { N_("Use input chroma unaltered"), +static const char *const chroma_list[] = { "input", "I420", "RGB32"}; +static const char *const chroma_list_text[] = { N_("Use input chroma unaltered"), N_("I420 - first plane is greyscale"), N_("RGB32")}; -static char *output_list[] = { "none", "input", "processed"}; -static char *output_list_text[] = { N_("Don't display any video"), +static const char *const output_list[] = { "none", "input", "processed"}; +static const char *const output_list_text[] = { N_("Don't display any video"), N_("Display the input video"), N_("Display the processed video")}; -static char *verbosity_list[] = { "error", "warning", "debug"}; -static char *verbosity_list_text[] = { N_("Show only errors"), +static const char *const verbosity_list[] = { "error", "warning", "debug"}; +static const char *const verbosity_list_text[] = { N_("Show only errors"), N_("Show errors and warnings"), N_("Show everything including debug messages")}; -vlc_module_begin(); - set_description( _("OpenCV video filter wrapper") ); - set_shortname( _("OpenCV" )); - set_category( CAT_VIDEO ); - set_subcategory( SUBCAT_VIDEO_VFILTER ); - set_capability( "video filter", 0 ); - add_shortcut( "opencv_wrapper" ); - set_callbacks( Create, Destroy ); +vlc_module_begin () + set_description( N_("OpenCV video filter wrapper") ) + set_shortname( N_("OpenCV" )) + set_category( CAT_VIDEO ) + set_subcategory( SUBCAT_VIDEO_VFILTER ) + set_capability( "video filter", 0 ) + add_shortcut( "opencv_wrapper" ) + set_callbacks( Create, Destroy ) add_float_with_range( "opencv-scale", 1.0, 0.1, 2.0, NULL, N_("Scale factor (0.1-2.0)"), N_("Ammount by which to scale the picture before sending it to the internal OpenCV filter"), - false ); + false ) add_string( "opencv-chroma", "input", NULL, N_("OpenCV filter chroma"), N_("Chroma to convert picture to before sending it to the internal OpenCV filter"), false); @@ -104,7 +100,7 @@ vlc_module_begin(); add_string( "opencv-filter-name", "none", NULL, N_("OpenCV internal filter name"), N_("Name of internal OpenCV plugin filter to use"), false); -vlc_module_end(); +vlc_module_end () /***************************************************************************** @@ -190,10 +186,7 @@ static int Create( vlc_object_t *p_this ) /* Allocate structure */ p_vout->p_sys = malloc( sizeof( vout_sys_t ) ); if( p_vout->p_sys == NULL ) - { - msg_Err( p_vout, "out of memory" ); return VLC_ENOMEM; - } /* Init structure */ p_vout->p_sys->p_image = image_HandlerCreate( p_vout ); @@ -211,7 +204,8 @@ static int Create( vlc_object_t *p_this ) 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" ); @@ -233,7 +227,8 @@ static int Create( vlc_object_t *p_this ) } 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" ); @@ -255,7 +250,8 @@ static int Create( vlc_object_t *p_this ) } 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" ); @@ -277,10 +273,10 @@ static int Create( vlc_object_t *p_this ) } 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, " @@ -299,8 +295,6 @@ static int Create( vlc_object_t *p_this ) *****************************************************************************/ static int Init( vout_thread_t *p_vout ) { - int i_index; - picture_t *p_pic; video_format_t fmt; vout_sys_t *p_sys = p_vout->p_sys; I_OUTPUTPICTURES = 0; @@ -324,9 +318,9 @@ static int Init( vout_thread_t *p_vout ) 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 */ @@ -336,13 +330,12 @@ static int Init( vout_thread_t *p_vout ) if (p_vout->p_sys->psz_inner_name) p_sys->p_opencv->p_module = - module_Need( p_sys->p_opencv, p_sys->psz_inner_name, 0, 0 ); + module_need( p_sys->p_opencv, p_sys->psz_inner_name, NULL, false ); if( !p_sys->p_opencv->p_module ) { 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; } @@ -360,11 +353,9 @@ static int Init( vout_thread_t *p_vout ) return VLC_EGENERIC; } - ALLOCATE_DIRECTBUFFERS( VOUT_MAX_PICTURES ); + vout_filter_AllocateDirectBuffers( p_vout, VOUT_MAX_PICTURES ); - ADD_CALLBACKS( p_vout->p_sys->p_vout, SendEvents ); - - ADD_PARENT_CALLBACKS( SendEventsToChild ); + vout_filter_AddChild( p_vout, p_vout->p_sys->p_vout, NULL ); return VLC_SUCCESS; } @@ -374,25 +365,21 @@ static int Init( vout_thread_t *p_vout ) *****************************************************************************/ static void End( vout_thread_t *p_vout ) { - int i_index; + vout_sys_t *p_sys = p_vout->p_sys; - /* Free the fake output buffers we allocated */ - for( i_index = I_OUTPUTPICTURES ; i_index ; ) - { - i_index--; - free( PP_OUTPUTPICTURE[ i_index ]->p_data_orig ); - } + vout_filter_DelChild( p_vout, p_sys->p_vout, NULL ); + vout_CloseAndRelease( p_sys->p_vout ); - if ( p_vout->p_sys->p_opencv ) + vout_filter_ReleaseDirectBuffers( p_vout ); + + if( p_sys->p_opencv ) { //release the internal opencv filter - if( p_vout->p_sys->p_opencv->p_module ) - module_Unneed( p_vout->p_sys->p_opencv, p_vout->p_sys->p_opencv->p_module ); - vlc_object_detach( p_vout->p_sys->p_opencv ); - vlc_object_release( p_vout->p_sys->p_opencv ); - p_vout->p_sys->p_opencv = NULL; + if( p_sys->p_opencv->p_module ) + module_unneed( p_sys->p_opencv, p_sys->p_opencv->p_module ); + vlc_object_release( p_sys->p_opencv ); + p_sys->p_opencv = NULL; } - } /***************************************************************************** @@ -404,15 +391,6 @@ static void Destroy( vlc_object_t *p_this ) { vout_thread_t *p_vout = (vout_thread_t *)p_this; - if( p_vout->p_sys->p_vout ) - { - DEL_CALLBACKS( p_vout->p_sys->p_vout, SendEvents ); - vlc_object_detach( p_vout->p_sys->p_vout ); - vout_Destroy( p_vout->p_sys->p_vout ); - } - - DEL_PARENT_CALLBACKS( SendEventsToChild ); - ReleaseImages(p_vout); if( p_vout->p_sys->p_image ) @@ -441,7 +419,7 @@ static void ReleaseImages(vout_thread_t *p_vout) /* Release temp picture_t if it exists */ if (p_vout->p_sys->p_to_be_freed) { - p_vout->p_sys->p_to_be_freed->pf_release( p_vout->p_sys->p_to_be_freed ); + picture_Release( p_vout->p_sys->p_to_be_freed ); p_vout->p_sys->p_to_be_freed = NULL; } if (p_vout->p_sys->i_verbosity > VERB_WARN) @@ -483,13 +461,13 @@ static void VlcPictureToIplImage( vout_thread_t *p_vout, picture_t *p_in ) //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 @@ -539,7 +517,7 @@ static void VlcPictureToIplImage( vout_thread_t *p_vout, picture_t *p_in ) finish = clock(); duration = (double)(finish - start) / CLOCKS_PER_SEC; if (p_sys->i_verbosity > VERB_WARN) - msg_Dbg( p_vout, "VlcPictureToIplImageRgb took %2.4f seconds\n", duration ); + msg_Dbg( p_vout, "VlcPictureToIplImageRgb took %2.4f seconds", duration ); } /***************************************************************************** @@ -557,7 +535,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic ) while( ( p_outpic = vout_CreatePicture( p_vout->p_sys->p_vout, 0, 0, 0 ) ) == NULL ) { - if( p_vout->b_die || p_vout->b_error ) + if( !vlc_object_alive (p_vout) || p_vout->b_error ) { return; } msleep( VOUT_OUTMEM_SLEEP ); } @@ -571,7 +549,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic ) //This copy is a bit unfortunate but image_Convert can't write into an existing image so it is better to copy the //(say) 16bit YUV image here than a 32bit RGB image somehwere else. //It is also not that expensive in time. - vout_CopyPicture( p_vout, p_outpic, p_pic ); + picture_Copy( p_outpic, p_pic ); VlcPictureToIplImage( p_vout, p_pic); //pass the image to the internal opencv filter for processing if ((p_vout->p_sys->p_opencv) && (p_vout->p_sys->p_opencv->p_module)) @@ -584,41 +562,20 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic ) 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)) - vout_CopyPicture( p_vout, p_outpic, p_vout->p_sys->p_proc_image ); + 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 ); } //calculate duration finish = clock(); duration = (double)(finish - start) / CLOCKS_PER_SEC; if (p_vout->p_sys->i_verbosity > VERB_WARN) - msg_Dbg( p_vout, "Render took %2.4f seconds\n", duration ); + msg_Dbg( p_vout, "Render took %2.4f seconds", duration ); ReleaseImages(p_vout); - vout_DatePicture( p_vout->p_sys->p_vout, p_outpic, p_pic->date ); + p_outpic->date = p_pic->date; vout_UnlinkPicture( p_vout->p_sys->p_vout, p_outpic ); vout_DisplayPicture( p_vout->p_sys->p_vout, p_outpic ); } -/***************************************************************************** - * SendEvents: forward mouse and keyboard events to the parent p_vout - *****************************************************************************/ -static int SendEvents( vlc_object_t *p_this, char const *psz_var, - vlc_value_t oldval, vlc_value_t newval, void *p_data ) -{ - var_Set( (vlc_object_t *)p_data, psz_var, newval ); - - return VLC_SUCCESS; -} - -/***************************************************************************** - * SendEventsToChild: forward events to the child/children vout - *****************************************************************************/ -static int SendEventsToChild( vlc_object_t *p_this, char const *psz_var, - vlc_value_t oldval, vlc_value_t newval, void *p_data ) -{ - vout_thread_t *p_vout = (vout_thread_t *)p_this; - var_Set( p_vout->p_sys->p_vout, psz_var, newval ); - return VLC_SUCCESS; -}