Port chain filter to new API. Now supports chaining of chroma conversion and scaling...

[vlc] / modules / video_filter / motiondetect.c

diff --git a/modules/video_filter/motiondetect.c b/modules/video_filter/motiondetect.c
index 0f6ee3c777a915e219f05219593cd53df72ea8bd..592e1b93245b6aa58e4c190241c695aa2abcb5b4 100644 (file)
--- a/modules/video_filter/motiondetect.c
+++ b/modules/video_filter/motiondetect.c
@@ -29,11 +29,13 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_sout.h>
 #include <vlc_vout.h>
 
 #include "vlc_filter.h"
+#include "filter_picture.h"
 
 /*****************************************************************************
  * Local prototypes
@@ -51,8 +53,8 @@ static void GaussianConvolution( uint32_t *, uint32_t *, int, int, int );
 #define FILTER_PREFIX "motiondetect-"
 
 vlc_module_begin();
-    set_description( _("Motion detect video filter") );
-    set_shortname( _( "Motion Detect" ));
+    set_description( N_("Motion detect video filter") );
+    set_shortname( N_( "Motion Detect" ));
     set_capability( "video filter2", 0 );
     set_category( CAT_VIDEO );
     set_subcategory( SUBCAT_VIDEO_VFILTER );
@@ -61,12 +63,6 @@ vlc_module_begin();
     set_callbacks( Create, Destroy );
 vlc_module_end();
 
-#if 0
-static const char *ppsz_filter_options[] = {
-    NULL
-};
-#endif
-
 struct filter_sys_t
 {
     uint8_t *p_oldpix;
@@ -84,6 +80,19 @@ static int Create( vlc_object_t *p_this )
 {
     filter_t *p_filter = (filter_t *)p_this;
 
+    switch( p_filter->fmt_in.video.i_chroma )
+    {
+        CASE_PLANAR_YUV
+            break;
+
+        CASE_PACKED_YUV_422
+            msg_Err( p_filter, "FIXME ... this should be easy." );
+        default:
+            msg_Err( p_filter, "Unsupported input chroma (%4s)",
+                     (char*)&(p_filter->fmt_in.video.i_chroma) );
+            return VLC_EGENERIC;
+    }
+
     /* Allocate structure */
     p_filter->p_sys = malloc( sizeof( filter_sys_t ) );
     if( p_filter->p_sys == NULL )
@@ -97,11 +106,7 @@ static int Create( vlc_object_t *p_this )
     p_filter->p_sys->p_oldpix = NULL;
     p_filter->p_sys->p_buf = NULL;
 
-#if 0
-    config_ChainParse( p_filter, FILTER_PREFIX, ppsz_filter_options,
-                   p_filter->p_cfg );
-#endif
-    vlc_mutex_init( p_filter, &p_filter->p_sys->lock );
+    vlc_mutex_init( &p_filter->p_sys->lock );
 
     return VLC_SUCCESS;
 }
@@ -161,11 +166,9 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_inpic )
     }
 
     p_outpix = p_outpic->p[Y_PLANE].p_pixels;
-    p_filter->p_libvlc->pf_memcpy( p_outpic->p[U_PLANE].p_pixels,
-                                   p_inpic->p[U_PLANE].p_pixels,
+    vlc_memcpy( p_outpic->p[U_PLANE].p_pixels, p_inpic->p[U_PLANE].p_pixels,
         p_inpic->p[U_PLANE].i_pitch * p_inpic->p[U_PLANE].i_visible_lines );
-    p_filter->p_libvlc->pf_memcpy( p_outpic->p[V_PLANE].p_pixels,
-                                   p_inpic->p[V_PLANE].p_pixels,
+    vlc_memcpy( p_outpic->p[V_PLANE].p_pixels, p_inpic->p[V_PLANE].p_pixels,
         p_inpic->p[V_PLANE].i_pitch * p_inpic->p[V_PLANE].i_visible_lines );
 
     if( !p_sys->p_oldpix || !p_sys->p_buf )
@@ -442,12 +445,9 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_inpic )
     /**
      * We're done. Lets keep a copy of the picture
      */
-    p_filter->p_libvlc->pf_memcpy( p_oldpix, p_inpix,
-                                   i_src_pitch * i_num_lines );
-    p_filter->p_libvlc->pf_memcpy( p_oldpix_u, p_inpix_u,
-                                   i_src_pitch_u * i_num_lines_u );
-    p_filter->p_libvlc->pf_memcpy( p_oldpix_v, p_inpix_v,
-                                   i_src_pitch_u * i_num_lines_u );
+    vlc_memcpy( p_oldpix, p_inpix, i_src_pitch * i_num_lines );
+    vlc_memcpy( p_oldpix_u, p_inpix_u, i_src_pitch_u * i_num_lines_u );
+    vlc_memcpy( p_oldpix_v, p_inpix_v, i_src_pitch_u * i_num_lines_u );
 
     vlc_mutex_unlock( &p_filter->p_sys->lock );