/*****************************************************************************
* opencv_wrapper.c : OpenCV wrapper video filter
*****************************************************************************
- * Copyright (C) 2006 the VideoLAN team
+ * Copyright (C) 2006-2012 VLC authors and VideoLAN
+ * Copyright (C) 2012 Edward Wang
*
* Authors: Dugal Harris <dugalh@protoclea.co.za>
+ * Edward Wang <edward.c.wang@compdigitec.com>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* 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 "filter_picture.h"
+#include <cxcore.h>
+#include <cv.h>
/*****************************************************************************
* Local prototypes
static int Create ( vlc_object_t * );
static void Destroy ( vlc_object_t * );
-static int Init ( vout_thread_t * );
-static void End ( vout_thread_t * );
-static void Render ( vout_thread_t *, picture_t * );
+static picture_t* Filter( filter_t*, picture_t* );
-static void ReleaseImages( vout_thread_t *p_vout );
-static void VlcPictureToIplImage( vout_thread_t *p_vout, picture_t *p_in );
+static void ReleaseImages( filter_t* p_filter );
+static void VlcPictureToIplImage( filter_t* p_filter, picture_t* p_in );
/*****************************************************************************
* Module descriptor
set_shortname( N_("OpenCV" ))
set_category( CAT_VIDEO )
set_subcategory( SUBCAT_VIDEO_VFILTER )
- set_capability( "video filter", 0 )
+ set_capability( "video filter2", 0 )
add_shortcut( "opencv_wrapper" )
set_callbacks( Create, Destroy )
- add_float_with_range( "opencv-scale", 1.0, 0.1, 2.0, NULL,
+ add_float_with_range( "opencv-scale", 1.0, 0.1, 2.0,
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,
+ change_string_list( chroma_list, chroma_list_text )
+ 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,
- 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,
+ change_string_list( output_list, output_list_text )
+ add_string( "opencv-filter-name", "none",
N_("OpenCV internal filter name"),
N_("Name of internal OpenCV plugin filter to use"), false);
vlc_module_end ()
*****************************************************************************/
enum wrapper_output_t
{
- NONE, //not working yet
+ NONE,
VINPUT,
PROCESSED
};
};
/*****************************************************************************
- * verbosity_t:
- *****************************************************************************/
-enum verbosity_t
-{
- VERB_ERROR,
- VERB_WARN,
- VERB_DEBUG
-};
-
-/*****************************************************************************
- * vout_sys_t: opencv_wrapper video output method descriptor
+ * filter_sys_t: opencv_wrapper video output method descriptor
*****************************************************************************
* This structure is part of the video output thread descriptor.
* It describes the opencv_wrapper specific properties of an output thread.
*****************************************************************************/
-struct vout_sys_t
+struct filter_sys_t
{
- vout_thread_t *p_vout;
-
image_handler_t *p_image;
int i_cv_image_size;
int i_wrapper_output;
int i_internal_chroma;
- int i_verbosity;
IplImage *p_cv_image[VOUT_MAX_PLANES];
picture_t hacked_pic;
};
-/*****************************************************************************
- * Control: control facility for the vout (forwards to child vout)
- *****************************************************************************/
-static int Control( vout_thread_t *p_vout, int i_query, va_list args )
-{
- return vout_vaControl( p_vout->p_sys->p_vout, i_query, args );
-}
-
/*****************************************************************************
* Create: allocates opencv_wrapper video thread output method
*****************************************************************************
*****************************************************************************/
static int Create( vlc_object_t *p_this )
{
- vout_thread_t *p_vout = (vout_thread_t *)p_this;
- char *psz_chroma, *psz_output, *psz_verbosity;
- int i = 0;
+ filter_t* p_filter = (filter_t*)p_this;
+ char *psz_chroma, *psz_output;
/* Allocate structure */
- p_vout->p_sys = malloc( sizeof( vout_sys_t ) );
- if( p_vout->p_sys == NULL )
+ p_filter->p_sys = malloc( sizeof( filter_sys_t ) );
+ if( p_filter->p_sys == NULL )
return VLC_ENOMEM;
- /* Init structure */
- p_vout->p_sys->p_image = image_HandlerCreate( p_vout );
- for (i = 0; i < VOUT_MAX_PLANES; i++)
- p_vout->p_sys->p_cv_image[i] = NULL;
- p_vout->p_sys->p_proc_image = NULL;
- p_vout->p_sys->p_to_be_freed = NULL;
- p_vout->p_sys->i_cv_image_size = 0;
-
- p_vout->pf_init = Init;
- p_vout->pf_end = End;
- p_vout->pf_manage = NULL;
- p_vout->pf_render = Render;
- p_vout->pf_display = NULL;
- p_vout->pf_control = Control;
-
- /* Retrieve and apply config */
- if( !(psz_chroma = config_GetPsz( p_vout, "opencv-chroma" )) )
- {
- msg_Err( p_vout, "configuration variable %s empty, using 'grey'",
- "opencv-chroma" );
- p_vout->p_sys->i_internal_chroma = GREY;
- }
- else
- {
- if( !strcmp( psz_chroma, "input" ) )
- p_vout->p_sys->i_internal_chroma = CINPUT;
- else if( !strcmp( psz_chroma, "I420" ) )
- p_vout->p_sys->i_internal_chroma = GREY;
- else if( !strcmp( psz_chroma, "RGB32" ) )
- p_vout->p_sys->i_internal_chroma = RGB;
- else
- {
- msg_Err( p_vout, "no valid opencv-chroma provided, using 'grey'" );
- p_vout->p_sys->i_internal_chroma = GREY;
- }
+ /* Load the internal OpenCV filter.
+ *
+ * This filter object is needed to call the internal OpenCV filter
+ * for processing, the wrapper just converts into an IplImage* for
+ * the other filter.
+ *
+ * We don't need to set up video formats for this filter as it not
+ * actually using a picture_t.
+ */
+ p_filter->p_sys->p_opencv = vlc_object_create( p_filter, sizeof(filter_t) );
+ if( !p_filter->p_sys->p_opencv ) {
+ free( p_filter->p_sys );
+ return VLC_ENOMEM;
}
- free( psz_chroma);
- if( !(psz_output = config_GetPsz( p_vout, "opencv-output" )) )
- {
- msg_Err( p_vout, "configuration variable %s empty, using 'input'",
- "opencv-output" );
- p_vout->p_sys->i_wrapper_output = VINPUT;
- }
- else
- {
- if( !strcmp( psz_output, "none" ) )
- p_vout->p_sys->i_wrapper_output = NONE;
- else if( !strcmp( psz_output, "input" ) )
- p_vout->p_sys->i_wrapper_output = VINPUT;
- else if( !strcmp( psz_output, "processed" ) )
- p_vout->p_sys->i_wrapper_output = PROCESSED;
- else
- {
- msg_Err( p_vout, "no valid opencv-output provided, using 'input'" );
- p_vout->p_sys->i_wrapper_output = VINPUT;
- }
- }
- free( psz_output);
+ p_filter->p_sys->psz_inner_name = var_InheritString( p_filter, "opencv-filter-name" );
+ if( p_filter->p_sys->psz_inner_name )
+ p_filter->p_sys->p_opencv->p_module =
+ module_need( p_filter->p_sys->p_opencv,
+ "opencv internal filter",
+ p_filter->p_sys->psz_inner_name,
+ true );
- if( !(psz_verbosity = config_GetPsz( p_vout, "opencv-verbosity" )) )
+ if( !p_filter->p_sys->p_opencv->p_module )
{
- msg_Err( p_vout, "configuration variable %s empty, using 'input'",
- "opencv-verbosity" );
- p_vout->p_sys->i_verbosity = VERB_ERROR;
- }
- else
- {
- if( !strcmp( psz_verbosity, "error" ) )
- p_vout->p_sys->i_verbosity = VERB_ERROR;
- else if( !strcmp( psz_verbosity, "warning" ) )
- p_vout->p_sys->i_verbosity = VERB_WARN;
- else if( !strcmp( psz_verbosity, "debug" ) )
- p_vout->p_sys->i_verbosity = VERB_DEBUG;
- else
- {
- msg_Err( p_vout, "no valid opencv-verbosity provided, using 'error'" );
- p_vout->p_sys->i_verbosity = VERB_ERROR;
- }
- }
- free( psz_verbosity);
-
- p_vout->p_sys->psz_inner_name = config_GetPsz( p_vout, "opencv-filter-name" );
-
- p_vout->p_sys->f_scale =
- config_GetFloat( p_vout, "opencv-scale" );
-
- if (p_vout->p_sys->i_verbosity > VERB_WARN)
- msg_Info(p_vout, "Configuration: opencv-scale: %f, opencv-chroma: %d, "
- "opencv-output: %d, opencv-verbosity %d, opencv-filter %s",
- p_vout->p_sys->f_scale,
- p_vout->p_sys->i_internal_chroma,
- p_vout->p_sys->i_wrapper_output,
- p_vout->p_sys->i_verbosity,
- p_vout->p_sys->psz_inner_name);
+ msg_Err( p_filter, "can't open internal opencv filter: %s", p_filter->p_sys->psz_inner_name );
+ free( p_filter->p_sys->psz_inner_name );
+ p_filter->p_sys->psz_inner_name = NULL;
+ vlc_object_release( p_filter->p_sys->p_opencv );
+ free( p_filter->p_sys );
- return VLC_SUCCESS;
-}
-
-/*****************************************************************************
- * Init: initialize opencv_wrapper video thread output method
- *****************************************************************************/
-static int Init( vout_thread_t *p_vout )
-{
- video_format_t fmt;
- vout_sys_t *p_sys = p_vout->p_sys;
- I_OUTPUTPICTURES = 0;
-
- /* Initialize the output video format */
- memset( &fmt, 0, sizeof(video_format_t) );
- p_vout->output.i_chroma = p_vout->render.i_chroma;
- p_vout->output.i_width = p_vout->render.i_width;
- p_vout->output.i_height = p_vout->render.i_height;
- p_vout->output.i_aspect = p_vout->render.i_aspect;
- p_vout->fmt_out = p_vout->fmt_in; //set to input video format
-
- fmt = p_vout->fmt_out;
- if (p_sys->i_wrapper_output == PROCESSED) //set to processed video format
- {
- fmt.i_width = fmt.i_width * p_sys->f_scale;
- fmt.i_height = fmt.i_height * p_sys->f_scale;
- fmt.i_visible_width = fmt.i_visible_width * p_sys->f_scale;
- fmt.i_visible_height = fmt.i_visible_height * p_sys->f_scale;
- fmt.i_x_offset = fmt.i_x_offset * p_sys->f_scale;
- fmt.i_y_offset = fmt.i_y_offset * p_sys->f_scale;
-
- if (p_sys->i_internal_chroma == GREY)
- fmt.i_chroma = VLC_CODEC_I420;
- else if (p_sys->i_internal_chroma == RGB)
- fmt.i_chroma = VLC_CODEC_RGB32;
+ return VLC_ENOMOD;
}
- /* Load the internal opencv filter */
- /* We don't need to set up video formats for this filter as it not actually using a picture_t */
- p_sys->p_opencv = vlc_object_create( p_vout, sizeof(filter_t) );
- vlc_object_attach( p_sys->p_opencv, 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, NULL, false );
+ /* Init structure */
+ p_filter->p_sys->p_image = image_HandlerCreate( p_filter );
+ for( int i = 0; i < VOUT_MAX_PLANES; i++ )
+ p_filter->p_sys->p_cv_image[i] = NULL;
+ p_filter->p_sys->p_proc_image = NULL;
+ p_filter->p_sys->p_to_be_freed = NULL;
+ p_filter->p_sys->i_cv_image_size = 0;
- if( !p_sys->p_opencv->p_module )
+ /* Retrieve and apply config */
+ psz_chroma = var_InheritString( p_filter, "opencv-chroma" );
+ if( psz_chroma == NULL )
{
- 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;
+ msg_Err( p_filter, "configuration variable %s empty, using 'grey'",
+ "opencv-chroma" );
+ p_filter->p_sys->i_internal_chroma = GREY;
+ } else if( !strcmp( psz_chroma, "input" ) )
+ p_filter->p_sys->i_internal_chroma = CINPUT;
+ else if( !strcmp( psz_chroma, "I420" ) )
+ p_filter->p_sys->i_internal_chroma = GREY;
+ else if( !strcmp( psz_chroma, "RGB32" ) )
+ p_filter->p_sys->i_internal_chroma = RGB;
+ else {
+ msg_Err( p_filter, "no valid opencv-chroma provided, using 'grey'" );
+ p_filter->p_sys->i_internal_chroma = GREY;
}
- /* Try to open the real video output */
- if (p_sys->i_verbosity > VERB_WARN)
- msg_Dbg( p_vout, "spawning the real video output" );
-
- p_vout->p_sys->p_vout = vout_Create( p_vout, &fmt );
+ free( psz_chroma );
- /* Everything failed */
- if( p_vout->p_sys->p_vout == NULL )
+ psz_output = var_InheritString( p_filter, "opencv-output" );
+ if( psz_output == NULL )
{
- msg_Err( p_vout, "can't open vout, aborting" );
- return VLC_EGENERIC;
+ msg_Err( p_filter, "configuration variable %s empty, using 'input'",
+ "opencv-output" );
+ p_filter->p_sys->i_wrapper_output = VINPUT;
+ } else if( !strcmp( psz_output, "none" ) )
+ p_filter->p_sys->i_wrapper_output = NONE;
+ else if( !strcmp( psz_output, "input" ) )
+ p_filter->p_sys->i_wrapper_output = VINPUT;
+ else if( !strcmp( psz_output, "processed" ) )
+ p_filter->p_sys->i_wrapper_output = PROCESSED;
+ else {
+ msg_Err( p_filter, "no valid opencv-output provided, using 'input'" );
+ p_filter->p_sys->i_wrapper_output = VINPUT;
}
+ free( psz_output );
- vout_filter_AllocateDirectBuffers( p_vout, VOUT_MAX_PICTURES );
-
- vout_filter_AddChild( p_vout, p_vout->p_sys->p_vout, NULL );
-
- return VLC_SUCCESS;
-}
+ p_filter->p_sys->f_scale =
+ var_InheritFloat( p_filter, "opencv-scale" );
-/*****************************************************************************
- * End: terminate opencv_wrapper video thread output method
- *****************************************************************************/
-static void End( vout_thread_t *p_vout )
-{
- vout_sys_t *p_sys = p_vout->p_sys;
+ msg_Info(p_filter, "Configuration: opencv-scale: %f, opencv-chroma: %d, "
+ "opencv-output: %d, opencv-filter %s",
+ p_filter->p_sys->f_scale,
+ p_filter->p_sys->i_internal_chroma,
+ p_filter->p_sys->i_wrapper_output,
+ p_filter->p_sys->psz_inner_name);
- vout_filter_DelChild( p_vout, p_sys->p_vout, NULL );
- vout_CloseAndRelease( p_sys->p_vout );
+#ifndef NDEBUG
+ msg_Dbg( p_filter, "opencv_wrapper successfully started" );
+#endif
- vout_filter_ReleaseDirectBuffers( p_vout );
+ p_filter->pf_video_filter = Filter;
- if( p_sys->p_opencv )
- {
- //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;
- }
+ return VLC_SUCCESS;
}
/*****************************************************************************
*****************************************************************************/
static void Destroy( vlc_object_t *p_this )
{
- vout_thread_t *p_vout = (vout_thread_t *)p_this;
-
- ReleaseImages(p_vout);
+ filter_t* p_filter = (filter_t*)p_this;
+ ReleaseImages( p_filter );
- if( p_vout->p_sys->p_image )
- image_HandlerDelete( p_vout->p_sys->p_image );
+ // Release the internal OpenCV filter.
+ module_unneed( p_filter->p_sys->p_opencv, p_filter->p_sys->p_opencv->p_module );
+ vlc_object_release( p_filter->p_sys->p_opencv );
+ p_filter->p_sys->p_opencv = NULL;
- free( p_vout->p_sys );
+ free( p_filter->p_sys );
}
/*****************************************************************************
- * ReleaseImages: Release OpenCV images in vout_sys_t.
+ * ReleaseImages: Release OpenCV images in filter_sys_t.
*****************************************************************************/
-static void ReleaseImages(vout_thread_t *p_vout)
+static void ReleaseImages( filter_t* p_filter )
{
- int i = 0;
- if (p_vout->p_sys->p_cv_image)
+ filter_sys_t* p_sys = p_filter->p_sys;
+
+ if (p_sys->p_cv_image)
{
- for (i = 0; i < VOUT_MAX_PLANES; i++)
+ for( int i = 0; i < VOUT_MAX_PLANES; i++ )
{
- if (p_vout->p_sys->p_cv_image[i])
- cvReleaseImageHeader(&(p_vout->p_sys->p_cv_image[i]));
- p_vout->p_sys->p_cv_image[i] = NULL;
+ if (p_sys->p_cv_image[i]) {
+ cvReleaseImageHeader(&(p_sys->p_cv_image[i]));
+ p_sys->p_cv_image[i] = NULL;
+ }
}
}
- p_vout->p_sys->i_cv_image_size = 0;
+ p_sys->i_cv_image_size = 0;
/* Release temp picture_t if it exists */
- if (p_vout->p_sys->p_to_be_freed)
+ if (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;
+ picture_Release( p_sys->p_to_be_freed );
+ p_sys->p_to_be_freed = NULL;
}
- if (p_vout->p_sys->i_verbosity > VERB_WARN)
- msg_Dbg( p_vout, "images released" );
+
+#ifndef NDEBUG
+ msg_Dbg( p_filter, "images released" );
+#endif
}
/*****************************************************************************
* Converts given picture_t into IplImage(s) according to module config.
* IplImage(s) are stored in vout_sys_t.
*****************************************************************************/
-static void VlcPictureToIplImage( vout_thread_t *p_vout, picture_t *p_in )
+static void VlcPictureToIplImage( filter_t* p_filter, picture_t* p_in )
{
int planes = p_in->i_planes; //num input video planes
// input video size
CvSize sz = cvSize(abs(p_in->format.i_width), abs(p_in->format.i_height));
video_format_t fmt_out;
- clock_t start, finish; //performance measures
- double duration;
- int i = 0;
- vout_sys_t* p_sys = p_vout->p_sys;
+ filter_sys_t* p_sys = p_filter->p_sys;
memset( &fmt_out, 0, sizeof(video_format_t) );
- start = clock();
-
//do scale / color conversion according to p_sys config
if ((p_sys->f_scale != 1) || (p_sys->i_internal_chroma != CINPUT))
{
{
//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_CODEC_RGB32;
+ //and I can't think of an easy way to fix this
+ fmt_out.i_chroma = VLC_CODEC_RGB24;
}
else if (p_sys->i_internal_chroma == GREY)
{
if (!p_sys->p_proc_image)
{
- msg_Err(p_vout, "can't convert (unsupported formats?), aborting...");
+ msg_Err(p_filter, "can't convert (unsupported formats?), aborting...");
return;
}
}
else //((p_sys->f_scale != 1) || (p_sys->i_internal_chroma != CINPUT))
{
- //use the input image without conversion
- p_sys->p_proc_image = p_in;
+ // In theory, you could use the input image without conversion,
+ // but it seems to cause weird picture effects (like repeated
+ // image filtering) and picture leaking.
+ p_sys->p_proc_image = filter_NewPicture( p_filter ); //p_in
+ picture_Copy( p_sys->p_proc_image, p_in );
+ p_sys->p_to_be_freed = p_sys->p_proc_image;
}
//Convert to the IplImage array that is to be processed.
//is created for each plane.
planes = p_sys->p_proc_image->i_planes;
p_sys->i_cv_image_size = planes;
- for ( i = 0; i < planes; i++ )
+ for( int i = 0; i < planes; i++ )
{
sz = cvSize(abs(p_sys->p_proc_image->p[i].i_visible_pitch /
p_sys->p_proc_image->p[i].i_pixel_pitch),
//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;
- //calculate duration of conversion
- 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", duration );
+#ifndef NDEBUG
+ msg_Dbg( p_filter, "VlcPictureToIplImageRgb() completed" );
+#endif
}
/*****************************************************************************
- * Render: displays previously rendered output
+ * Filter: displays previously rendered output
*****************************************************************************
* This function send the currently rendered image to the internal opencv
* filter for processing.
*****************************************************************************/
-static void Render( vout_thread_t *p_vout, picture_t *p_pic )
+static picture_t* Filter( filter_t* p_filter, picture_t* p_pic )
{
- picture_t *p_outpic = NULL;
- clock_t start, finish;
- double duration;
-
- while( ( p_outpic = vout_CreatePicture( p_vout->p_sys->p_vout, 0, 0, 0 ) )
- == NULL )
- {
- if( !vlc_object_alive (p_vout) || p_vout->b_error )
- { return; }
- msleep( VOUT_OUTMEM_SLEEP );
+ picture_t* p_outpic = filter_NewPicture( p_filter );
+ if( p_outpic == NULL ) {
+ msg_Err( p_filter, "couldn't get a p_outpic!" );
+ picture_Release( p_pic );
+ return NULL;
}
- vout_LinkPicture( p_vout->p_sys->p_vout, p_outpic );
-
- start = clock();
+ video_format_t fmt_out;
- if (p_vout->p_sys->i_wrapper_output == VINPUT) //output = input video
- {
- //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.
+ // Make a copy if we want to show the original input
+ if (p_filter->p_sys->i_wrapper_output == VINPUT)
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))
- p_vout->p_sys->p_opencv->pf_video_filter( p_vout->p_sys->p_opencv, &(p_vout->p_sys->hacked_pic));
- }
- else //output = processed video (NONE option not working yet)
- {
- 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))
- 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))
- picture_Copy( p_outpic, p_vout->p_sys->p_proc_image );
+
+ VlcPictureToIplImage( p_filter, p_pic );
+ // Pass the image (as a pointer to the first IplImage*) to the
+ // internal OpenCV filter for processing.
+ p_filter->p_sys->p_opencv->pf_video_filter( p_filter->p_sys->p_opencv, (picture_t*)&(p_filter->p_sys->p_cv_image[0]) );
+
+ if(p_filter->p_sys->i_wrapper_output == PROCESSED) {
+ // Processed video
+ if( (p_filter->p_sys->p_proc_image) &&
+ (p_filter->p_sys->p_proc_image->i_planes > 0) &&
+ (p_filter->p_sys->i_internal_chroma != CINPUT) ) {
+ //p_filter->p_sys->p_proc_image->format.i_chroma = VLC_CODEC_RGB24;
+
+ memset( &fmt_out, 0, sizeof(video_format_t) );
+ fmt_out = p_pic->format;
+ //picture_Release( p_outpic );
+
+ /*
+ * We have to copy out the image from image_Convert(), otherwise
+ * you leak pictures for some reason:
+ * main video output error: pictures leaked, trying to workaround
+ */
+ picture_t* p_outpic_tmp = image_Convert(
+ p_filter->p_sys->p_image,
+ p_filter->p_sys->p_proc_image,
+ &(p_filter->p_sys->p_proc_image->format),
+ &fmt_out );
+
+ picture_CopyPixels( p_outpic, p_outpic_tmp );
+ CopyInfoAndRelease( p_outpic, p_outpic_tmp );
+ } else if( p_filter->p_sys->i_internal_chroma == CINPUT ) {
+ picture_CopyPixels( p_outpic, p_filter->p_sys->p_proc_image );
+ picture_CopyProperties( p_outpic, p_filter->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", duration );
-
- ReleaseImages(p_vout);
- 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 );
+ ReleaseImages( p_filter );
+ picture_Release( p_pic );
+
+#ifndef NDEBUG
+ msg_Dbg( p_filter, "Filter() done" );
+#endif
+
+ if( p_filter->p_sys->i_wrapper_output != NONE ) {
+ return p_outpic;
+ } else { // NONE
+ picture_Release( p_outpic );
+ return NULL;
+ }
}
projects / vlc / blobdiff