Motion control interface can now be used with the rotate video filter. (Should be...

diff --git a/modules/control/motion.c b/modules/control/motion.c
index 25856e6b1cbda6f93531573511fd631a1a5b3c39..81511cbb2389472ace04977f2411d9c46f9d0893 100644 (file)
--- a/modules/control/motion.c
+++ b/modules/control/motion.c
@@ -42,8 +42,9 @@ struct intf_sys_t
 {
     enum { NO_SENSOR, HDAPS_SENSOR, AMS_SENSOR } sensor;
 
-    int i_last_x, i_calibrate;
-    int i_threshold;
+    int i_calibrate;
+
+    vlc_bool_t b_use_rotate;
 };
 
 /*****************************************************************************
@@ -55,6 +56,8 @@ static void Close  ( vlc_object_t * );
 static void RunIntf( intf_thread_t *p_intf );
 static int GetOrientation( intf_thread_t *p_intf );
 
+#define USE_ROTATE_TEXT N_("Use the rotate video filter instead of transform")
+
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
@@ -63,6 +66,9 @@ vlc_module_begin();
     set_category( CAT_INTERFACE );
     set_description( _("motion control interface") );
 
+    add_bool( "motion-use-rotate", 0, NULL,
+              USE_ROTATE_TEXT, USE_ROTATE_TEXT, VLC_FALSE );
+
     set_capability( "interface", 0 );
     set_callbacks( Open, Close );
 vlc_module_end();
@@ -112,6 +118,13 @@ int Open ( vlc_object_t *p_this )
 
     p_intf->pf_run = RunIntf;
 
+    p_intf->p_sys->b_use_rotate = config_GetInt( p_intf, "motion-use-rotate" );
+
+    if( p_intf->p_sys->b_use_rotate )
+    {
+        var_Create( p_intf->p_libvlc, "rotate_angle", VLC_VAR_INTEGER );
+    }
+
     return VLC_SUCCESS;
 }
 
@@ -145,6 +158,17 @@ static void RunIntf( intf_thread_t *p_intf )
 
         i_x = GetOrientation( p_intf );
 
+        if( p_intf->p_sys->b_use_rotate )
+        {
+            if( i_oldx != i_x )
+            {
+                var_SetInteger( p_intf->p_libvlc, "rotate_angle",
+                            ((360+i_x/2)%360) );
+                i_oldx = i_x;
+            }
+            continue;
+        }
+
         if( i_x < -HIGH_THRESHOLD && i_oldx > -LOW_THRESHOLD )
         {
             b_change = VLC_TRUE;

diff --git a/modules/video_filter/rotate.c b/modules/video_filter/rotate.c
index ad2e4be7137a9936452b6925e044d89ec3720fdc..f308d4ef1c6a5daf212c2df60f1057bf9178d77f 100644 (file)
--- a/modules/video_filter/rotate.c
+++ b/modules/video_filter/rotate.c
@@ -42,6 +42,10 @@ static void Destroy   ( vlc_object_t * );
 
 static picture_t *Filter( filter_t *, picture_t * );
 
+static int RotateCallback( vlc_object_t *p_this, char const *psz_var,
+                           vlc_value_t oldval, vlc_value_t newval,
+                           void *p_data );
+
 #define ANGLE_TEXT N_("Angle in degrees")
 #define ANGLE_LONGTEXT N_("Angle in degrees (0 to 359)")
 
@@ -108,6 +112,12 @@ static int Create( vlc_object_t *p_this )
                                                FILTER_PREFIX "angle" );
     p_filter->p_sys->last_date = 0;
 
+    var_Create( p_filter->p_libvlc, "rotate_angle", VLC_VAR_INTEGER );
+    var_SetInteger( p_filter->p_libvlc, "rotate_angle",
+                    p_filter->p_sys->i_angle );
+    var_AddCallback( p_filter->p_libvlc,
+                     "rotate_angle", RotateCallback, p_filter->p_sys );
+
     return VLC_SUCCESS;
 }
 
@@ -119,6 +129,9 @@ static int Create( vlc_object_t *p_this )
 static void Destroy( vlc_object_t *p_this )
 {
     filter_t *p_filter = (filter_t *)p_this;
+
+    var_DelCallback( p_filter->p_libvlc,
+                     "rotate_angle", RotateCallback, p_filter->p_sys );
     free( p_filter->p_sys );
 }
 
@@ -176,10 +189,12 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
             {
                 int i_line_orig, i_col_orig;
                 i_line_orig = (int)( f_cos * (double)(i_line-i_line_center)
-                                   + f_sin * (double)(i_col-i_col_center) )
+                                   + f_sin * (double)(i_col-i_col_center)
+                                   + 0.5 )
                               + i_line_center;
                 i_col_orig = (int)(-f_sin * (double)(i_line-i_line_center)
-                                  + f_cos * (double)(i_col-i_col_center) )
+                                  + f_cos * (double)(i_col-i_col_center)
+                                  + 0.5 )
                              + i_col_center;
 
                 if(    0 <= i_line_orig && i_line_orig < i_num_lines
@@ -208,3 +223,16 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
 
     return p_outpic;
 }
+
+static int RotateCallback( vlc_object_t *p_this, char const *psz_var,
+                           vlc_value_t oldval, vlc_value_t newval,
+                           void *p_data )
+{
+    filter_sys_t *p_sys = (filter_sys_t *)p_data;
+
+    if( !strcmp( psz_var, "rotate_angle" ) )
+    {
+        p_sys->i_angle = newval.i_int;
+    }
+    return VLC_SUCCESS;
+}