Changeset 5db972ab2ed21e8f265bdef23304f2435ba3ea7b

Timestamp:

26/01/05 09:18:46 (4 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

Gildas Bazin <gbazin@videolan.org> 1106727526 +0000

git-parent:

[47cc1b226d86c821b6dc16b1a21d715f0d043b77]

git-author:

Gildas Bazin <gbazin@videolan.org> 1106727526 +0000

Message:

* modules/video_output/wingdi.c: improvements + embedded support + GAPI support for WinCE. Needs some more work as well for fullscreen support.

Files:

• modules/video_output/Modules.am (modified) (1 diff)
• modules/video_output/wingdi.c (modified) (30 diffs)

modules/video_output/Modules.am

@@ -7 +7 @@
-SOURCES_svgalib = svgalib.c
-SOURCES_wingdi = wingdi.c
+SOURCES_gapi = wingdi.c
-SOURCES_mga = mga.c
-SOURCES_hd1000v = hd1000v.cpp

modules/video_output/wingdi.c

@@ -6 +6 @@
- *
- * Authors: Samuel Hocevar <sam@zoy.org>
+ *          Gildas Bazin <gbazin@videolan.org>
- *
- * This program is free software; you can redistribute it and/or modify
@@ -31 +32 @@
-#include <vlc/vout.h>
-
+#include <windows.h>
-#define WIN32_LEAN_AND_MEAN
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-#define MAX_DIRECTBUFFERS 10
-
+#ifdef UNDER_CE
+#ifndef WS_OVERLAPPEDWINDOW
+#   define WS_OVERLAPPEDWINDOW 0xcf0000
+#endif
+#ifndef WS_EX_NOPARENTNOTIFY
+#   define WS_EX_NOPARENTNOTIFY 4
+#endif
+#ifndef WS_EX_APPWINDOW
+#define WS_EX_APPWINDOW 0x40000
+#endif
+#define SetWindowLongPtr SetWindowLong
+#define GetWindowLongPtr GetWindowLong
+#define GWLP_USERDATA GWL_USERDATA
+#endif //UNDER_CE
+
+#ifndef WS_NONAVDONEBUTTON
+#define WS_NONAVDONEBUTTON 0
+#endif
-/*****************************************************************************
- * Local prototypes
@@ -46 +108 @@
-static int  Manage    ( vout_thread_t * );
-static void Render    ( vout_thread_t *, picture_t * );
-
+
+
+
+
+
-static void SetPalette( vout_thread_t *, uint16_t *, uint16_t *, uint16_t * );
-
@@ -52 +118 @@
-static long FAR PASCAL WndProc ( HWND, UINT, WPARAM, LPARAM );
-static void InitBuffers        ( vout_thread_t * );
+static void UpdateRects        ( vout_thread_t *, vlc_bool_t );
-
-/*****************************************************************************
@@ -62 +129 @@
-
-    /* Our video output window */
-
+
+
+
-    int  i_depth;
+    HWND                 hparent;             /* Handle of the parent window */
+    WNDPROC              pf_wndproc;             /* Window handling callback */
+    volatile uint16_t    i_changes;     /* changes made to the video display */
+    RECT window_placement;
+
+    /* Window position and size */
+    int          i_window_x;
+    int          i_window_y;
+    int          i_window_width;
+    int          i_window_height;
+    int          render_width;
+    int          render_height;
+
+    /* Coordinates of src and dest images (used when blitting to display) */
+    RECT         rect_src;
+    RECT         rect_src_clipped;
+    RECT         rect_dest;
+    RECT         rect_dest_clipped;
+    RECT         rect_parent;
+    RECT         rect_display;
-
-    /* Our offscreen bitmap and its framebuffer */
@@ -74 +163 @@
-    RGBQUAD    green;
-    RGBQUAD    blue;
+
+    /* WINCE stuff */
+    HWND hMenu;
+    HWND hTaskBar;
+    vlc_bool_t   b_video_display;
+
+#ifdef MODULE_NAME_IS_gapi
+    HINSTANCE  gapi_dll;                    /* handle of the opened gapi dll */
+
+    /* GAPI functions */
+    int (*GXOpenDisplay)( HWND hWnd, DWORD dwFlags );
+    int (*GXCloseDisplay)();
+    void *(*GXBeginDraw)();
+    int (*GXEndDraw)();
+    GXDisplayProperties (*GXGetDisplayProperties)();
+    int (*GXSuspend)();
+    int (*GXResume)();
+#endif
-};
-
+#define GXOpenDisplay p_vout->p_sys->GXOpenDisplay
+#define GXCloseDisplay p_vout->p_sys->GXCloseDisplay
+#define GXBeginDraw p_vout->p_sys->GXBeginDraw
+#define GXEndDraw p_vout->p_sys->GXEndDraw
+#define GXGetDisplayProperties p_vout->p_sys->GXGetDisplayProperties
+#define GXSuspend p_vout->p_sys->GXSuspend
+#define GXResume p_vout->p_sys->GXResume
+
+#define DX_POSITION_CHANGE 0x1000
+
-/*****************************************************************************
- * Module descriptor
- *****************************************************************************/
-vlc_module_begin();
+#ifdef MODULE_NAME_IS_gapi
+    set_description( _("Windows GAPI video output") );
+    set_capability( "video output", 20 );
+#else
-    set_description( _("Windows GDI video output") );
-    set_capability( "video output", 10 );
+#endif
-    set_callbacks( OpenVideo, CloseVideo );
-vlc_module_end();
@@ -93 +215 @@
-    vlc_value_t val;
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    if( !p_vout->p_sys->p_event )
-    {
@@ -109 +268 @@
-    val.p_address = (void *)p_vout;
-    var_Set( p_vout->p_sys->p_event, "p_vout", val );
+
+    SetRectEmpty( &p_vout->p_sys->rect_display );
+    SetRectEmpty( &p_vout->p_sys->rect_parent );
+
+    if( vlc_thread_create( p_vout->p_sys->p_event, "GDI Event Thread",
+                           EventThread, 0, 1 ) )
+    {
+        msg_Err( p_vout, "cannot spawn EventThread" );
+        return VLC_ETHREAD;
+    }
-
-    p_vout->pf_init = Init;
@@ -114 +283 @@
-    p_vout->pf_manage = Manage;
-    p_vout->pf_render = Render;
-
+
+
+
+
+
+
-
-    return VLC_SUCCESS;
@@ -125 +299 @@
-{
-    vout_thread_t * p_vout = (vout_thread_t *)p_this;
+
+#ifdef MODULE_NAME_IS_gapi
+    GXCloseDisplay();
+    FreeLibrary( p_vout->p_sys->gapi_dll );
+#endif
+
+    p_vout->p_sys->p_event->b_die = VLC_TRUE;
+    PostMessage( p_vout->p_sys->hwnd, WM_NULL, 0, 0 );
+    vlc_thread_join( p_vout->p_sys->p_event );
-
-    var_Destroy( p_vout->p_sys->p_event, "p_vout" );
@@ -139 +322 @@
-    picture_t *p_pic;
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-    I_OUTPUTPICTURES = 0;
@@ -151 +335 @@
-    switch( p_vout->p_sys->i_depth )
-    {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    p_vout->output.i_width  = p_vout->render.i_width;
-    p_vout->output.i_height = p_vout->render.i_height;
+#endif
-    p_vout->output.i_aspect = p_vout->render.i_aspect;
-
@@ -196 +395 @@
-
-        /* Allocate the picture */
-
-
-
-
-
-
+
+
+
+
-                              p_vout->output.i_width, p_vout->output.i_height,
-                              p_vout->output.i_aspect );
-
-
-
-
-
+
-
-        p_pic->i_status = DESTROYED_PICTURE;
@@ -234 +428 @@
-        free( PP_OUTPUTPICTURE[ i_index ]->p_data_orig );
-    }
-
-    p_vout->p_sys->p_event->b_die = VLC_TRUE;
-    PostMessage( p_vout->p_sys->window, WM_NULL, 0, 0 );
-    vlc_thread_join( p_vout->p_sys->p_event );
-}
-
@@ -248 +438 @@
-static int Manage( vout_thread_t *p_vout )
-{
+#ifndef UNDER_CE
+    WINDOWPLACEMENT window_placement;
+#endif
+
+    /* If we do not control our window, we check for geometry changes
+     * ourselves because the parent might not send us its events. */
+    if( p_vout->p_sys->hparent && !p_vout->b_fullscreen )
+    {
+        RECT rect_parent;
+        POINT point;
+
+        GetClientRect( p_vout->p_sys->hparent, &rect_parent );
+        point.x = point.y = 0;
+        ClientToScreen( p_vout->p_sys->hparent, &point );
+        OffsetRect( &rect_parent, point.x, point.y );
+
+        if( !EqualRect( &rect_parent, &p_vout->p_sys->rect_parent ) )
+        {
+            int i_x, i_y, i_width, i_height;
+            p_vout->p_sys->rect_parent = rect_parent;
+
+            /* This one is to force the update even if only
+             * the position has changed */
+            SetWindowPos( p_vout->p_sys->hwnd, 0, 1, 1,
+                          rect_parent.right - rect_parent.left,
+                          rect_parent.bottom - rect_parent.top, 0 );
+
+            SetWindowPos( p_vout->p_sys->hwnd, 0, 0, 0,
+                          rect_parent.right - rect_parent.left,
+                          rect_parent.bottom - rect_parent.top, 0 );
+
+            vout_PlacePicture( p_vout, rect_parent.right - rect_parent.left,
+                               rect_parent.bottom - rect_parent.top,
+                               &i_x, &i_y, &i_width, &i_height );
+
+            SetWindowPos( p_vout->p_sys->hvideownd, HWND_TOP,
+                          i_x, i_y, i_width, i_height, 0 );
+        }
+    }
+
+    /* We used to call the Win32 PeekMessage function here to read the window
+     * messages. But since window can stay blocked into this function for a
+     * long time (for example when you move your window on the screen), I
+     * decided to isolate PeekMessage in another thread. */
+
+    /*
+     * Fullscreen change
+     */
+    if( p_vout->i_changes & VOUT_FULLSCREEN_CHANGE
+        || p_vout->p_sys->i_changes & VOUT_FULLSCREEN_CHANGE )
+    {
+        int i_style = 0;
+        vlc_value_t val;
+
+        HWND hwnd = (p_vout->p_sys->hparent && p_vout->p_sys->hfswnd) ?
+            p_vout->p_sys->hfswnd : p_vout->p_sys->hwnd;
+
+        p_vout->b_fullscreen = ! p_vout->b_fullscreen;
+
+        /* We need to switch between Maximized and Normal sized window */
+#ifndef UNDER_CE
+        window_placement.length = sizeof(WINDOWPLACEMENT);
+        GetWindowPlacement( hwnd, &window_placement );
+#endif
+        if( p_vout->b_fullscreen )
+        {
+#ifndef UNDER_CE
+            /* Change window style, no borders and no title bar */
+            int i_style = WS_CLIPCHILDREN | WS_VISIBLE;
+            SetWindowLong( hwnd, GWL_STYLE, i_style );
+
+            if( p_vout->p_sys->hparent )
+            {
+                /* Retrieve current window position so fullscreen will happen
+                 * on the right screen */
+                POINT point = {0,0};
+                RECT rect;
+                ClientToScreen( p_vout->p_sys->hwnd, &point );
+                GetClientRect( p_vout->p_sys->hwnd, &rect );
+                SetWindowPos( hwnd, 0, point.x, point.y,
+                              rect.right, rect.bottom,
+                              SWP_NOZORDER|SWP_FRAMECHANGED );
+                GetWindowPlacement( hwnd, &window_placement );
+            }
+
+            /* Maximize window */
+            window_placement.showCmd = SW_SHOWMAXIMIZED;
+            SetWindowPlacement( hwnd, &window_placement );
+            SetWindowPos( hwnd, 0, 0, 0, 0, 0,
+                          SWP_NOMOVE|SWP_NOSIZE|SWP_NOZORDER|SWP_FRAMECHANGED);
+#endif
+
+            if( p_vout->p_sys->hparent )
+            {
+                RECT rect;
+                GetClientRect( hwnd, &rect );
+                SetParent( p_vout->p_sys->hwnd, hwnd );
+                SetWindowPos( p_vout->p_sys->hwnd, 0, 0, 0,
+                              rect.right, rect.bottom,
+                              SWP_NOZORDER|SWP_FRAMECHANGED );
+            }
+
+            ShowWindow( hwnd, SW_SHOW );
+            SetForegroundWindow( hwnd );
+        }
+        else
+        {
+            /* Change window style, no borders and no title bar */
+            //SetWindowLong( hwnd, GWL_STYLE, p_vout->p_sys->i_window_style );
+
+#ifndef UNDER_CE
+            /* Normal window */
+            window_placement.showCmd = SW_SHOWNORMAL;
+            SetWindowPlacement( hwnd, &window_placement );
+            SetWindowPos( hwnd, 0, 0, 0, 0, 0,
+                          SWP_NOMOVE|SWP_NOSIZE|SWP_NOZORDER|SWP_FRAMECHANGED);
+#endif
+
+            if( p_vout->p_sys->hparent )
+            {
+                RECT rect;
+                GetClientRect( p_vout->p_sys->hparent, &rect );
+                SetParent( p_vout->p_sys->hwnd, p_vout->p_sys->hparent );
+                SetWindowPos( p_vout->p_sys->hwnd, 0, 0, 0,
+                              rect.right, rect.bottom,
+                              SWP_NOZORDER|SWP_FRAMECHANGED );
+
+                ShowWindow( hwnd, SW_HIDE );
+                SetForegroundWindow( p_vout->p_sys->hparent );
+            }
+
+            /* Make sure the mouse cursor is displayed */
+            //PostMessage( p_vout->p_sys->hwnd, WM_VLC_SHOW_MOUSE, 0, 0 );
+        }
+
+#ifdef MODULE_NAME_IS_gapi
+        GXCloseDisplay();
+#endif
+
+        /* Change window style, borders and title bar */
+        ShowWindow( p_vout->p_sys->hwnd, SW_SHOW );
+        UpdateWindow( p_vout->p_sys->hwnd );
+
+#ifdef MODULE_NAME_IS_gapi
+        GXOpenDisplay( p_vout->p_sys->hvideownd, GX_FULLSCREEN );
+#endif
+
+        /* Update the object variable and trigger callback */
+        val.b_bool = p_vout->b_fullscreen;
+        var_Set( p_vout, "fullscreen", val );
+
+        p_vout->i_changes &= ~VOUT_FULLSCREEN_CHANGE;
+        p_vout->p_sys->i_changes &= ~VOUT_FULLSCREEN_CHANGE;
+    }
+
-    return VLC_SUCCESS;
-}
@@ -262 +607 @@
- * Display: displays previously rendered output
- *****************************************************************************/
-
-
-
-
+
+
+
+
+
+
+
+
+
-    int i_src_bytes, i_dest_bytes;
-
-
-
-
+
+
+
+
+
+
+
-    /* Stupid GDI is upside-down */
-visible_
+
-    i_dest_bytes = 0;
-
@@ -279 +632 @@
-        i_src_bytes -= p_pic->p->i_pitch;
-
-vout->p_
+
-                                  p_pic->p->p_pixels + i_src_bytes,
-                                  p_pic->p->i_visible_pitch );
@@ -285 +638 @@
-        i_dest_bytes += p_pic->p->i_pitch;
-    }
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-/*****************************************************************************
- * SetPalette: sets an 8 bpp palette
@@ -306 +767 @@
-static void EventThread ( vlc_object_t *p_event )
-{
- 
-  
-
-HINSTANCE  instanc
+
+
+
+int        i_styl
-    WNDCLASS   wc;
-    MSG        msg;
-
-#ifdef UNDER_CE
-    wchar_t *psz_class = L"VOUT";
-    wchar_t *psz_title = L"Video Output";
-#else
-    char *psz_class = "VOUT";
-    char *psz_title = "Video Output";
-#endif
-
-    var_Get( p_event, "p_vout", &val );
-    p_vout = (vout_thread_t *)val.p_address;
-
-    instance = GetModuleHandle( NULL );
-
-    /* Register window class */
@@ -332 +783 @@
-    wc.cbClsExtra     = 0;
-    wc.cbWndExtra     = 0;
-instance
+GetModuleHandle(NULL)
-    wc.hIcon          = 0;
-0
+LoadCursor(NULL, IDC_ARROW)
-    wc.hbrBackground  = (HBRUSH)GetStockObject( BLACK_BRUSH );
-    wc.lpszMenuName   = 0;
-
-
+
-    RegisterClass( &wc );
-
+    /* Register the video sub-window class */
+    wc.lpszClassName = _T("VLC WinGDI video"); wc.hIcon = 0;
+    RegisterClass(&wc);
+
-    /* Create output window */
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    /* Initialize offscreen buffer */
@@ -356 +871 @@
-    vlc_thread_ready( p_event );
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-        switch( msg.message )
@@ -390 +898 @@
-            break;
-
+#ifdef MODULE_NAME_IS_gapi
+        case WM_KILLFOCUS:
+            GXSuspend();
+            break;
+
+        case WM_SETFOCUS:
+            GXResume();
+            break;
+#endif
+
-        default:
-            TranslateMessage( &msg );
@@ -397 +915 @@
-    }
-
-
+
+
+
+
+
+
+
-
-    DeleteDC( p_vout->p_sys->off_dc );
@@ -404 +928 @@
-
-/*****************************************************************************
+ * UpdateRects: update clipping rectangles
+ *****************************************************************************
+ * This function is called when the window position or size are changed, and
+ * its job is to update the source and destination RECTs used to display the
+ * picture.
+ *****************************************************************************/
+static void UpdateRects( vout_thread_t *p_vout, vlc_bool_t b_force )
+{
+#define rect_src p_vout->p_sys->rect_src
+#define rect_src_clipped p_vout->p_sys->rect_src_clipped
+#define rect_dest p_vout->p_sys->rect_dest
+#define rect_dest_clipped p_vout->p_sys->rect_dest_clipped
+
+    int i_width, i_height, i_x, i_y;
+
+    RECT  rect;
+    POINT point;
+
+    /* Retrieve the window size */
+    GetClientRect( p_vout->p_sys->hwnd, &rect );
+
+    /* Retrieve the window position */
+    point.x = point.y = 0;
+    ClientToScreen( p_vout->p_sys->hwnd, &point );
+
+    /* If nothing changed, we can return */
+    if( !b_force
+         && p_vout->p_sys->i_window_width == rect.right
+         && p_vout->p_sys->i_window_height == rect.bottom
+         && p_vout->p_sys->i_window_x == point.x
+         && p_vout->p_sys->i_window_y == point.y )
+    {
+        return;
+    }
+
+    /* Update the window position and size */
+    p_vout->p_sys->i_window_x = point.x;
+    p_vout->p_sys->i_window_y = point.y;
+    p_vout->p_sys->i_window_width = rect.right;
+    p_vout->p_sys->i_window_height = rect.bottom;
+
+    vout_PlacePicture( p_vout, rect.right, rect.bottom,
+                       &i_x, &i_y, &i_width, &i_height );
+
+    if( p_vout->p_sys->hvideownd )
+        SetWindowPos( p_vout->p_sys->hvideownd, HWND_TOP,
+                      i_x, i_y, i_width, i_height, 0 );
+
+    /* Destination image position and dimensions */
+    rect_dest.left = point.x + i_x;
+    rect_dest.right = rect_dest.left + i_width;
+    rect_dest.top = point.y + i_y;
+    rect_dest.bottom = rect_dest.top + i_height;
+
+    /* Clip the destination window */
+    if( !IntersectRect( &rect_dest_clipped, &rect_dest,
+                        &p_vout->p_sys->rect_display ) )
+    {
+        SetRectEmpty( &rect_src_clipped );
+        return;
+    }
+
+#if 0
+    msg_Dbg( p_vout, "image_dst_clipped coords: %i,%i,%i,%i",
+                     rect_dest_clipped.left, rect_dest_clipped.top,
+                     rect_dest_clipped.right, rect_dest_clipped.bottom );
+#endif
+
+    /* the 2 following lines are to fix a bug when clicking on the desktop */
+    if( (rect_dest_clipped.right - rect_dest_clipped.left)==0 ||
+        (rect_dest_clipped.bottom - rect_dest_clipped.top)==0 )
+    {
+        SetRectEmpty( &rect_src_clipped );
+        return;
+    }
+
+    /* src image dimensions */
+    rect_src.left = 0;
+    rect_src.top = 0;
+    rect_src.right = p_vout->output.i_width;
+    rect_src.bottom = p_vout->output.i_height;
+
+    /* Clip the source image */
+    rect_src_clipped.left = (rect_dest_clipped.left - rect_dest.left) *
+      p_vout->output.i_width / (rect_dest.right - rect_dest.left);
+    rect_src_clipped.right = p_vout->output.i_width -
+      (rect_dest.right - rect_dest_clipped.right) * p_vout->output.i_width /
+      (rect_dest.right - rect_dest.left);
+    rect_src_clipped.top = (rect_dest_clipped.top - rect_dest.top) *
+      p_vout->output.i_height / (rect_dest.bottom - rect_dest.top);
+    rect_src_clipped.bottom = p_vout->output.i_height -
+      (rect_dest.bottom - rect_dest_clipped.bottom) * p_vout->output.i_height /
+      (rect_dest.bottom - rect_dest.top);
+
+#if 0
+    msg_Dbg( p_vout, "image_src_clipped coords: %i,%i,%i,%i",
+                     rect_src_clipped.left, rect_src_clipped.top,
+                    &nb