X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_output%2Fopengl.c;h=2147d0c20430e95eda32a18cc66be19efe09e9bb;hb=53195e9fc7c31e8ae3aeead4879477aa950513b4;hp=872c4776ba438b07daa2c6a67f5963221c9394c3;hpb=de198bc744e1a6ef5318de4a17bc95ac123e6344;p=vlc diff --git a/modules/video_output/opengl.c b/modules/video_output/opengl.c index 872c4776ba..2147d0c204 100644 --- a/modules/video_output/opengl.c +++ b/modules/video_output/opengl.c @@ -1,11 +1,13 @@ /***************************************************************************** * opengl.c: OpenGL video output ***************************************************************************** - * Copyright (C) 2004 VideoLAN + * Copyright (C) 2004 the VideoLAN team * $Id$ * * Authors: Cyril Deguet * Gildas Bazin + * Eric Petit + * Cedric Cocquebert * * 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 @@ -19,20 +21,24 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include /* ENOMEM */ -#include /* malloc(), free() */ -#include -#include -#include +#include +#include +#include -#ifdef SYS_DARWIN +#ifdef __APPLE__ #include #include @@ -63,15 +69,26 @@ #define VLCGL_RGB_FORMAT GL_RGBA #define VLCGL_RGB_TYPE GL_UNSIGNED_BYTE +/* YUY2 */ +#ifndef YCBCR_MESA +#define YCBCR_MESA 0x8757 +#endif +#ifndef UNSIGNED_SHORT_8_8_MESA +#define UNSIGNED_SHORT_8_8_MESA 0x85BA +#endif +#define VLCGL_YUV_FORMAT YCBCR_MESA +#define VLCGL_YUV_TYPE UNSIGNED_SHORT_8_8_MESA + /* Use RGB on Win32/GLX */ #define VLCGL_FORMAT VLCGL_RGB_FORMAT #define VLCGL_TYPE VLCGL_RGB_TYPE +//#define VLCGL_FORMAT VLCGL_YUV_FORMAT +//#define VLCGL_TYPE VLCGL_YUV_TYPE #endif -/* OpenGL effects */ -#define OPENGL_EFFECT_NONE 1 -#define OPENGL_EFFECT_CUBE 2 -#define OPENGL_EFFECT_TRANSPARENT_CUBE 4 +#ifndef GL_CLAMP_TO_EDGE +# define GL_CLAMP_TO_EDGE 0x812F +#endif /***************************************************************************** * Vout interface @@ -87,41 +104,29 @@ static int Control ( vout_thread_t *, int, va_list ); static inline int GetAlignedSize( int ); -static int InitTextures( vout_thread_t * ); -static int SendEvents( vlc_object_t *, char const *, - vlc_value_t, vlc_value_t, void * ); +static int InitTextures ( vout_thread_t * ); +static int SendEvents ( vlc_object_t *, char const *, + vlc_value_t, vlc_value_t, void * ); -/***************************************************************************** - * Module descriptor - *****************************************************************************/ -#define SPEED_TEXT N_( "OpenGL cube rotation speed" ) -#define SPEED_LONGTEXT N_( "If the OpenGL cube effect is enabled, this " \ - "controls its rotation speed." ) - -#define EFFECT_TEXT N_("Select effect") -#define EFFECT_LONGTEXT N_( \ - "Allows you to select different visual effects.") - -static char *ppsz_effects[] = { - "none", "cube", "transparent-cube" }; -static char *ppsz_effects_text[] = { - N_("None"), N_("Cube"), N_("Transparent Cube") }; - -vlc_module_begin(); - set_description( _("OpenGL video output") ); -#ifdef SYS_DARWIN - set_capability( "video output", 0 ); +#define PROVIDER_TEXT N_("OpenGL Provider") +#define PROVIDER_LONGTEXT N_("Allows you to modify what OpenGL provider should be used") + +vlc_module_begin () + set_shortname( "OpenGL" ) + set_category( CAT_VIDEO ) + set_subcategory( SUBCAT_VIDEO_VOUT ) + set_description( N_("OpenGL video output") ) +#ifdef __APPLE__ + set_capability( "video output", 200 ) #else - set_capability( "video output", 20 ); + set_capability( "video output", 20 ) #endif - add_shortcut( "opengl" ); - add_float( "opengl-cube-speed", 2.0, NULL, SPEED_TEXT, - SPEED_LONGTEXT, VLC_FALSE ); - set_callbacks( CreateVout, DestroyVout ); - add_string( "opengl-effect", "none", NULL, EFFECT_TEXT, - EFFECT_LONGTEXT, VLC_TRUE ); - change_string_list( ppsz_effects, ppsz_effects_text, 0 ); -vlc_module_end(); + add_shortcut( "opengl" ) + /* Allow opengl provider plugin selection */ + add_string( "opengl-provider", "default", NULL, PROVIDER_TEXT, + PROVIDER_LONGTEXT, true ) + set_callbacks( CreateVout, DestroyVout ) +vlc_module_end () /***************************************************************************** * vout_sys_t: video output method descriptor @@ -138,10 +143,6 @@ struct vout_sys_t int i_tex_width; int i_tex_height; GLuint p_textures[2]; - - int i_effect; - - float f_speed; }; /***************************************************************************** @@ -151,24 +152,21 @@ static int CreateVout( vlc_object_t *p_this ) { vout_thread_t *p_vout = (vout_thread_t *)p_this; vout_sys_t *p_sys; + char * psz; /* Allocate structure */ p_vout->p_sys = p_sys = malloc( sizeof( vout_sys_t ) ); if( p_sys == NULL ) - { - msg_Err( p_vout, "out of memory" ); - return VLC_EGENERIC; - } - - var_Create( p_vout, "opengl-effect", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); + return VLC_ENOMEM; -#ifdef SYS_DARWIN - p_sys->i_tex_width = p_vout->render.i_width; - p_sys->i_tex_height = p_vout->render.i_height; + p_sys->i_index = 0; +#ifdef __APPLE__ + p_sys->i_tex_width = p_vout->fmt_in.i_width; + p_sys->i_tex_height = p_vout->fmt_in.i_height; #else /* A texture must have a size aligned on a power of 2 */ - p_sys->i_tex_width = GetAlignedSize( p_vout->render.i_width ); - p_sys->i_tex_height = GetAlignedSize( p_vout->render.i_height ); + p_sys->i_tex_width = GetAlignedSize( p_vout->fmt_in.i_width ); + p_sys->i_tex_height = GetAlignedSize( p_vout->fmt_in.i_height ); #endif msg_Dbg( p_vout, "Texture size: %dx%d", p_sys->i_tex_width, @@ -176,10 +174,10 @@ static int CreateVout( vlc_object_t *p_this ) /* Get window */ p_sys->p_vout = - (vout_thread_t *)vlc_object_create( p_this, VLC_OBJECT_OPENGL ); + (vout_thread_t *)vlc_object_create( p_this, sizeof( vout_thread_t ) ); if( p_sys->p_vout == NULL ) { - msg_Err( p_vout, "out of memory" ); + free( p_sys ); return VLC_ENOMEM; } vlc_object_attach( p_sys->p_vout, p_this ); @@ -190,21 +188,28 @@ static int CreateVout( vlc_object_t *p_this ) p_sys->p_vout->render.i_width = p_vout->render.i_width; p_sys->p_vout->render.i_height = p_vout->render.i_height; p_sys->p_vout->render.i_aspect = p_vout->render.i_aspect; - p_sys->p_vout->b_scale = p_vout->b_scale; + p_sys->p_vout->fmt_render = p_vout->fmt_render; + p_sys->p_vout->fmt_in = p_vout->fmt_in; + p_sys->p_vout->b_autoscale = p_vout->b_autoscale; + p_sys->p_vout->i_zoom = p_vout->i_zoom; p_sys->p_vout->i_alignment = p_vout->i_alignment; + psz = config_GetPsz( p_vout, "opengl-provider" ); + + msg_Dbg( p_vout, "requesting \"%s\" opengl provider", + psz ? psz : "default" ); + p_sys->p_vout->p_module = - module_Need( p_sys->p_vout, "opengl provider", NULL, 0 ); + module_need( p_sys->p_vout, "opengl provider", psz, false ); + free( psz ); if( p_sys->p_vout->p_module == NULL ) { msg_Warn( p_vout, "No OpenGL provider found" ); vlc_object_detach( p_sys->p_vout ); - vlc_object_destroy( p_sys->p_vout ); + vlc_object_release( p_sys->p_vout ); return VLC_ENOOBJ; } - p_sys->f_speed = var_CreateGetFloat( p_vout, "opengl-cube-speed" ); - p_vout->pf_init = Init; p_vout->pf_end = End; p_vout->pf_manage = Manage; @@ -216,14 +221,22 @@ static int CreateVout( vlc_object_t *p_this ) var_Create( p_sys->p_vout, "mouse-x", VLC_VAR_INTEGER ); var_Create( p_sys->p_vout, "mouse-y", VLC_VAR_INTEGER ); var_Create( p_sys->p_vout, "mouse-moved", VLC_VAR_BOOL ); - var_Create( p_sys->p_vout, "mouse-clicked", VLC_VAR_INTEGER ); + var_Create( p_sys->p_vout, "mouse-clicked", VLC_VAR_BOOL ); + var_Create( p_sys->p_vout, "mouse-button-down", VLC_VAR_INTEGER ); var_Create( p_sys->p_vout, "video-on-top", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); + var_Create( p_sys->p_vout, "autoscale", + VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); + var_Create( p_sys->p_vout, "scale", + VLC_VAR_FLOAT | VLC_VAR_DOINHERIT ); var_AddCallback( p_sys->p_vout, "mouse-x", SendEvents, p_vout ); var_AddCallback( p_sys->p_vout, "mouse-y", SendEvents, p_vout ); var_AddCallback( p_sys->p_vout, "mouse-moved", SendEvents, p_vout ); var_AddCallback( p_sys->p_vout, "mouse-clicked", SendEvents, p_vout ); + var_AddCallback( p_sys->p_vout, "mouse-button-down", SendEvents, p_vout ); + var_AddCallback( p_vout, "autoscale", SendEvents, p_sys->p_vout ); + var_AddCallback( p_vout, "scale", SendEvents, p_sys->p_vout ); return VLC_SUCCESS; } @@ -235,38 +248,56 @@ static int Init( vout_thread_t *p_vout ) { vout_sys_t *p_sys = p_vout->p_sys; int i_pixel_pitch; - vlc_value_t val; p_sys->p_vout->pf_init( p_sys->p_vout ); -#ifdef SYS_DARWIN +/* TODO: We use YCbCr on Mac which is Y422, but on OSX it seems to == YUY2. Verify */ +#if ( defined( WORDS_BIGENDIAN ) && VLCGL_FORMAT == GL_YCBCR_422_APPLE ) || (VLCGL_FORMAT == YCBCR_MESA) p_vout->output.i_chroma = VLC_FOURCC('Y','U','Y','2'); + i_pixel_pitch = 2; + +#elif (VLCGL_FORMAT == GL_YCBCR_422_APPLE) + p_vout->output.i_chroma = VLC_FOURCC('U','Y','V','Y'); + i_pixel_pitch = 2; + +#elif VLCGL_FORMAT == GL_RGB +# if VLCGL_TYPE == GL_UNSIGNED_BYTE + p_vout->output.i_chroma = VLC_FOURCC('R','V','2','4'); +# if defined( WORDS_BIGENDIAN ) p_vout->output.i_rmask = 0x00ff0000; p_vout->output.i_gmask = 0x0000ff00; p_vout->output.i_bmask = 0x000000ff; - i_pixel_pitch = 2; -#else -#if VLCGL_RGB_FORMAT == GL_RGB -# if VLCGL_RGB_TYPE == GL_UNSIGNED_BYTE - p_vout->output.i_chroma = VLC_FOURCC('R','V','2','4'); +# else p_vout->output.i_rmask = 0x000000ff; p_vout->output.i_gmask = 0x0000ff00; p_vout->output.i_bmask = 0x00ff0000; +# endif i_pixel_pitch = 3; # else p_vout->output.i_chroma = VLC_FOURCC('R','V','1','6'); +# if defined( WORDS_BIGENDIAN ) + p_vout->output.i_rmask = 0x001f; + p_vout->output.i_gmask = 0x07e0; + p_vout->output.i_bmask = 0xf800; +# else p_vout->output.i_rmask = 0xf800; p_vout->output.i_gmask = 0x07e0; p_vout->output.i_bmask = 0x001f; +# endif i_pixel_pitch = 2; # endif #else p_vout->output.i_chroma = VLC_FOURCC('R','V','3','2'); +# if defined( WORDS_BIGENDIAN ) + p_vout->output.i_rmask = 0xff000000; + p_vout->output.i_gmask = 0x00ff0000; + p_vout->output.i_bmask = 0x0000ff00; +# else p_vout->output.i_rmask = 0x000000ff; p_vout->output.i_gmask = 0x0000ff00; p_vout->output.i_bmask = 0x00ff0000; +# endif i_pixel_pitch = 4; -#endif #endif /* Since OpenGL can do rescaling for us, stick to the default @@ -275,22 +306,19 @@ static int Init( vout_thread_t *p_vout ) p_vout->output.i_height = p_vout->render.i_height; p_vout->output.i_aspect = p_vout->render.i_aspect; + p_vout->fmt_out = p_vout->fmt_in; + p_vout->fmt_out.i_chroma = p_vout->output.i_chroma; + /* We know the chroma, allocate one buffer which will be used * directly by the decoder */ p_sys->pp_buffer[0] = malloc( p_sys->i_tex_width * p_sys->i_tex_height * i_pixel_pitch ); if( !p_sys->pp_buffer[0] ) - { - msg_Err( p_vout, "Out of memory" ); return -1; - } p_sys->pp_buffer[1] = malloc( p_sys->i_tex_width * p_sys->i_tex_height * i_pixel_pitch ); if( !p_sys->pp_buffer[1] ) - { - msg_Err( p_vout, "Out of memory" ); return -1; - } p_vout->p_picture[0].i_planes = 1; p_vout->p_picture[0].p->p_pixels = p_sys->pp_buffer[0]; @@ -309,53 +337,25 @@ static int Init( vout_thread_t *p_vout ) I_OUTPUTPICTURES = 1; + if( p_sys->p_vout->pf_lock && + p_sys->p_vout->pf_lock( p_sys->p_vout ) ) + { + msg_Warn( p_vout, "could not lock OpenGL provider" ); + return 0; + } + InitTextures( p_vout ); glDisable(GL_BLEND); glDisable(GL_DEPTH_TEST); glDepthMask(GL_FALSE); glDisable(GL_CULL_FACE); + glClearColor( 0.0f, 0.0f, 0.0f, 1.0f ); glClear( GL_COLOR_BUFFER_BIT ); - /* Check if the user asked for useless visual effects */ - var_Get( p_vout, "opengl-effect", &val ); - if( !val.psz_string || !strcmp( val.psz_string, "none" )) - { - p_sys->i_effect = OPENGL_EFFECT_NONE; - } - else if( !strcmp( val.psz_string, "cube" ) ) - { - p_sys->i_effect = OPENGL_EFFECT_CUBE; - - glEnable( GL_CULL_FACE); - //glEnable( GL_DEPTH_TEST ); - } - else if( !strcmp( val.psz_string, "transparent-cube" ) ) - { - p_sys->i_effect = OPENGL_EFFECT_TRANSPARENT_CUBE; - - glDisable( GL_DEPTH_TEST ); - glEnable( GL_BLEND ); - glBlendFunc( GL_SRC_ALPHA, GL_ONE ); - } - else + if( p_sys->p_vout->pf_unlock ) { - msg_Warn( p_vout, "no valid opengl effect provided, using " - "\"none\"" ); - p_sys->i_effect = OPENGL_EFFECT_NONE; - } - if( val.psz_string ) free( val.psz_string ); - - if( p_sys->i_effect & ( OPENGL_EFFECT_CUBE | - OPENGL_EFFECT_TRANSPARENT_CUBE ) ) - { - /* Set the perpective */ - glMatrixMode( GL_PROJECTION ); - glLoadIdentity(); - glFrustum( -1.0, 1.0, -1.0, 1.0, 3.0, 20.0 ); - glMatrixMode( GL_MODELVIEW ); - glLoadIdentity(); - glTranslatef( 0.0, 0.0, - 5.0 ); + p_sys->p_vout->pf_unlock( p_sys->p_vout ); } return 0; @@ -366,8 +366,27 @@ static int Init( vout_thread_t *p_vout ) *****************************************************************************/ static void End( vout_thread_t *p_vout ) { + vout_sys_t *p_sys = p_vout->p_sys; + + if( p_sys->p_vout->pf_lock && + p_sys->p_vout->pf_lock( p_sys->p_vout ) ) + { + msg_Warn( p_vout, "could not lock OpenGL provider" ); + return; + } + glFinish(); glFlush(); + + /* Free the texture buffer*/ + glDeleteTextures( 2, p_sys->p_textures ); + free( p_sys->pp_buffer[0] ); + free( p_sys->pp_buffer[1] ); + + if( p_sys->p_vout->pf_unlock ) + { + p_sys->p_vout->pf_unlock( p_sys->p_vout ); + } } /***************************************************************************** @@ -380,13 +399,8 @@ static void DestroyVout( vlc_object_t *p_this ) vout_thread_t *p_vout = (vout_thread_t *)p_this; vout_sys_t *p_sys = p_vout->p_sys; - module_Unneed( p_sys->p_vout, p_sys->p_vout->p_module ); - vlc_object_detach( p_sys->p_vout ); - vlc_object_destroy( p_sys->p_vout ); - - /* Free the texture buffer*/ - if( p_sys->pp_buffer[0] ) free( p_sys->pp_buffer[0] ); - if( p_sys->pp_buffer[1] ) free( p_sys->pp_buffer[1] ); + module_unneed( p_sys->p_vout, p_sys->p_vout->p_module ); + vlc_object_release( p_sys->p_vout ); free( p_sys ); } @@ -404,43 +418,69 @@ static int Manage( vout_thread_t *p_vout ) i_fullscreen_change = ( p_vout->i_changes & VOUT_FULLSCREEN_CHANGE ); + p_vout->fmt_out.i_x_offset = p_sys->p_vout->fmt_in.i_x_offset = + p_vout->fmt_in.i_x_offset; + p_vout->fmt_out.i_y_offset = p_sys->p_vout->fmt_in.i_y_offset = + p_vout->fmt_in.i_y_offset; + p_vout->fmt_out.i_visible_width = p_sys->p_vout->fmt_in.i_visible_width = + p_vout->fmt_in.i_visible_width; + p_vout->fmt_out.i_visible_height = p_sys->p_vout->fmt_in.i_visible_height = + p_vout->fmt_in.i_visible_height; + p_vout->fmt_out.i_aspect = p_sys->p_vout->fmt_in.i_aspect = + p_vout->fmt_in.i_aspect; + p_vout->fmt_out.i_sar_num = p_sys->p_vout->fmt_in.i_sar_num = + p_vout->fmt_in.i_sar_num; + p_vout->fmt_out.i_sar_den = p_sys->p_vout->fmt_in.i_sar_den = + p_vout->fmt_in.i_sar_den; + p_vout->output.i_aspect = p_vout->fmt_in.i_aspect; + p_sys->p_vout->i_changes = p_vout->i_changes; i_ret = p_sys->p_vout->pf_manage( p_sys->p_vout ); p_vout->i_changes = p_sys->p_vout->i_changes; -#ifdef SYS_DARWIN +#ifdef __APPLE__ + if( p_sys->p_vout->pf_lock && + p_sys->p_vout->pf_lock( p_sys->p_vout ) ) + { + msg_Warn( p_vout, "could not lock OpenGL provider" ); + return i_ret; + } + /* On OS X, we create the window and the GL view when entering fullscreen - the textures have to be inited again */ if( i_fullscreen_change ) { InitTextures( p_vout ); + } - switch( p_sys->i_effect ) - { - case OPENGL_EFFECT_CUBE: - glEnable( GL_CULL_FACE ); - break; - - case OPENGL_EFFECT_TRANSPARENT_CUBE: - glDisable( GL_DEPTH_TEST ); - glEnable( GL_BLEND ); - glBlendFunc( GL_SRC_ALPHA, GL_ONE ); - break; - } - - if( p_sys->i_effect & ( OPENGL_EFFECT_CUBE | - OPENGL_EFFECT_TRANSPARENT_CUBE ) ) - { - /* Set the perpective */ - glMatrixMode( GL_PROJECTION ); - glLoadIdentity(); - glFrustum( -1.0, 1.0, -1.0, 1.0, 3.0, 20.0 ); - glMatrixMode( GL_MODELVIEW ); - glLoadIdentity(); - glTranslatef( 0.0, 0.0, - 5.0 ); - } + if( p_sys->p_vout->pf_unlock ) + { + p_sys->p_vout->pf_unlock( p_sys->p_vout ); } #endif +// to align in real time in OPENGL + if (p_sys->p_vout->i_alignment != p_vout->i_alignment) + { + p_vout->i_changes |= VOUT_CROP_CHANGE; //to force change + p_sys->p_vout->i_alignment = p_vout->i_alignment; + } + + /* forward signal that autoscale toggle has changed */ + if (p_vout->i_changes & VOUT_SCALE_CHANGE ) + { + p_vout->i_changes &= ~VOUT_SCALE_CHANGE; + + p_sys->p_vout->i_changes |= VOUT_SCALE_CHANGE; + } + + /* forward signal that scale has changed */ + if (p_vout->i_changes & VOUT_ZOOM_CHANGE ) + { + p_vout->i_changes &= ~VOUT_ZOOM_CHANGE; + + p_sys->p_vout->i_changes |= VOUT_ZOOM_CHANGE; + } + return i_ret; } @@ -450,6 +490,7 @@ static int Manage( vout_thread_t *p_vout ) *****************************************************************************/ static void Render( vout_thread_t *p_vout, picture_t *p_pic ) { + VLC_UNUSED(p_pic); vout_sys_t *p_sys = p_vout->p_sys; /* On Win32/GLX, we do this the usual way: @@ -469,15 +510,24 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic ) OS X, we first render, then reload the texture to be used next time. */ -#ifdef SYS_DARWIN + if( p_sys->p_vout->pf_lock && + p_sys->p_vout->pf_lock( p_sys->p_vout ) ) + { + msg_Warn( p_vout, "could not lock OpenGL provider" ); + return; + } + +#ifdef __APPLE__ int i_new_index; i_new_index = ( p_sys->i_index + 1 ) & 1; + /* Update the texture */ glBindTexture( VLCGL_TARGET, p_sys->p_textures[i_new_index] ); - glTexSubImage2D( VLCGL_TARGET, 0, 0, 0, p_sys->i_tex_width, - p_sys->i_tex_height, VLCGL_FORMAT, VLCGL_TYPE, - p_sys->pp_buffer[i_new_index] ); + glTexSubImage2D( VLCGL_TARGET, 0, 0, 0, + p_vout->fmt_out.i_width, + p_vout->fmt_out.i_height, + VLCGL_FORMAT, VLCGL_TYPE, p_sys->pp_buffer[i_new_index] ); /* Bind to the previous texture for drawing */ glBindTexture( VLCGL_TARGET, p_sys->p_textures[p_sys->i_index] ); @@ -489,9 +539,15 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic ) #else /* Update the texture */ glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, - p_vout->render.i_width, p_vout->render.i_height, - VLCGL_RGB_FORMAT, VLCGL_RGB_TYPE, p_sys->pp_buffer[0] ); + p_vout->fmt_out.i_width, + p_vout->fmt_out.i_height, + VLCGL_FORMAT, VLCGL_TYPE, p_sys->pp_buffer[0] ); #endif + + if( p_sys->p_vout->pf_unlock ) + { + p_sys->p_vout->pf_unlock( p_sys->p_vout ); + } } /***************************************************************************** @@ -499,17 +555,33 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic ) *****************************************************************************/ static void DisplayVideo( vout_thread_t *p_vout, picture_t *p_pic ) { + VLC_UNUSED(p_pic); vout_sys_t *p_sys = p_vout->p_sys; - float f_width, f_height; + float f_width, f_height, f_x, f_y; + + if( p_sys->p_vout->pf_lock && + p_sys->p_vout->pf_lock( p_sys->p_vout ) ) + { + msg_Warn( p_vout, "could not lock OpenGL provider" ); + return; + } /* glTexCoord works differently with GL_TEXTURE_2D and GL_TEXTURE_RECTANGLE_EXT */ -#ifdef SYS_DARWIN - f_width = (float)p_vout->output.i_width; - f_height = (float)p_vout->output.i_height; +#ifdef __APPLE__ + f_x = (float)p_vout->fmt_out.i_x_offset; + f_y = (float)p_vout->fmt_out.i_y_offset; + f_width = (float)p_vout->fmt_out.i_x_offset + + (float)p_vout->fmt_out.i_visible_width; + f_height = (float)p_vout->fmt_out.i_y_offset + + (float)p_vout->fmt_out.i_visible_height; #else - f_width = (float)p_vout->output.i_width / p_sys->i_tex_width; - f_height = (float)p_vout->output.i_height / p_sys->i_tex_height; + f_x = (float)p_vout->fmt_out.i_x_offset / p_sys->i_tex_width; + f_y = (float)p_vout->fmt_out.i_y_offset / p_sys->i_tex_height; + f_width = ( (float)p_vout->fmt_out.i_x_offset + + p_vout->fmt_out.i_visible_width ) / p_sys->i_tex_width; + f_height = ( (float)p_vout->fmt_out.i_y_offset + + p_vout->fmt_out.i_visible_height ) / p_sys->i_tex_height; #endif /* Why drawing here and not in Render()? Because this way, the @@ -518,64 +590,22 @@ static void DisplayVideo( vout_thread_t *p_vout, picture_t *p_pic ) glClear( GL_COLOR_BUFFER_BIT ); - if( p_sys->i_effect == OPENGL_EFFECT_NONE ) - { - glEnable( VLCGL_TARGET ); - glBegin( GL_POLYGON ); - glTexCoord2f( 0.0, 0.0 ); glVertex2f( -1.0, 1.0 ); - glTexCoord2f( f_width, 0.0 ); glVertex2f( 1.0, 1.0 ); - glTexCoord2f( f_width, f_height ); glVertex2f( 1.0, -1.0 ); - glTexCoord2f( 0.0, f_height ); glVertex2f( -1.0, -1.0 ); - glEnd(); - } - else - { - glRotatef( 0.5 * p_sys->f_speed , 0.3, 0.5, 0.7 ); - - glEnable( VLCGL_TARGET ); - glBegin( GL_QUADS ); - - /* Front */ - glTexCoord2f( 0, 0 ); glVertex3f( - 1.0, 1.0, 1.0 ); - glTexCoord2f( 0, f_height ); glVertex3f( - 1.0, - 1.0, 1.0 ); - glTexCoord2f( f_width, f_height ); glVertex3f( 1.0, - 1.0, 1.0 ); - glTexCoord2f( f_width, 0 ); glVertex3f( 1.0, 1.0, 1.0 ); - - /* Left */ - glTexCoord2f( 0, 0 ); glVertex3f( - 1.0, 1.0, - 1.0 ); - glTexCoord2f( 0, f_height ); glVertex3f( - 1.0, - 1.0, - 1.0 ); - glTexCoord2f( f_width, f_height ); glVertex3f( - 1.0, - 1.0, 1.0 ); - glTexCoord2f( f_width, 0 ); glVertex3f( - 1.0, 1.0, 1.0 ); - - /* Back */ - glTexCoord2f( 0, 0 ); glVertex3f( 1.0, 1.0, - 1.0 ); - glTexCoord2f( 0, f_height ); glVertex3f( 1.0, - 1.0, - 1.0 ); - glTexCoord2f( f_width, f_height ); glVertex3f( - 1.0, - 1.0, - 1.0 ); - glTexCoord2f( f_width, 0 ); glVertex3f( - 1.0, 1.0, - 1.0 ); - - /* Right */ - glTexCoord2f( 0, 0 ); glVertex3f( 1.0, 1.0, 1.0 ); - glTexCoord2f( 0, f_height ); glVertex3f( 1.0, - 1.0, 1.0 ); - glTexCoord2f( f_width, f_height ); glVertex3f( 1.0, - 1.0, - 1.0 ); - glTexCoord2f( f_width, 0 ); glVertex3f( 1.0, 1.0, - 1.0 ); - - /* Top */ - glTexCoord2f( 0, 0 ); glVertex3f( - 1.0, 1.0, - 1.0 ); - glTexCoord2f( 0, f_height ); glVertex3f( - 1.0, 1.0, 1.0 ); - glTexCoord2f( f_width, f_height ); glVertex3f( 1.0, 1.0, 1.0 ); - glTexCoord2f( f_width, 0 ); glVertex3f( 1.0, 1.0, - 1.0 ); - - /* Bottom */ - glTexCoord2f( 0, 0 ); glVertex3f( - 1.0, - 1.0, 1.0 ); - glTexCoord2f( 0, f_height ); glVertex3f( - 1.0, - 1.0, - 1.0 ); - glTexCoord2f( f_width, f_height ); glVertex3f( 1.0, - 1.0, - 1.0 ); - glTexCoord2f( f_width, 0 ); glVertex3f( 1.0, - 1.0, 1.0 ); - glEnd(); - } + glEnable( VLCGL_TARGET ); + glBegin( GL_POLYGON ); + glTexCoord2f( f_x, f_y ); glVertex2f( -1.0, 1.0 ); + glTexCoord2f( f_width, f_y ); glVertex2f( 1.0, 1.0 ); + glTexCoord2f( f_width, f_height ); glVertex2f( 1.0, -1.0 ); + glTexCoord2f( f_x, f_height ); glVertex2f( -1.0, -1.0 ); + glEnd(); glDisable( VLCGL_TARGET ); p_sys->p_vout->pf_swap( p_sys->p_vout ); + + if( p_sys->p_vout->pf_unlock ) + { + p_sys->p_vout->pf_unlock( p_sys->p_vout ); + } } int GetAlignedSize( int i_size ) @@ -596,10 +626,14 @@ static int Control( vout_thread_t *p_vout, int i_query, va_list args ) { vout_sys_t *p_sys = p_vout->p_sys; - if( p_sys->p_vout->pf_control ) - return p_sys->p_vout->pf_control( p_sys->p_vout, i_query, args ); - else - return vout_vaControlDefault( p_vout, i_query, args ); + switch( i_query ) + { + default: + if( p_sys->p_vout->pf_control ) + return p_sys->p_vout->pf_control( p_sys->p_vout, i_query, args ); + else + return vout_vaControlDefault( p_vout, i_query, args ); + } } static int InitTextures( vout_thread_t *p_vout ) @@ -613,24 +647,24 @@ static int InitTextures( vout_thread_t *p_vout ) for( i_index = 0; i_index < 2; i_index++ ) { glBindTexture( VLCGL_TARGET, p_sys->p_textures[i_index] ); - + /* Set the texture parameters */ glTexParameterf( VLCGL_TARGET, GL_TEXTURE_PRIORITY, 1.0 ); - + + glTexParameteri( VLCGL_TARGET, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE ); + glTexParameteri( VLCGL_TARGET, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE ); + glTexParameteri( VLCGL_TARGET, GL_TEXTURE_MAG_FILTER, GL_LINEAR ); glTexParameteri( VLCGL_TARGET, GL_TEXTURE_MIN_FILTER, GL_LINEAR ); - - glTexParameteri( VLCGL_TARGET, GL_TEXTURE_WRAP_S, GL_CLAMP ); - glTexParameteri( VLCGL_TARGET, GL_TEXTURE_WRAP_T, GL_CLAMP ); - + glTexEnvf( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE ); -#ifdef SYS_DARWIN +#ifdef __APPLE__ /* Tell the driver not to make a copy of the texture but to use our buffer */ glEnable( GL_UNPACK_CLIENT_STORAGE_APPLE ); glPixelStorei( GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE ); - + #if 0 /* Use VRAM texturing */ glTexParameteri( VLCGL_TARGET, GL_TEXTURE_STORAGE_HINT_APPLE, @@ -657,5 +691,6 @@ static int InitTextures( vout_thread_t *p_vout ) static int SendEvents( vlc_object_t *p_this, char const *psz_var, vlc_value_t oldval, vlc_value_t newval, void *_p_vout ) { + VLC_UNUSED(p_this); VLC_UNUSED(oldval); return var_Set( (vlc_object_t *)_p_vout, psz_var, newval ); }