X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_output%2Fopengl.c;h=d45f7c454dc5f8028a14cec4b5d0883fcb7f5196;hb=467472bcecd6bae797dea03543ca105a61a8f6c2;hp=000bad8ad97c91788d67b517ce374aba73f26e90;hpb=4f97b25a8ef726835a929010476bfb17394958b6;p=vlc diff --git a/modules/video_output/opengl.c b/modules/video_output/opengl.c index 000bad8ad9..d45f7c454d 100644 --- a/modules/video_output/opengl.c +++ b/modules/video_output/opengl.c @@ -1,7 +1,7 @@ /***************************************************************************** * opengl.c: OpenGL video output ***************************************************************************** - * Copyright (C) 2004 VideoLAN + * Copyright (C) 2004 the VideoLAN team * $Id$ * * Authors: Cyril Deguet @@ -20,7 +20,7 @@ * * 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. *****************************************************************************/ /***************************************************************************** @@ -33,7 +33,7 @@ #include #include -#ifdef SYS_DARWIN +#ifdef __APPLE__ #include #include @@ -64,9 +64,25 @@ #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 + +#ifndef GL_CLAMP_TO_EDGE +# define GL_CLAMP_TO_EDGE 0x812F #endif /* OpenGL effects */ @@ -96,12 +112,16 @@ static int SendEvents( vlc_object_t *, char const *, * 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." ) +/***************************************************************************** + * Module descriptor + *****************************************************************************/ +#define SPEED_TEXT N_( "OpenGL cube rotation speed" ) +#define SPEED_LONGTEXT N_( "Rotation speed of the OpenGL cube effect, if " \ + "enabled." ) -#define EFFECT_TEXT N_("Select effect") +#define EFFECT_TEXT N_("Effect") #define EFFECT_LONGTEXT N_( \ - "Allows you to select different visual effects.") + "Several visual OpenGL effects are available." ) static char *ppsz_effects[] = { "none", "cube", "transparent-cube" }; @@ -109,18 +129,21 @@ static char *ppsz_effects_text[] = { N_("None"), N_("Cube"), N_("Transparent Cube") }; vlc_module_begin(); + set_shortname( "OpenGL" ); + set_category( CAT_VIDEO ); + set_subcategory( SUBCAT_VIDEO_VOUT ); set_description( _("OpenGL video output") ); -#ifdef SYS_DARWIN +#ifdef __APPLE__ set_capability( "video output", 200 ); #else set_capability( "video output", 20 ); #endif add_shortcut( "opengl" ); add_float( "opengl-cube-speed", 2.0, NULL, SPEED_TEXT, - SPEED_LONGTEXT, VLC_FALSE ); + SPEED_LONGTEXT, VLC_TRUE ); set_callbacks( CreateVout, DestroyVout ); add_string( "opengl-effect", "none", NULL, EFFECT_TEXT, - EFFECT_LONGTEXT, VLC_TRUE ); + EFFECT_LONGTEXT, VLC_FALSE ); change_string_list( ppsz_effects, ppsz_effects_text, 0 ); vlc_module_end(); @@ -164,13 +187,13 @@ static int CreateVout( vlc_object_t *p_this ) var_Create( p_vout, "opengl-effect", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); p_sys->i_index = 0; -#ifdef SYS_DARWIN - p_sys->i_tex_width = p_vout->render.i_width; - p_sys->i_tex_height = p_vout->render.i_height; +#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, @@ -192,6 +215,8 @@ 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->fmt_render = p_vout->fmt_render; + p_sys->p_vout->fmt_in = p_vout->fmt_in; p_sys->p_vout->b_scale = p_vout->b_scale; p_sys->p_vout->i_alignment = p_vout->i_alignment; @@ -219,6 +244,7 @@ static int CreateVout( vlc_object_t *p_this ) 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-button-down", VLC_VAR_INTEGER ); var_Create( p_sys->p_vout, "video-on-top", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); @@ -226,6 +252,7 @@ static int CreateVout( vlc_object_t *p_this ) 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 ); return VLC_SUCCESS; } @@ -241,15 +268,17 @@ static int Init( vout_thread_t *p_vout ) 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'); - 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 + +#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'); p_vout->output.i_rmask = 0x000000ff; p_vout->output.i_gmask = 0x0000ff00; @@ -268,7 +297,6 @@ static int Init( vout_thread_t *p_vout ) p_vout->output.i_gmask = 0x0000ff00; p_vout->output.i_bmask = 0x00ff0000; i_pixel_pitch = 4; -#endif #endif /* Since OpenGL can do rescaling for us, stick to the default @@ -277,20 +305,23 @@ 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" ); + 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" ); + msg_Err( p_vout, "out of memory" ); return -1; } @@ -432,11 +463,27 @@ 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 ) ) { @@ -516,16 +563,17 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic ) return; } -#ifdef SYS_DARWIN +#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] ); @@ -537,8 +585,9 @@ 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 ) @@ -553,39 +602,47 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic ) static void DisplayVideo( vout_thread_t *p_vout, picture_t *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 OpenGL providers can call pf_display to force redraw. Currently, the OS X provider uses it to get a smooth window resizing */ - 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; - } - 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_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( 0.0, f_height ); glVertex2f( -1.0, -1.0 ); + glTexCoord2f( f_x, f_height ); glVertex2f( -1.0, -1.0 ); glEnd(); } else @@ -596,40 +653,40 @@ static void DisplayVideo( vout_thread_t *p_vout, picture_t *p_pic ) 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_x, f_y ); glVertex3f( - 1.0, 1.0, 1.0 ); + glTexCoord2f( f_x, 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 ); + glTexCoord2f( f_width, f_y ); 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_x, f_y ); glVertex3f( - 1.0, 1.0, - 1.0 ); + glTexCoord2f( f_x, 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 ); + glTexCoord2f( f_width, f_y ); 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_x, f_y ); glVertex3f( 1.0, 1.0, - 1.0 ); + glTexCoord2f( f_x, 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 ); + glTexCoord2f( f_width, f_y ); 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_x, f_y ); glVertex3f( 1.0, 1.0, 1.0 ); + glTexCoord2f( f_x, 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 ); + glTexCoord2f( f_width, f_y ); 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_x, f_y ); glVertex3f( - 1.0, 1.0, - 1.0 ); + glTexCoord2f( f_x, 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 ); + glTexCoord2f( f_width, f_y ); 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_x, f_y ); glVertex3f( - 1.0, - 1.0, 1.0 ); + glTexCoord2f( f_x, 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 ); + glTexCoord2f( f_width, f_y ); glVertex3f( 1.0, - 1.0, 1.0 ); glEnd(); } @@ -661,10 +718,17 @@ 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 + switch( i_query ) + { + case VOUT_SNAPSHOT: return vout_vaControlDefault( p_vout, i_query, args ); + + 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 ) @@ -678,24 +742,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,