Changeset bf2bdccad3f2bcca29d4b102005e6ff1b3a8ccc0

Timestamp:

06/20/07 22:19:24 (1 year ago)

Author:

Jérome Decoodt <djc@videolan.org>

git-committer:

Jérome Decoodt <djc@videolan.org> 1182370764 +0000

git-parent:

[22462d18862065dd0ac58f940b65beeb64ff50a2]

git-author:

Jérome Decoodt <djc@videolan.org> 1182370764 +0000

Message:

Add rotate-deciangle for more precision in rotate
Add unimotion (http://members.optusnet.com.au/lbramsay/programs/unimotion.html)
to motion interface
Add a low band filter to the motion

Files:

• configure.ac (modified) (2 diffs)
• modules/control/Modules.am (modified) (1 diff)
• modules/control/motion.c (modified) (11 diffs)
• modules/control/unimotion.c (added)
• modules/control/unimotion.h (added)
• modules/video_filter/rotate.c (modified) (4 diffs)

configure.ac

@@ -174 +174 @@
-    VLC_ADD_CFLAGS([libvlc vlc],[-x objective-c])
-    VLC_ADD_LDFLAGS([vlc],[-undefined dynamic_lookup])
+    VLC_ADD_LDFLAGS([motion],[-framework IOKit -framework CoreFoundation])
-    AC_ARG_ENABLE(macosx-defaults,
-        [  --enable-macosx-defaults Build the default configuration on Mac OS X (default enabled)])
@@ -3330 +3331 @@
-  ] )
-])
-
-
-dnl

modules/control/Modules.am

@@ -7 +7 @@
-SOURCES_lirc = lirc.c
-SOURCES_rc = rc.c
-SOURCES_motion = motion.c
-SOURCES_dbus = dbus.c dbus.h
+if HAVE_DARWIN
+motion_extra = unimotion.c unimotion.h
+else
+motion_extra = $(NULL)
+endif
+SOURCES_motion = \
+        motion.c \
+        $(motion_extra) \
+        $(NULL)
+

modules/control/motion.c

@@ -2 +2 @@
- * motion.c: control VLC with laptop built-in motion sensors
- *****************************************************************************
-
+- 2007 
- * $Id$
- *
- * Author: Sam Hocevar <sam@zoy.org>
+ *         Jérôme Decoodt <djc@videolan.org> (unimotion integration)
- *
- * This program is free software; you can redistribute it and/or modify
@@ -27 +28 @@
-#include <stdlib.h>                                      /* malloc(), free() */
-#include <string.h>
+#include <math.h>
-
-#include <vlc/vlc.h>
@@ -36 +38 @@
-#endif
-
+#ifdef __APPLE__
+#include "unimotion.h"
+#endif
+
-/*****************************************************************************
- * intf_sys_t: description and status of interface
@@ -41 +47 @@
-struct intf_sys_t
-{
-
+
+
-
-    int i_calibrate;
@@ -111 +118 @@
-        p_intf->p_sys->sensor = AMS_SENSOR;
-    }
+#ifdef __APPLE__
+    else if( p_intf->p_sys->unimotion_hw = detect_sms() )
+        p_intf->p_sys->sensor = UNIMOTION_SENSOR;
+#endif
-    else
-    {
@@ -137 +148 @@
- * RunIntf: main loop
- *****************************************************************************/
+#define FILTER_LENGTH 16
+#define LOW_THRESHOLD 800
+#define HIGH_THRESHOLD 1000
-static void RunIntf( intf_thread_t *p_intf )
-{
-
+
+
+
-
-    while( !intf_ShouldDie( p_intf ) )
-    {
-#define LOW_THRESHOLD 80
-#define HIGH_THRESHOLD 100
-        vout_thread_t *p_vout;
-        const char *psz_filter, *psz_type;
@@ -153 +167 @@
-
-        i_x = GetOrientation( p_intf );
+        i_sum += i_x - p_oldx[i];
+        p_oldx[i++] = i_x;
+        if( i == FILTER_LENGTH ) i = 0;
+        i_x = i_sum / FILTER_LENGTH;
-
-        if( p_intf->p_sys->b_use_rotate )
@@ -163 +181 @@
-                if( p_obj )
-                {
-
+
+
-                    i_oldx = i_x;
-                    vlc_object_release( p_obj );
@@ -210 +229 @@
-    }
-}
-
-
-
+
+
+
+
+
+
- *****************************************************************************/
-static int GetOrientation( intf_thread_t *p_intf )
-{
-    FILE *f;
-
+, i_z
-
-    switch( p_intf->p_sys->sensor )
@@ -232 +254 @@
-        fclose( f );
-
-i_x - p_intf->p_sys->i_calibrate
+( i_x - p_intf->p_sys->i_calibrate ) * 10
-
-    case AMS_SENSOR:
@@ -244 +266 @@
-        fclose( f );
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    default:
-        return 0;

modules/video_filter/rotate.c

@@ -44 +44 @@
-
-static int RotateCallback( vlc_object_t *p_this, char const *psz_var,
+                           vlc_value_t oldval, vlc_value_t newval,
+                           void *p_data );
+
+static int PreciseRotateCallback( vlc_object_t *p_this, char const *psz_var,
-                           vlc_value_t oldval, vlc_value_t newval,
-                           void *p_data );
@@ -85 +89 @@
-static inline void cache_trigo( int i_angle, int *i_sin, int *i_cos )
-{
-
+0
-    *i_sin = (int)(sin( f_angle )*256.);
-    *i_cos = (int)(cos( f_angle )*256.);
@@ -111 +115 @@
-
-    p_sys->i_angle = var_CreateGetIntegerCommand( p_filter,
-
+
+
-    var_AddCallback( p_filter, FILTER_PREFIX "angle", RotateCallback, p_sys );
+    var_AddCallback( p_filter, FILTER_PREFIX "deciangle", PreciseRotateCallback, p_sys );
-
-    cache_trigo( p_sys->i_angle, &p_sys->i_sin, &p_sys->i_cos );
@@ -221 +227 @@
-    if( !strcmp( psz_var, "rotate-angle" ) )
-    {
+        p_sys->i_angle = newval.i_int*10;
+
+        cache_trigo( p_sys->i_angle, &p_sys->i_sin, &p_sys->i_cos );
+    }
+    return VLC_SUCCESS;
+}
+static int PreciseRotateCallback( 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-deciangle" ) )
+    {
-        p_sys->i_angle = newval.i_int;
-