Changeset e3b4a2c7fad771e31d33650ca887ee907fb9e780

Timestamp:

09/05/07 20:48:21 (2 years ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1178736501 +0000

git-parent:

[b4c9724a3f5a74a734afb717aab8040407603b2e]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1178736501 +0000

Message:

HW Pixel Doubling and Backlight-on for Maemo devices
Patch courtesy of Tapio Hiltunen, Technical Research Center of Finland

Files:

• THANKS (modified) (1 diff)
• configure.ac (modified) (1 diff)
• modules/video_output/x11/xcommon.c (modified) (10 diffs)
• modules/video_output/x11/xcommon.h (modified) (2 diffs)

THANKS

@@ -172 +172 @@
-Steven Sheehy - wxWidgets interface fix
-Tadashi Jokagi <elf2000 at users.sourceforge dot net> - Japanese translation
+Tapio Hiltunen <Tapio dot Hiltunen at vtt dot fi> - Maemo X11 enhancements
-Tim 'O Callaghan <tim.ocallaghan at limestudios dot com> - pvr input cleaning patch
-Tim Schuerewegen <ma054331 at skynet dot be> - contrib fixes

configure.ac

@@ -5579 +5579 @@
-AM_CONDITIONAL(BUILD_MOZILLA,${mozilla})
-
+dnl Tests for Osso and Xsp
+AC_CHECK_LIB(osso, osso_display_blanking_pause,[
+   PKG_CHECK_MODULES(GLIB2, glib-2.0, [                       
+       VLC_ADD_CPPFLAGS([x11],[-DHAVE_OSSO ${DBUS_CFLAGS} ${GLIB2_CFLAGS}])
+       VLC_ADD_LDFLAGS([x11],[-losso])
+   ])
+])
+AC_CHECK_LIB(Xsp, XSPSetPixelDoubling,[
+   VLC_ADD_CPPFLAGS([x11],[-DHAVE_XSP])
+   VLC_ADD_LDFLAGS([x11],[-lXsp])
+])
+
-dnl
-dnl  Mediacontrol Python bindings

modules/video_output/x11/xcommon.c

@@ -49 +49 @@
-#endif
-
+#ifdef HAVE_XSP
+#include <X11/extensions/Xsp.h>
+#endif
+
-#ifdef HAVE_SYS_SHM_H
-#   include <sys/shm.h>                                /* shmget(), shmctl() */
@@ -149 +153 @@
-
-static int X11ErrorHandler( Display *, XErrorEvent * );
+
+#ifdef HAVE_XSP
+static void EnablePixelDoubling( vout_thread_t *p_vout );
+static void DisablePixelDoubling( vout_thread_t *p_vout );
+#endif
+
+#ifdef HAVE_OSSO
+static const int i_backlight_on_interval = 300;
+#endif
+
+
-
-/*****************************************************************************
@@ -372 +387 @@
-#endif
-
+#ifdef HAVE_XSP
+    p_vout->p_sys->i_hw_scale = 1;
+#endif
+    
+#ifdef HAVE_OSSO
+    p_vout->p_sys->i_backlight_on_counter = i_backlight_on_interval; 
+    p_vout->p_sys->p_octx = osso_initialize( "vlc", VERSION, 0, NULL );
+    if ( p_vout->p_sys->p_octx == NULL ) {
+        msg_Err( p_vout, "Could not get osso context" );
+    } else {
+        msg_Dbg( p_vout, "Initialized osso context" );
+    }
+#endif
+            
-    /* Variable to indicate if the window should be on top of others */
-    /* Trigger a callback right now */
@@ -429 +458 @@
-#endif
-
+#ifdef HAVE_XSP
+    DisablePixelDoubling(p_vout);
+#endif
+        
-    DestroyCursor( p_vout );
-    EnableXScreenSaver( p_vout );
@@ -440 +473 @@
-#endif
-
+#ifdef HAVE_OSSO
+    if ( p_vout->p_sys->p_octx != NULL ) {
+        msg_Dbg( p_vout, "Deinitializing osso context" );
+        osso_deinitialize( p_vout->p_sys->p_octx );
+    }
+#endif
+    
-    free( p_vout->p_sys );
-}
@@ -674 +714 @@
-#endif
-
+#ifdef HAVE_XSP
+/*****************************************************************************
+ * EnablePixelDoubling: Enables pixel doubling
+ *****************************************************************************
+ * Checks if the double size image fits in current window, and enables pixel
+ * doubling accordingly. The i_hw_scale is the integer scaling factor.
+ *****************************************************************************/
+static void EnablePixelDoubling( vout_thread_t *p_vout )
+{
+    int i_hor_scale = ( p_vout->p_sys->p_win->i_width ) / p_vout->render.i_width;
+    int i_vert_scale =  ( p_vout->p_sys->p_win->i_height ) / p_vout->render.i_height;
+    if ( ( i_hor_scale > 1 ) && ( i_vert_scale > 1 ) ) {
+        p_vout->p_sys->i_hw_scale = 2;
+        msg_Dbg( p_vout, "Enabling pixel doubling, scaling factor %d", p_vout->p_sys->i_hw_scale );
+        XSPSetPixelDoubling( p_vout->p_sys->p_display, 0, 1 );
+    }
+}
+
+/*****************************************************************************
+ * DisablePixelDoubling: Disables pixel doubling
+ *****************************************************************************
+ * The scaling factor i_hw_scale is reset to the no-scaling value 1.
+ *****************************************************************************/
+static void DisablePixelDoubling( vout_thread_t *p_vout )
+{
+    if ( p_vout->p_sys->i_hw_scale > 1 ) {
+        msg_Dbg( p_vout, "Disabling pixel doubling" );
+        XSPSetPixelDoubling( p_vout->p_sys->p_display, 0, 0 );
+        p_vout->p_sys->i_hw_scale = 1;
+    }
+}
+#endif
+
+
+
-/*****************************************************************************
- * InitVideo: initialize X11 video thread output method
@@ -744 +819 @@
-    }
-
+#ifdef HAVE_XSP
+    vout_PlacePicture( p_vout, p_vout->p_sys->p_win->i_width  / p_vout->p_sys->i_hw_scale,
+                       p_vout->p_sys->p_win->i_height  / p_vout->p_sys->i_hw_scale,
+                       &i_index, &i_index,
+                       &p_vout->fmt_out.i_visible_width,
+                       &p_vout->fmt_out.i_visible_height );
+#else
-    vout_PlacePicture( p_vout, p_vout->p_sys->p_win->i_width,
-                       p_vout->p_sys->p_win->i_height,
@@ -749 +831 @@
-                       &p_vout->fmt_out.i_visible_width,
-                       &p_vout->fmt_out.i_visible_height );
+#endif
-
-    p_vout->fmt_out.i_chroma = p_vout->output.i_chroma;
@@ -1422 +1505 @@
-    xvmc_context_reader_unlock( &p_vout->p_sys->xvmc_lock );
-#endif
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    vlc_mutex_unlock( &p_vout->p_sys->lock );
-    return 0;
@@ -2118 +2216 @@
-                           p_vout->p_sys->p_win->i_width,
-                           p_vout->p_sys->p_win->i_height );
+
+#ifdef HAVE_XSP
+        EnablePixelDoubling( p_vout );
+#endif
+        
-    }
-    else
-    {
-        msg_Dbg( p_vout, "leaving fullscreen mode" );
+
+#ifdef HAVE_XSP
+        DisablePixelDoubling( p_vout );
+#endif
-
-        XReparentWindow( p_vout->p_sys->p_display,

modules/video_output/x11/xcommon.h

@@ -52 +52 @@
-                    (i >> 24) & 0xff )
-
+#ifdef HAVE_OSSO
+#include <libosso.h>
+#endif
-
-/*****************************************************************************
@@ -207 +210 @@
-    //alphablend_t       alphablend_extra_data;
-#endif
+
+#ifdef HAVE_XSP
+    int                 i_hw_scale;
+#endif 
+
+#ifdef HAVE_OSSO
+    osso_context_t      *p_octx;
+    int                 i_backlight_on_counter;
+#endif
+
+    
-};
-