Implement partial screen capture and cursor following on windows.
authorAntoine Cellerier <dionoea@videolan.org>
Tue, 9 Sep 2008 15:51:33 +0000 (17:51 +0200)
committerAntoine Cellerier <dionoea@videolan.org>
Tue, 9 Sep 2008 15:52:16 +0000 (17:52 +0200)
NEWS
modules/access/screen/screen.c
modules/access/screen/screen.h
modules/access/screen/win32.c
modules/access/screen/x11.c

diff --git a/NEWS b/NEWS
index 5a8ace1..2e6127a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,8 @@ Changes between 0.9.1 and 1.0.0-git:
 
 Inputs:
  * Mouse cursor support in x11 screen module
+ * Screen module now supports partial screen capture and mouse following on
+   windows.
 
 Decoders:
  * AES3 (SMPTE 302M) support
index 97a8af2..b401e33 100644 (file)
@@ -1,10 +1,11 @@
 /*****************************************************************************
  * screen.c: Screen capture module.
  *****************************************************************************
- * Copyright (C) 2004 the VideoLAN team
+ * Copyright (C) 2004-2008 the VideoLAN team
  * $Id$
  *
  * Authors: Gildas Bazin <gbazin@videolan.org>
+ *          Antoine Cellerier <dionoea at videolan dot org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -308,3 +309,18 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
             return VLC_EGENERIC;
     }
 }
+
+#ifdef SCREEN_SUBSCREEN
+void FollowMouse( demux_sys_t *p_sys, int i_x, int i_y )
+{
+    i_x -= p_sys->i_width/2;
+    if( i_x < 0 ) i_x = 0;
+    p_sys->i_left = __MIN( (unsigned int)i_x,
+    p_sys->i_screen_width - p_sys->i_width );
+
+    i_y -= p_sys->i_height/2;
+    if( i_y < 0 ) i_y = 0;
+    p_sys->i_top = __MIN( (unsigned int)i_y,
+    p_sys->i_screen_height - p_sys->i_height );
+}
+#endif
index 388021c..7c9506c 100644 (file)
@@ -1,10 +1,11 @@
 /*****************************************************************************
  * screen.h: Screen capture module.
  *****************************************************************************
- * Copyright (C) 2004 the VideoLAN team
+ * Copyright (C) 2004-2008 the VideoLAN team
  * $Id$
  *
  * Authors: Gildas Bazin <gbazin@videolan.org>
+ *          Antoine Cellerier <dionoea at videolan dot org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
 #include <vlc_access.h>
 #include <vlc_demux.h>
 
-#if !defined( HAVE_WIN32 ) && !defined( HAVE_BEOS ) && !defined( HAVE_DARWIN )
+#if !defined( HAVE_BEOS ) && !defined( HAVE_DARWIN )
 #   define SCREEN_SUBSCREEN
+#endif
+
+#if !defined( HAVE_WIN32 ) && !defined( HAVE_BEOS ) && !defined( HAVE_DARWIN )
 #   define SCREEN_MOUSE
 #endif
 
@@ -69,3 +73,6 @@ int      screen_InitCapture ( demux_t * );
 int      screen_CloseCapture( demux_t * );
 block_t *screen_Capture( demux_t * );
 
+#ifdef SCREEN_SUBSCREEN
+void FollowMouse( demux_sys_t *, int, int );
+#endif
index 79683cb..05ba392 100644 (file)
@@ -54,9 +54,11 @@ int screen_InitCapture( demux_t *p_demux )
     demux_sys_t *p_sys = p_demux->p_sys;
     screen_data_t *p_data;
     int i_chroma, i_bits_per_pixel;
-    vlc_value_t val;
 
     p_sys->p_data = p_data = malloc( sizeof( screen_data_t ) );
+    if( !p_data )
+        return VLC_ENOMEM;
+    memset( p_data, 0, sizeof( screen_data_t ) );
 
     /* Get the device context for the whole screen */
     p_data->hdc_src = CreateDC( "DISPLAY", NULL, NULL, NULL );
@@ -122,32 +124,6 @@ int screen_InitCapture( demux_t *p_demux )
     }
 
 
-    /* Create the bitmap info header */
-    p_data->bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
-    p_data->bmi.bmiHeader.biWidth = p_sys->fmt.video.i_width;
-    p_data->bmi.bmiHeader.biHeight = - p_sys->fmt.video.i_height;
-    p_data->bmi.bmiHeader.biPlanes = 1;
-    p_data->bmi.bmiHeader.biBitCount = p_sys->fmt.video.i_bits_per_pixel;
-    p_data->bmi.bmiHeader.biCompression = BI_RGB;
-    p_data->bmi.bmiHeader.biSizeImage = 0;
-    p_data->bmi.bmiHeader.biXPelsPerMeter =
-        p_data->bmi.bmiHeader.biYPelsPerMeter = 0;
-    p_data->bmi.bmiHeader.biClrUsed = 0;
-    p_data->bmi.bmiHeader.biClrImportant = 0;
-
-    var_Create( p_demux, "screen-fragment-size",
-                VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
-    var_Get( p_demux, "screen-fragment-size", &val );
-    p_data->i_fragment_size =
-        val.i_int > 0 ? val.i_int : p_sys->fmt.video.i_height;
-    p_data->i_fragment_size =
-        val.i_int > p_sys->fmt.video.i_height ? p_sys->fmt.video.i_height :
-        p_data->i_fragment_size;
-    p_sys->f_fps *= (p_sys->fmt.video.i_height/p_data->i_fragment_size);
-    p_sys->i_incr = 1000000 / p_sys->f_fps;
-    p_data->i_fragment = 0;
-    p_data->p_block = 0;
-
     return VLC_SUCCESS;
 }
 
