Commit 4994baa7 authored by Cyril Deguet's avatar Cyril Deguet

* 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.
parent 42d17b9d
...@@ -340,6 +340,10 @@ typedef int (*httpd_file_callback_t)( httpd_file_sys_t*, httpd_file_t *, uint8_t ...@@ -340,6 +340,10 @@ typedef int (*httpd_file_callback_t)( httpd_file_sys_t*, httpd_file_t *, uint8_t
typedef struct httpd_redirect_t httpd_redirect_t; typedef struct httpd_redirect_t httpd_redirect_t;
typedef struct httpd_stream_t httpd_stream_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 */ /* divers */
typedef struct vlc_meta_t vlc_meta_t; typedef struct vlc_meta_t vlc_meta_t;
......
...@@ -52,6 +52,7 @@ ...@@ -52,6 +52,7 @@
#define VLC_OBJECT_DEMUX (-18) #define VLC_OBJECT_DEMUX (-18)
#define VLC_OBJECT_ACCESS (-19) #define VLC_OBJECT_ACCESS (-19)
#define VLC_OBJECT_STREAM (-20) #define VLC_OBJECT_STREAM (-20)
#define VLC_OBJECT_OPENGL (-21)
#define VLC_OBJECT_GENERIC (-666) #define VLC_OBJECT_GENERIC (-666)
......
/***************************************************************************** /*****************************************************************************
* plugin.h: * vlc_opengl.h: OpenGL provider interface
***************************************************************************** *****************************************************************************
* Copyright (C) 2004 VideoLAN * Copyright (C) 2004 VideoLAN
* $Id$ * $Id$
* *
* Authors: Cyril Deguet <asmax@videolan.org> * Authors: Cyril Deguet <asmax@videolan.org>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
...@@ -21,33 +21,28 @@ ...@@ -21,33 +21,28 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef _GALAKTOS_GLX_H_ #ifndef _VLC_OPENGL_H
#define _GALAKTOS_GLX_H_ #define _VLC_OPENGL_H 1
#include "plugin.h"
int galaktos_glx_init( galaktos_thread_t *p_thread ); struct opengl_t
void galaktos_glx_done( galaktos_thread_t *p_thread );
int galaktos_glx_handle_events( galaktos_thread_t *p_thread );
void galaktos_glx_activate_pbuffer( galaktos_thread_t *p_thread );
void galaktos_glx_activate_window( galaktos_thread_t *p_thread );
void galaktos_glx_swap( galaktos_thread_t *p_thread );
/*****************************************************************************
* mwmhints_t: window manager hints
*****************************************************************************
* Fullscreen needs to be able to hide the wm decorations so we provide
* this structure to make it easier.
*****************************************************************************/
#define MWM_HINTS_DECORATIONS (1L << 1)
#define PROP_MWM_HINTS_ELEMENTS 5
typedef struct mwmhints_t
{ {
uint32_t flags; VLC_COMMON_MEMBERS
uint32_t functions;
uint32_t decorations; int i_width; /* window width */
int32_t input_mode; int i_height; /* window height */
uint32_t status; int b_fullscreen; /* fullscreen flag */
} mwmhints_t;
opengl_sys_t *p_sys; /* private data */
/* Create an OpenGL window of the requested size (if possible) */
int ( *pf_init )( opengl_t *, int i_width, int i_height );
/* Swap front/back buffers */
void ( *pf_swap )( opengl_t * );
/* Handle window events */
int ( *pf_handle_events )( opengl_t * );
};
#endif #endif
...@@ -32,28 +32,59 @@ ...@@ -32,28 +32,59 @@
#include <vlc/intf.h> #include <vlc/intf.h>
#include <vlc/vout.h> #include <vlc/vout.h>
/* For the opengl provider interface */
#include "vlc_opengl.h"
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>
#include <GL/glx.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 * Local prototypes
*****************************************************************************/ *****************************************************************************/
static int Create ( vlc_object_t * ); static int OpenDisplay ( vlc_object_t *, glx_t * );
static void Destroy ( vlc_object_t * ); static void CloseDisplay( glx_t * );
static int InitGLX12 ( vlc_object_t *, glx_t * );
static int Init ( vout_thread_t * ); static int InitGLX13 ( vlc_object_t *, glx_t * );
static void End ( vout_thread_t * ); static void CreateWindow( vlc_object_t *, glx_t *, XVisualInfo *);
static int Manage ( vout_thread_t * ); static int HandleX11Events( vlc_object_t *, glx_t * );
static void Render ( vout_thread_t *p_vout, picture_t *p_pic ); static void SwitchContext( glx_t * );
static void DisplayVideo( vout_thread_t *, picture_t * );
static int OpenDisplay ( vout_thread_t * );
static void CloseDisplay( vout_thread_t * );
static int InitGLX12 ( vout_thread_t *p_vout );
static int InitGLX13 ( vout_thread_t *p_vout );
static void CreateWindow( vout_thread_t *p_vout, XVisualInfo *p_vi );
static void SwitchContext( vout_thread_t *p_vout );
static inline int GetAlignedSize( int i_size ); static inline int GetAlignedSize( int i_size );
...@@ -64,9 +95,15 @@ vlc_module_begin(); ...@@ -64,9 +95,15 @@ vlc_module_begin();
set_description( _("X11 OpenGL (GLX) video output") ); set_description( _("X11 OpenGL (GLX) video output") );
set_capability( "video output", 20 ); set_capability( "video output", 20 );
add_shortcut( "glx" ); add_shortcut( "glx" );
set_callbacks( Create, Destroy ); set_callbacks( CreateVout, DestroyVout );
add_submodule();
set_description( _("X11 OpenGL provider") );
set_capability( "opengl provider", 50 );
set_callbacks( CreateOpenGL, DestroyOpenGL );
vlc_module_end(); vlc_module_end();
/***************************************************************************** /*****************************************************************************
* vout_sys_t: GLX video output method descriptor * vout_sys_t: GLX video output method descriptor
***************************************************************************** *****************************************************************************
...@@ -77,26 +114,20 @@ struct vout_sys_t ...@@ -77,26 +114,20 @@ struct vout_sys_t
{ {
uint8_t *p_buffer; uint8_t *p_buffer;
int i_index; int i_index;
int i_tex_width; int i_tex_width;
int i_tex_height; 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; GLuint texture;
int i_effect; //XXX int i_effect; //XXX
glx_t glx;
}; };
struct opengl_sys_t
{
glx_t glx;
};
#define MWM_HINTS_DECORATIONS (1L << 1) #define MWM_HINTS_DECORATIONS (1L << 1)
#define PROP_MWM_HINTS_ELEMENTS 5 #define PROP_MWM_HINTS_ELEMENTS 5
typedef struct mwmhints_t typedef struct mwmhints_t
...@@ -110,11 +141,11 @@ typedef struct mwmhints_t ...@@ -110,11 +141,11 @@ typedef struct mwmhints_t
/***************************************************************************** /*****************************************************************************
* Create: allocates GLX video thread output method * CreateVout: allocates GLX video thread output method
***************************************************************************** *****************************************************************************
* This function allocates and initializes a GLX vout method. * This function allocates and initializes a GLX vout method.
*****************************************************************************/ *****************************************************************************/
static int Create( vlc_object_t *p_this ) static int CreateVout( vlc_object_t *p_this )
{ {
vout_thread_t *p_vout = (vout_thread_t *)p_this; vout_thread_t *p_vout = (vout_thread_t *)p_this;
...@@ -129,11 +160,11 @@ static int Create( vlc_object_t *p_this ) ...@@ -129,11 +160,11 @@ static int Create( vlc_object_t *p_this )
//XXX set to 0 to disable the cube effect //XXX set to 0 to disable the cube effect
p_vout->p_sys->i_effect = 1; p_vout->p_sys->i_effect = 1;
/* p_vout->p_sys->i_width = p_vout->i_window_width; /* p_vout->p_sys->glx.i_width = p_vout->i_window_width;
p_vout->p_sys->i_height = p_vout->i_window_height; */ p_vout->p_sys->glx.i_height = p_vout->i_window_height; */
p_vout->p_sys->i_width = 700; p_vout->p_sys->glx.i_width = 700;
p_vout->p_sys->i_height = 700; p_vout->p_sys->glx.i_height = 700;
p_vout->p_sys->b_fullscreen = 0; p_vout->p_sys->glx.b_fullscreen = 0;
/* A texture must have a size aligned on a power of 2 */ /* A texture must have a size aligned on a power of 2 */
p_vout->p_sys->i_tex_width = GetAlignedSize( p_vout->render.i_width ); p_vout->p_sys->i_tex_width = GetAlignedSize( p_vout->render.i_width );
...@@ -143,7 +174,7 @@ static int Create( vlc_object_t *p_this ) ...@@ -143,7 +174,7 @@ static int Create( vlc_object_t *p_this )
p_vout->p_sys->i_tex_height ); p_vout->p_sys->i_tex_height );
/* Open and initialize device */ /* Open and initialize device */
if( OpenDisplay( p_vout ) ) if( OpenDisplay( p_this, &p_vout->p_sys->glx ) )
{ {
msg_Err( p_vout, "cannot open display" ); msg_Err( p_vout, "cannot open display" );
free( p_vout->p_sys ); free( p_vout->p_sys );
...@@ -200,6 +231,13 @@ static int Init( vout_thread_t *p_vout ) ...@@ -200,6 +231,13 @@ static int Init( vout_thread_t *p_vout )
* directly by the decoder */ * directly by the decoder */
p_pic->i_planes = 1; 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 p_pic->p->p_pixels = p_vout->p_sys->p_buffer
+ 2 * p_vout->p_sys->i_tex_width * + 2 * p_vout->p_sys->i_tex_width *
...@@ -217,7 +255,7 @@ static int Init( vout_thread_t *p_vout ) ...@@ -217,7 +255,7 @@ static int Init( vout_thread_t *p_vout )
I_OUTPUTPICTURES = 1; I_OUTPUTPICTURES = 1;
SwitchContext( p_vout ); SwitchContext( &p_vout->p_sys->glx );
/* Set the texture parameters */ /* Set the texture parameters */
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR ); glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
...@@ -226,7 +264,7 @@ static int Init( vout_thread_t *p_vout ) ...@@ -226,7 +264,7 @@ static int Init( vout_thread_t *p_vout )
if( p_vout->p_sys->i_effect ) if( p_vout->p_sys->i_effect )
{ {
glEnable( GL_CULL_FACE); glEnable( GL_CULL_FACE);
/*glDisable( GL_DEPTH_TEST ); /* glDisable( GL_DEPTH_TEST );
glEnable( GL_BLEND ); glEnable( GL_BLEND );
glBlendFunc( GL_SRC_ALPHA, GL_ONE );*/ glBlendFunc( GL_SRC_ALPHA, GL_ONE );*/
...@@ -253,13 +291,13 @@ static void End( vout_thread_t *p_vout ) ...@@ -253,13 +291,13 @@ static void End( vout_thread_t *p_vout )
/***************************************************************************** /*****************************************************************************
* Destroy: destroy GLX video thread output method * Destroy: destroy GLX video thread output method
***************************************************************************** *****************************************************************************
* Terminate an output method created by Create * Terminate an output method created by CreateVout
*****************************************************************************/ *****************************************************************************/
static void Destroy( vlc_object_t *p_this ) static void DestroyVout( vlc_object_t *p_this )
{ {
vout_thread_t *p_vout = (vout_thread_t *)p_this; vout_thread_t *p_vout = (vout_thread_t *)p_this;
CloseDisplay( p_vout ); CloseDisplay( &p_vout->p_sys->glx );
/* Free the texture buffer*/ /* Free the texture buffer*/
if( p_vout->p_sys->p_buffer ) if( p_vout->p_sys->p_buffer )
...@@ -270,6 +308,95 @@ static void Destroy( vlc_object_t *p_this ) ...@@ -270,6 +308,95 @@ static void Destroy( vlc_object_t *p_this )
free( p_vout->p_sys ); 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;
}
/***************************************************************************** /*****************************************************************************
* Manage: handle X11 events * Manage: handle X11 events
***************************************************************************** *****************************************************************************
...@@ -277,10 +404,28 @@ static void Destroy( vlc_object_t *p_this ) ...@@ -277,10 +404,28 @@ static void Destroy( vlc_object_t *p_this )
* console events. It returns a non null value on error. * console events. It returns a non null value on error.
*****************************************************************************/ *****************************************************************************/
static int Manage( vout_thread_t *p_vout ) 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; Display *p_display;
p_display = p_vout->p_sys->p_display; p_display = p_glx->p_display;
/* loop on X11 events */ /* loop on X11 events */
while( XPending( p_display ) > 0 ) while( XPending( p_display ) > 0 )
...@@ -293,17 +438,10 @@ static int Manage( vout_thread_t *p_vout ) ...@@ -293,17 +438,10 @@ static int Manage( vout_thread_t *p_vout )
{ {
/* Delete notification */ /* Delete notification */
if( (evt.xclient.format == 32) && if( (evt.xclient.format == 32) &&
((Atom)evt.xclient.data.l[0] == p_vout->p_sys->wm_delete) ) ((Atom)evt.xclient.data.l[0] ==
p_glx->wm_delete) )
{ {
/* the user wants to close the window */ return -1;
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 );
}
} }
break; break;
} }
...@@ -312,6 +450,7 @@ static int Manage( vout_thread_t *p_vout ) ...@@ -312,6 +450,7 @@ static int Manage( vout_thread_t *p_vout )
return 0; return 0;
} }
/***************************************************************************** /*****************************************************************************
* Render: render previously calculated output * Render: render previously calculated output
*****************************************************************************/ *****************************************************************************/
...@@ -421,99 +560,88 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic ) ...@@ -421,99 +560,88 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic )
glEnd(); glEnd();
} }
glDisable( GL_TEXTURE_2D); glDisable( GL_TEXTURE_2D);
} }
/***************************************************************************** /*****************************************************************************
* DisplayVideo: displays previously rendered output * DisplayVideo: displays previously rendered output
*****************************************************************************/ *****************************************************************************/
static void DisplayVideo( vout_thread_t *p_vout, picture_t *p_pic ) static void DisplayVideo( vout_thread_t *p_vout, picture_t *p_pic )
{ {
if( p_vout->p_sys->b_glx13 ) if( p_vout->p_sys->glx.b_glx13 )
{ {
glXSwapBuffers( p_vout->p_sys->p_display, p_vout->p_sys->gwnd ); glXSwapBuffers( p_vout->p_sys->glx.p_display,
p_vout->p_sys->glx.gwnd );
} }
else else
{ {
glXSwapBuffers( p_vout->p_sys->p_display, p_vout->p_sys->wnd ); glXSwapBuffers( p_vout->p_sys->glx.p_display,
p_vout->p_sys->glx.wnd );
} }
} }
/* following functions are local */
/***************************************************************************** /*****************************************************************************
* OpenDisplay: open and initialize OpenGL device * OpenDisplay: open and initialize OpenGL device
*****************************************************************************/ *****************************************************************************/
static int OpenDisplay( vlc_object_t *p_thread, glx_t *p_glx )
static int OpenDisplay( vout_thread_t *p_vout )
{ {
Display *p_display; Display *p_display;
int i_opcode, i_evt, i_err; int i_opcode, i_evt, i_err;
int i_maj, i_min; int i_maj, i_min;
/* Open the display */ /* Open the display */
p_vout->p_sys->p_display = p_display = XOpenDisplay( NULL ); p_glx->p_display = p_display = XOpenDisplay( NULL );
if( !p_display ) if( !p_display )
{ {