Use pl_Yield instead of vlc_object_find

[vlc] / modules / video_filter / opencv_wrapper.c

diff --git a/modules/video_filter/opencv_wrapper.c b/modules/video_filter/opencv_wrapper.c
index b67e1bfb388cf2c0e8de6e4e162a956befced8c7..1095f6cf06a0b5adcf12bd7e6f8c81c0e763b897 100644 (file)
--- a/modules/video_filter/opencv_wrapper.c
+++ b/modules/video_filter/opencv_wrapper.c
@@ -23,14 +23,17 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>                                      /* malloc(), free() */
-#include <string.h>
 
 #include <cxcore.h>
 #include <cv.h>
 #include <highgui.h>
 
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_vout.h>
 
 #include <math.h>
@@ -63,21 +66,21 @@ 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_description( N_("OpenCV video filter wrapper") );
+    set_shortname( N_("OpenCV" ));
     set_category( CAT_VIDEO );
     set_subcategory( SUBCAT_VIDEO_VFILTER );
     set_capability( "video filter", 0 );
@@ -86,22 +89,22 @@ vlc_module_begin();
     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"),
-                          VLC_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"), VLC_FALSE);
+                          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,
                           N_("Wrapper filter output"),
-                          N_("Determines what (if any) video is displayed by the wrapper filter"), VLC_FALSE);
+                          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"), VLC_FALSE);
+                          N_("Determines wrapper filter verbosity level"), false);
         change_string_list( verbosity_list, verbosity_list_text, 0);
     add_string( "opencv-filter-name", "none", NULL,
                           N_("OpenCV internal filter name"),
-                          N_("Name of internal OpenCV plugin filter to use"), VLC_FALSE);
+                          N_("Name of internal OpenCV plugin filter to use"), false);
 vlc_module_end();
 
 
@@ -299,11 +302,12 @@ static int Init( vout_thread_t *p_vout )
 {
     int i_index;
     picture_t *p_pic;
-    video_format_t fmt = {0};
+    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;
@@ -340,7 +344,7 @@ static int Init( vout_thread_t *p_vout )
         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_destroy( p_sys->p_opencv );
+        vlc_object_release( p_sys->p_opencv );
         p_sys->p_opencv = NULL;
     }
 
@@ -386,7 +390,7 @@ static void End( vout_thread_t *p_vout )
         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_destroy( p_vout->p_sys->p_opencv );
+        vlc_object_release( p_vout->p_sys->p_opencv );
         p_vout->p_sys->p_opencv = NULL;
     }
 
@@ -456,12 +460,14 @@ static void VlcPictureToIplImage( vout_thread_t *p_vout, 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 = {0};
+    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;
 
+    memset( &fmt_out, 0, sizeof(video_format_t) );
+
     start = clock();
 
     //do scale / color conversion according to p_sys config
@@ -591,7 +597,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic )
 
     ReleaseImages(p_vout);
     vout_DatePicture( p_vout->p_sys->p_vout, p_outpic, p_pic->date );
-       
+    
     vout_UnlinkPicture( p_vout->p_sys->p_vout, p_outpic );
     vout_DisplayPicture( p_vout->p_sys->p_vout, p_outpic );
 }