@@ -189,6 +165,37 @@ static block_t *CaptureBlockNew( demux_t *p_demux )
     int i_buffer;
     HBITMAP hbmp;
 
+    if( p_data->bmi.bmiHeader.biSize == 0 )
+    {
+        vlc_value_t val;
+        /* Create the bitmap info header */
+        p_data->bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
+        p_data->bmi.bmiHeader.biWidth = p_sys->fmt.video.i_width;
+        p_data->bmi.bmiHeader.biHeight = - p_sys->fmt.video.i_height;
+        p_data->bmi.bmiHeader.biPlanes = 1;
+        p_data->bmi.bmiHeader.biBitCount = p_sys->fmt.video.i_bits_per_pixel;
+        p_data->bmi.bmiHeader.biCompression = BI_RGB;
+        p_data->bmi.bmiHeader.biSizeImage = 0;
+        p_data->bmi.bmiHeader.biXPelsPerMeter =
+            p_data->bmi.bmiHeader.biYPelsPerMeter = 0;
+        p_data->bmi.bmiHeader.biClrUsed = 0;
+        p_data->bmi.bmiHeader.biClrImportant = 0;
+
+        var_Create( p_demux, "screen-fragment-size",
+                    VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+        var_Get( p_demux, "screen-fragment-size", &val );
+        p_data->i_fragment_size =
+            val.i_int > 0 ? val.i_int : p_sys->fmt.video.i_height;
+        p_data->i_fragment_size =
+            val.i_int > p_sys->fmt.video.i_height ? p_sys->fmt.video.i_height :
+            p_data->i_fragment_size;
+        p_sys->f_fps *= (p_sys->fmt.video.i_height/p_data->i_fragment_size);
+        p_sys->i_incr = 1000000 / p_sys->f_fps;
+        p_data->i_fragment = 0;
+        p_data->p_block = 0;
+    }
+
+
     /* Create the bitmap storage space */
     hbmp = CreateDIBSection( p_data->hdc_dst, &p_data->bmi, DIB_RGB_COLORS,
                              &p_buffer, NULL, 0 );
@@ -242,11 +249,18 @@ block_t *screen_Capture( demux_t *p_demux )
         }
     }
 
-    if( !BitBlt( p_data->hdc_dst, 0, p_data->i_fragment *
-                 p_data->i_fragment_size,
+    if( p_sys->b_follow_mouse )
+    {
+        POINT pos;
+        GetCursorPos( &pos );
+        FollowMouse( p_sys, pos.x, pos.y );
+    }
+
+    if( !BitBlt( p_data->hdc_dst, 0,
+                 p_data->i_fragment * p_data->i_fragment_size,
                  p_sys->fmt.video.i_width, p_data->i_fragment_size,
-                 p_data->hdc_src, 0, p_data->i_fragment *
-                 p_data->i_fragment_size,
+                 p_data->hdc_src, p_sys->i_left, p_sys->i_top +
+                 p_data->i_fragment * p_data->i_fragment_size,
                  IS_WINNT ? SRCCOPY | CAPTUREBLT : SRCCOPY ) )
     {
         msg_Err( p_demux, "error during BitBlt()" );
index c4f9d83..61b4e75 100644 (file)
@@ -1,10 +1,11 @@
 /*****************************************************************************
  * x11.c: Screen capture module.
  *****************************************************************************
- * Copyright (C) 2004 the VideoLAN team
+ * Copyright (C) 2004-2008 the VideoLAN team
  * $Id$
  *
  * Authors: Gildas Bazin <gbazin@videolan.org>
+ *          Antoine Cellerier <dionoea at videolan dot org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -133,16 +134,7 @@ block_t *screen_Capture( demux_t *p_demux )
             &mask ) )
         {
             if( p_sys->b_follow_mouse )
-            {
-                root_x -= p_sys->i_width/2;
-                if( root_x < 0 ) root_x = 0;
-                p_sys->i_left = __MIN( (unsigned int)root_x,
-                                       p_sys->i_screen_width - p_sys->i_width );
-                root_y -= p_sys->i_height/2;
-                if( root_y < 0 ) root_y = 0;
-                p_sys->i_top = __MIN( (unsigned int)root_y,
-                                      p_sys->i_screen_height - p_sys->i_height );
-            }
+                FollowMouse( p_sys, root_x, root_y );
         }
         else
             msg_Dbg( p_demux, "XQueryPointer() failed" );