Changeset 4994baa7237b561a0f9259c606332baea2383ea1

Timestamp:

22/07/04 00:38:49 (4 years ago)

Author:

Cyril Deguet <asmax@videolan.org>

git-committer:

Cyril Deguet <asmax@videolan.org> 1090449529 +0000

git-parent:

[42d17b9d6a9abb8bdfc306e868f29692da3e8f8c]

git-author:

Cyril Deguet <asmax@videolan.org> 1090449529 +0000

Message:

• all: created a new module type "opengl provider", which provides a
  simple interface to create and use OpenGL windows
  
• modules/video_output/x11/glx.c: the GLX vout now implements the
  "opengl provider" interface
  
• modules/visualization/galaktos/*: no more dependency on GLX: we use
  the generic opengl provider interface instead.
  

Files:

• include/vlc_common.h (modified) (1 diff)
• include/vlc_objects.h (modified) (1 diff)
• include/vlc_opengl.h (added)
• modules/video_output/x11/glx.c (modified) (33 diffs)
• modules/visualization/galaktos/Modules.am (modified) (1 diff)
• modules/visualization/galaktos/glx.c (deleted)
• modules/visualization/galaktos/glx.h (deleted)
• modules/visualization/galaktos/main.c (modified) (2 diffs)
• modules/visualization/galaktos/plugin.c (modified) (8 diffs)
• modules/visualization/galaktos/plugin.h (modified) (1 diff)
• src/misc/objects.c (modified) (2 diffs)

include/vlc_common.h

@@ -340 +340 @@
-typedef struct httpd_redirect_t httpd_redirect_t;
-typedef struct httpd_stream_t httpd_stream_t;
+
+/* opengl */
+typedef struct opengl_t     opengl_t;
+typedef struct opengl_sys_t opengl_sys_t;
-
-/* divers */

include/vlc_objects.h

@@ -53 +53 @@
-#define VLC_OBJECT_ACCESS     (-19)
-#define VLC_OBJECT_STREAM     (-20)
+#define VLC_OBJECT_OPENGL     (-21)
-
-#define VLC_OBJECT_GENERIC  (-666)

modules/video_output/x11/glx.c

@@ -33 +33 @@
-#include <vlc/vout.h>
-
+/* For the opengl provider interface */
+#include "vlc_opengl.h"
+
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <GL/glx.h>
-
+
+/* Data common to vout and opengl provider structures */
+typedef struct glx_t
+{
+    Display     *p_display;
+    int         b_glx13;
+    int         i_width;
+    int         i_height;
+    int         b_fullscreen;
+    GLXContext  gwctx;
+    Window      wnd;
+    GLXWindow   gwnd;
+    Atom        wm_delete;
+} glx_t;
+
+
+/*****************************************************************************
+ * Vout interface
+ *****************************************************************************/
+static int  CreateVout   ( vlc_object_t * );
+static void DestroyVout  ( vlc_object_t * );
+static int  Init         ( vout_thread_t * );
+static void End          ( vout_thread_t * );
+static int  Manage       ( vout_thread_t * );
+static void Render       ( vout_thread_t *p_vout, picture_t *p_pic );
+static void DisplayVideo ( vout_thread_t *, picture_t * );
+
+/*****************************************************************************
+ * OpenGL providerinterface
+ *****************************************************************************/
+static int  CreateOpenGL ( vlc_object_t * );
+static void DestroyOpenGL( vlc_object_t * );
+static int  InitOpenGL   ( opengl_t *, int, int );
+static void SwapBuffers  ( opengl_t * );
+static int  HandleEvents ( opengl_t * );
+
-/*****************************************************************************
- * Local prototypes
- *****************************************************************************/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-static inline int GetAlignedSize( int i_size );
@@ -65 +96 @@
-    set_capability( "video output", 20 );
-    add_shortcut( "glx" );
-
+
+
+
+
+
+
-vlc_module_end();
+
-
-/*****************************************************************************
@@ -78 +115 @@
-    uint8_t     *p_buffer;
-    int         i_index;
-
-    int         i_tex_width;
-    int         i_tex_height;
-
-    int         i_width;
-    int         i_height;
-    int         b_fullscreen;
-
-    Display     *p_display;
-    int         b_glx13;
-    GLXContext  gwctx;
-    Window      wnd;
-    GLXWindow   gwnd;
-    Atom        wm_delete;
-
-    GLuint      texture;
-
-    int         i_effect; //XXX
+
+    glx_t       glx;
-};
+
+struct opengl_sys_t
+{
+    glx_t       glx;
+};
+
-
-#define MWM_HINTS_DECORATIONS   (1L << 1)
@@ -111 +142 @@
-
-/*****************************************************************************
-
+Vout
- *****************************************************************************
- * This function allocates and initializes a GLX vout method.
- *****************************************************************************/
-
+Vout
-{
-    vout_thread_t *p_vout = (vout_thread_t *)p_this;
@@ -130 +161 @@
-    p_vout->p_sys->i_effect = 1;
-
-
-
-
-
-
+glx.
+glx.
+glx.
+glx.
+glx.
-
-    /* A texture must have a size aligned on a power of 2 */
@@ -144 +175 @@
-
-    /* Open and initialize device */
-vout
+this, &p_vout->p_sys->glx
-    {
-        msg_Err( p_vout, "cannot open display" );
@@ -201 +232 @@
-    p_pic->i_planes = 1;
-
+    p_vout->p_sys->p_buffer =
+        malloc( p_vout->p_sys->i_tex_width * p_vout->p_sys->i_tex_height * 4 );
+    if( !p_vout->p_sys->p_buffer )
+    {
+        msg_Err( p_vout, "Out of memory" );
+        return -1;
+    }
-
-    p_pic->p->p_pixels = p_vout->p_sys->p_buffer
@@ -218 +256 @@
-    I_OUTPUTPICTURES = 1;
-
-p_vout
+&p_vout->p_sys->glx
-
-    /* Set the texture parameters */
@@ -227 +265 @@
-    {
-        glEnable( GL_CULL_FACE);
-        /*
+/*        
-        glEnable( GL_BLEND );
-        glBlendFunc( GL_SRC_ALPHA, GL_ONE );*/
@@ -254 +292 @@
- * Destroy: destroy GLX video thread output method
- *****************************************************************************
-
-
-
+Vout
+
+Vout
-{
-    vout_thread_t *p_vout = (vout_thread_t *)p_this;
-
-p_vout
+&p_vout->p_sys->glx
-
-    /* Free the texture buffer*/
@@ -270 +308 @@
-    free( p_vout->p_sys );
-}
+
+
+/*****************************************************************************
+ * CreateOpenGL: initialize an OpenGL provider
+ *****************************************************************************/
+static int CreateOpenGL( vlc_object_t *p_this )
+{
+    opengl_t *p_opengl = (opengl_t*)p_this;
+
+    /* Allocate the structure */
+    p_opengl->p_sys = malloc(sizeof(opengl_sys_t));
+
+    /* Set the function pointers */
+    p_opengl->pf_init = InitOpenGL;
+    p_opengl->pf_swap = SwapBuffers;
+    p_opengl->pf_handle_events = HandleEvents;
+
+    p_opengl->p_sys->glx.wnd = None;
+
+    return VLC_SUCCESS;
+}
+
+
+/*****************************************************************************
+ * DestroyOpenGL: destroys an OpenGL provider
+ *****************************************************************************/
+static void DestroyOpenGL( vlc_object_t *p_this )
+{
+    opengl_t *p_opengl = (opengl_t*)p_this;
+
+    /* Free the structure */
+    free(p_opengl->p_sys);
+}
+
+/*****************************************************************************
+ * InitOpenGL: creates the OpenGL window
+ *****************************************************************************/
+static int InitOpenGL( opengl_t *p_opengl, int i_width, int i_height )
+{
+    p_opengl->p_sys->glx.i_width = i_width;
+    p_opengl->p_sys->glx.i_height = i_height;
+    p_opengl->p_sys->glx.b_fullscreen = 0;
+
+    if( OpenDisplay( (vlc_object_t*)p_opengl, &p_opengl->p_sys->glx ) )
+    {
+        msg_Err( p_opengl, "Cannot create OpenGL window" );
+        return VLC_EGENERIC;
+    }
+
+    /* Set the OpenGL context _for the current thread_ */
+    SwitchContext( &p_opengl->p_sys->glx );
+
+    return VLC_SUCCESS;
+}
+
+
+/*****************************************************************************
+ * SwapBuffers: swap front/back buffers
+ *****************************************************************************/
+static void SwapBuffers( opengl_t *p_opengl )
+{
+    if( p_opengl->p_sys->glx.b_glx13 )
+    {
+        glXSwapBuffers( p_opengl->p_sys->glx.p_display,
+                        p_opengl->p_sys->glx.gwnd );
+    }
+    else
+    {
+        glXSwapBuffers( p_opengl->p_sys->glx.p_display,
+                        p_opengl->p_sys->glx.wnd );
+    }
+}
+
+
+/*****************************************************************************
+ * HandleEvents: handle window events
+ *****************************************************************************/
+static int HandleEvents( opengl_t *p_opengl )
+{
+    int i_ret =
+        HandleX11Events( (vlc_object_t*)p_opengl, &p_opengl->p_sys->glx );
+    if( i_ret )
+    {
+        /* close the window */
+        CloseDisplay( &p_opengl->p_sys->glx );
+    }
+    return i_ret;
+}
+
-
-/*****************************************************************************
@@ -279 +406 @@
-static int Manage( vout_thread_t *p_vout )
-{
+    if( HandleX11Events( (vlc_object_t*)p_vout, &p_vout->p_sys->glx ) )
+    {
+        /* the user wants to close the window */
+        playlist_t * p_playlist =
+            (playlist_t *)vlc_object_find( p_vout, VLC_OBJECT_PLAYLIST,
+                                           FIND_ANYWHERE );
+        if( p_playlist != NULL )
+        {
+            playlist_Stop( p_playlist );
+            vlc_object_release( p_playlist );
+        }
+    }
+    return 0;
+}
+
+
+static int HandleX11Events( vlc_object_t *p_thread, glx_t *p_glx )
+{
-    Display *p_display;
-
-vout->p_sys
+glx
-
-    /* loop on X11 events */
@@ -294 +439 @@
-                /* Delete notification */
-                if( (evt.xclient.format == 32) &&
-
+
+
-                {
-
-
-
-
-
-
-
-
-
+
-                }
-                break;
@@ -312 +450 @@
-    return 0;
-}
+
-
-/*****************************************************************************
@@ -422 +561 @@
-    }
-    glDisable( GL_TEXTURE_2D);
-
-
-
+
+
-
-/*****************************************************************************
@@ -431 +569 @@
-static void DisplayVideo( vout_thread_t *p_vout, picture_t *p_pic )
-{
-
-
-
+
+
+
+
-    }
-    else
-    {
-
-
-
-
-
-
+
+
+
+
+
-
-/*****************************************************************************
- * OpenDisplay: open and initialize OpenGL device
- *****************************************************************************/
-
-
+
-{
-    Display *p_display;
@@ -455 +592 @@
-
-    /* Open the display */
-vout->p_sys
+glx
-    if( !p_display )
-    {
-vout
+thread
-        return -1;
-    }
@@ -465 +602 @@
-    if( !XQueryExtension( p_display, "GLX", &i_opcode, &i_evt, &i_err ) )
-    {
-vout
+thread
-        return -1;
-    }
-    if( !glXQueryExtension( p_display, &i_err, &i_evt ) )
-    {
-vout
+thread
-        return -1;
-    }
@@ -477 +614 @@
-    if (!glXQueryVersion( p_display, &i_maj, &i_min ) )
-    {
-vout
+thread
-        return -1;
-    }
-    if( i_maj <= 0 || ((i_maj == 1) && (i_min < 3)) )
-    {
-vout->p_sys
-vout
-vout
+glx
+thread
+thread, p_glx
-        {
-            return -1;
@@ -491 +628 @@
-    else
-    {
-vout->p_sys
-vout
-vout
+glx
+thread
+thread, p_glx
-        {
-            return -1;
@@ -499 +636 @@
-    }
-
-vout->p_sys
-vout->p_sys
+glx
+glx
-    {
-        //XXX
-vout->p_sys
+glx
-    }
-    XFlush( p_display );
-
-    /* Allocate the texture buffer */
-    p_vout->p_sys->p_buffer =
-        malloc( p_vout->p_sys->i_tex_width * p_vout->p_sys->i_tex_height * 4 );
-    if( !p_vout->p_sys->p_buffer )
-    {
-        msg_Err( p_vout, "Out of memory" );
-        return -1;
-    }
-    return 0;
-}
@@ -524 +652 @@
- * state of the device.
- *****************************************************************************/
-vout_thread_t *p_vout
+glx_t *p_glx
-{
-    Display *p_display;
-
+    if (p_glx->wnd == None )
+    {
+        // Already closed or not opened...
+        return;
+    }
+
-    glFlush();
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-{
-    Display *p_display;
@@ -551 +683 @@
-                     0 };
-
-vout->p_sys
+glx
-
-    p_vi = glXChooseVisual( p_display, DefaultScreen( p_display), p_attr );
-    if(! p_vi )
-    {
-vout
+thread
-        return -1;
-    }
-
-    /* Create the window */
-vout
+thread, p_glx
-
-     /* Create an OpenGL context */
-vout->p_sys
+glx
-    if( !gwctx )
-    {
-vout
+thread
-        XFree( p_vi );
-        return -1;
@@ -577 +709 @@
-
-
-out_thread_t *p_vout
+lc_object_t *p_thread, glx_t *p_glx
-{
-    Display *p_display;
@@ -588 +720 @@
-                     GLX_DRAWABLE_TYPE, GLX_WINDOW_BIT, 0 };
-
-vout->p_sys
+glx
-
-    /* Get the FB configuration */
@@ -594 +726 @@
-    if( (i_nbelem <= 0) || !p_fbconfs )
-    {
-vout
+thread
-        if( p_fbconfs )
-        {
@@ -607 +739 @@
-    if( !p_vi )
-    {
-vout
+thread
-        XFree( p_fbconfs );
-        return -1;
@@ -613 +745 @@
-
-    /* Create the window */
-vout
+thread, p_glx
-
-    XFree( p_vi );
-
-    /* Create the GLX window */
-vout->p_sys->gwnd = glXCreateWindow( p_display, fbconf, p_vout->p_sys
-vout->p_sys
-
-vout
+glx->gwnd = glXCreateWindow( p_display, fbconf, p_glx
+glx
+
+thread
-        return -1;
-    }
-
-    /* Create an OpenGL context */
-vout->p_sys
+glx
-                                                  GLX_RGBA_TYPE, NULL, True );
-    if( !gwctx )
-    {
-vout
+thread
-        XFree( p_fbconfs );
-        return -1;
@@ -640 +772 @@
-
-
-
-
+
-{
-    Display *p_display;
@@ -651 +782 @@
-    mwmhints_t mwmhints;
-
-vout->p_sys
+glx
-
-    /* Create a colormap */
@@ -661 +792 @@
-    xattr.border_pixel = 0;
-    xattr.colormap = cm;
-vout->p_sys
-vout->p_sys->i_width, p_vout->p_sys
+glx
+glx->i_width, p_glx
-            InputOutput, p_vi->visual,
-            CWBackPixel | CWBorderPixel | CWColormap, &xattr);
-
-    /* Allow the window to be deleted by the window manager */
-vout->p_sys
-vout->p_sys
-
-vout->p_sys
+glx
+glx
+
+glx
-    {
-        mwmhints.flags = MWM_HINTS_DECORATIONS;
@@ -684 +815 @@
-        p_size_hints = XAllocSizeHints();
-        p_size_hints->flags = PMinSize | PMaxSize;
-vout->p_sys
-vout->p_sys
-vout->p_sys
-vout->p_sys
+glx
+glx
+glx
+glx
-        XSetWMNormalHints( p_display, wnd, p_size_hints );
-        XFree( p_size_hints );
@@ -695 +826 @@
-
-
-vout_thread_t *p_vout
+glx_t *p_glx
-{
-    /* Change the current OpenGL context */
-vout->p_sys
-
-vout->p_sys->p_display, p_vout->p_sys
-vout->p_sys->gwnd, p_vout->p_sys
+glx
+
+glx->p_display, p_glx
+glx->gwnd, p_glx
-    }
-    else
-    {
-vout->p_sys->p_display, p_vout->p_sys
-vout->p_sys
+glx->p_display, p_glx
+glx
-    }
-}

modules/visualization/galaktos/Modules.am

@@ -1 +1 @@
-SOURCES_galaktos = plugin.c \
-                   plugin.h \
-                   glx.c \
-                   glx.h \
-                   main.c \
-                   main.h \

modules/visualization/galaktos/main.c

@@ -23 +23 @@
- *****************************************************************************/
-
-
+
+
-#include <GL/gl.h>
-#include <GL/glu.h>
@@ -270 +271 @@
-    glFlush();
-    //  printf("Flush %d\n",(SDL_GetTicks()-timestart));
-galaktos_glx_swap( p_thread
-
-X11 
-galaktos_glx_handle_events( p_thread ) == 1
+(p_thread->p_opengl->pf_swap)( p_thread->p_opengl
+
+
+(p_thread->p_opengl->pf_handle_events)( p_thread->p_opengl )
-    {
-        return 1;

modules/visualization/galaktos/plugin.c

@@ -30 +30 @@
-
-#include "plugin.h"
-#include "glx.h"
-#include "main.h"
-#include "PCM.h"
@@ -39 +38 @@
-#include <vlc/vout.h>
-#include "aout_internal.h"
+#include "vlc_opengl.h"
-
-/*****************************************************************************
@@ -79 +79 @@
-    aout_filter_t     *p_filter = (aout_filter_t *)p_this;
-    aout_filter_sys_t *p_sys;
-    
+
-    vlc_value_t       width, height;
-
@@ -104 +104 @@
-        vlc_object_create( p_filter, sizeof( galaktos_thread_t ) );
-    vlc_object_attach( p_thread, p_this );
+
+    /* Get on OpenGL provider */
+    p_thread->p_opengl =
+        (opengl_t *)vlc_object_create( p_this, VLC_OBJECT_OPENGL );
+    if( p_thread->p_opengl == NULL )
+    {
+        msg_Err( p_filter, "out of memory" );
+        return VLC_ENOMEM;
+    }
+
+    p_thread->p_module =
+        module_Need( p_thread->p_opengl, "opengl provider", NULL, 0 );
+    if( p_thread->p_module == NULL )
+    {
+        msg_Err( p_filter, "No OpenGL provider found" );
+        vlc_object_destroy( p_thread->p_opengl );
+        p_thread->p_opengl = NULL;
+        return VLC_ENOOBJ;
+    }
-
-/*
@@ -117 +136 @@
-    p_thread->i_height = 600;
-    p_thread->b_fullscreen = 0;
-    galaktos_glx_init( p_thread );
-    galaktos_init( p_thread );
-
@@ -204 +222 @@
-    int mspf=0;
-
-
+
+
+
+
-    setup_opengl( p_thread->i_width, p_thread->i_height );
-    CreateRenderTarget(512, &RenderTargetTextureID, NULL);
@@ -236 +257 @@
-        timestart=mdate()/1000;
-    }
-
-    galaktos_glx_done( p_thread );
-}
-
@@ -254 +273 @@
-
-    vlc_thread_join( p_sys->p_thread );
+
+    /* Free the openGL provider */
+    module_Unneed( p_sys->p_thread->p_opengl, p_sys->p_thread->p_module );
+    vlc_object_destroy( p_sys->p_thread->p_opengl );
-
-    /* Free data */

modules/visualization/galaktos/plugin.h

@@ -36 +36 @@
-    char          *psz_title;
-
+    /* OpenGL provider */
+    opengl_t      *p_opengl;
+    module_t      *p_module;
+
-    /* Window properties */
-    int           i_width;

src/misc/objects.c

@@ -49 +49 @@
-#include "vlc_codec.h"
-
+#include "vlc_opengl.h"
+
-#include "vlc_httpd.h"
-#include "vlc_vlm.h"
@@ -170 +172 @@
-            psz_type = "vlm dameon";
-            break;
+        case VLC_OBJECT_OPENGL:
+            i_size = sizeof( opengl_t );
+            psz_type = "opengl provider";
+            break;
-        case VLC_OBJECT_ANNOUNCE:
-            i_size = sizeof( announce_handler_t );