X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_output%2Fopengl.c;h=32d56e256f6af68184698eb381855b16bbc7e196;hb=d0076456024468810073f43605e70e91cd3322c0;hp=a19c7683d4f345c582dde089ba6696e688958fda;hpb=bcc2752b97adb71e93ac2fdcab8c8241d4bcda2b;p=vlc diff --git a/modules/video_output/opengl.c b/modules/video_output/opengl.c index a19c7683d4..32d56e256f 100644 --- a/modules/video_output/opengl.c +++ b/modules/video_output/opengl.c @@ -7,7 +7,7 @@ * Authors: Cyril Deguet * Gildas Bazin * Eric Petit - * Cedric Cocquebert + * 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 @@ -27,12 +27,16 @@ /***************************************************************************** * Preamble *****************************************************************************/ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include /* ENOMEM */ -#include /* malloc(), free() */ -#include -#include -#include +#include +#include +#include #ifdef __APPLE__ #include @@ -90,37 +94,37 @@ #define OPENGL_EFFECT_NONE 1 #define OPENGL_EFFECT_CUBE 2 #define OPENGL_EFFECT_TRANSPARENT_CUBE 4 -#if defined( HAVE_GL_GLU_H ) || defined( SYS_DARWIN ) - #define OPENGL_MORE_EFFECT 8 +#if defined( HAVE_GL_GLU_H ) || defined( __APPLE__ ) + #define OPENGL_MORE_EFFECT 8 #endif #ifdef OPENGL_MORE_EFFECT - #include - #ifdef SYS_DARWIN - #include - #else - #include - #endif + #include + #ifdef __APPLE__ + #include + #else + #include + #endif /* 3D MODEL */ - #define CYLINDER 8 - #define TORUS 16 - #define SPHERE 32 + #define CYLINDER 8 + #define TORUS 16 + #define SPHERE 32 /*GRID2D TRANSFORMATION */ - #define SQUAREXY 64 - #define SQUARER 128 - #define ASINXY 256 - #define ASINR 512 - #define SINEXY 1024 - #define SINER 2048 - #define INIFILE 4096 // not used, just for mark end ... - #define SIGN(x) (x < 0 ? (-1) : 1) - #define PID2 1.570796326794896619231322 - - static char *ppsz_effects[] = { - "none", "cube", "transparent-cube", "cylinder", "torus", "sphere","SQUAREXY","SQUARER", "ASINXY", "ASINR", "SINEXY", "SINER" }; - static char *ppsz_effects_text[] = { - N_("None"), N_("Cube"), N_("Transparent Cube"), - N_("Cylinder"), N_("Torus"), N_("Sphere"), N_("SQUAREXY"),N_("SQUARER"), N_("ASINXY"), N_("ASINR"), N_("SINEXY"), N_("SINER") }; + #define SQUAREXY 64 + #define SQUARER 128 + #define ASINXY 256 + #define ASINR 512 + #define SINEXY 1024 + #define SINER 2048 + #define INIFILE 4096 // not used, just for mark end ... + #define SIGN(x) (x < 0 ? (-1) : 1) + #define PID2 1.570796326794896619231322 + + static const char *const ppsz_effects[] = { + "none", "cube", "transparent-cube", "cylinder", "torus", "sphere","SQUAREXY","SQUARER", "ASINXY", "ASINR", "SINEXY", "SINER" }; + static const char *const ppsz_effects_text[] = { + N_("None"), N_("Cube"), N_("Transparent Cube"), + N_("Cylinder"), N_("Torus"), N_("Sphere"), N_("SQUAREXY"),N_("SQUARER"), N_("ASINXY"), N_("ASINR"), N_("SINEXY"), N_("SINER") }; #endif /***************************************************************************** @@ -137,14 +141,17 @@ 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 * ); + +#ifdef OPENGL_MORE_EFFECT +static float Z_Compute ( float, int, float, float ); +static void Transform ( int, float, float, int, int, int, int, double *, double * ); /***************************************************************************** * Module descriptor *****************************************************************************/ -#ifdef OPENGL_MORE_EFFECT #define ACCURACY_TEXT N_( "OpenGL sampling accuracy " ) #define ACCURACY_LONGTEXT N_( "Select the accuracy of 3D object sampling(1 = min and 10 = max)" ) #define RADIUS_TEXT N_( "OpenGL Cylinder radius" ) @@ -159,6 +166,8 @@ static int SendEvents( vlc_object_t *, char const *, #define POV_Z_LONGTEXT N_("Point of view (Z coordinate) of the cube/cylinder "\ "effect, if enabled.") #endif +#define PROVIDER_TEXT N_("OpenGL Provider") +#define PROVIDER_LONGTEXT N_("Allows you to modify what OpenGL provider should be used") #define SPEED_TEXT N_( "OpenGL cube rotation speed" ) #define SPEED_LONGTEXT N_( "Rotation speed of the OpenGL cube effect, if " \ "enabled." ) @@ -167,9 +176,9 @@ static int SendEvents( vlc_object_t *, char const *, "Several visual OpenGL effects are available." ) #ifndef OPENGL_MORE_EFFECT -static char *ppsz_effects[] = { +static const char *const ppsz_effects[] = { "none", "cube", "transparent-cube" }; -static char *ppsz_effects_text[] = { +static const char *const ppsz_effects_text[] = { N_("None"), N_("Cube"), N_("Transparent Cube") }; #endif @@ -177,7 +186,7 @@ vlc_module_begin(); set_shortname( "OpenGL" ); set_category( CAT_VIDEO ); set_subcategory( SUBCAT_VIDEO_VOUT ); - set_description( _("OpenGL video output") ); + set_description( N_("OpenGL video output") ); #ifdef __APPLE__ set_capability( "video output", 200 ); #else @@ -185,24 +194,27 @@ vlc_module_begin(); #endif add_shortcut( "opengl" ); add_float( "opengl-cube-speed", 2.0, NULL, SPEED_TEXT, - SPEED_LONGTEXT, VLC_TRUE ); + SPEED_LONGTEXT, true ); #ifdef OPENGL_MORE_EFFECT add_integer_with_range( "opengl-accuracy", 4, 1, 10, NULL, ACCURACY_TEXT, - ACCURACY_LONGTEXT, VLC_TRUE ); + ACCURACY_LONGTEXT, true ); add_float_with_range( "opengl-pov-x", 0.0, -1.0, 1.0, NULL, POV_X_TEXT, - POV_X_LONGTEXT, VLC_TRUE ); + POV_X_LONGTEXT, true ); add_float_with_range( "opengl-pov-y", 0.0, -1.0, 1.0, NULL, POV_Y_TEXT, - POV_Y_LONGTEXT, VLC_TRUE ); + POV_Y_LONGTEXT, true ); add_float_with_range( "opengl-pov-z", -1.0, -1.0, 1.0, NULL, POV_Z_TEXT, - POV_Z_LONGTEXT, VLC_TRUE ); + POV_Z_LONGTEXT, true ); add_float( "opengl-cylinder-radius", -100.0, NULL, RADIUS_TEXT, - RADIUS_LONGTEXT, VLC_TRUE ); + RADIUS_LONGTEXT, true ); #endif + /* Allow opengl provider plugin selection */ + add_string( "opengl-provider", "default", NULL, PROVIDER_TEXT, + PROVIDER_LONGTEXT, true ); set_callbacks( CreateVout, DestroyVout ); add_string( "opengl-effect", "none", NULL, EFFECT_TEXT, - EFFECT_LONGTEXT, VLC_FALSE ); - change_string_list( ppsz_effects, ppsz_effects_text, 0 ); + EFFECT_LONGTEXT, false ); + change_string_list( ppsz_effects, ppsz_effects_text, 0 ); vlc_module_end(); /***************************************************************************** @@ -234,14 +246,12 @@ 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; - } + return VLC_ENOMEM; var_Create( p_vout, "opengl-effect", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); @@ -279,13 +289,19 @@ static int CreateVout( vlc_object_t *p_this ) p_sys->p_vout->b_scale = p_vout->b_scale; 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, 0 ); + 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; } @@ -391,17 +407,11 @@ static int Init( vout_thread_t *p_vout ) 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]; @@ -459,26 +469,26 @@ static int Init( vout_thread_t *p_vout ) else { #ifdef OPENGL_MORE_EFFECT - p_sys->i_effect = 3; + p_sys->i_effect = 3; while (( strcmp( val.psz_string, ppsz_effects[p_sys->i_effect]) ) && (pow(2,p_sys->i_effect) < INIFILE)) { p_sys->i_effect ++; } - if (pow(2,p_sys->i_effect) < INIFILE) - p_sys->i_effect = pow(2,p_sys->i_effect); - else if ( strcmp( val.psz_string, ppsz_effects[p_sys->i_effect])) - { - msg_Warn( p_vout, "no valid opengl effect provided, using " - "\"none\"" ); - p_sys->i_effect = OPENGL_EFFECT_NONE; - } + if (pow(2,p_sys->i_effect) < INIFILE) + p_sys->i_effect = pow(2,p_sys->i_effect); + else if ( strcmp( val.psz_string, ppsz_effects[p_sys->i_effect])) + { + msg_Warn( p_vout, "no valid opengl effect provided, using " + "\"none\"" ); + p_sys->i_effect = OPENGL_EFFECT_NONE; + } #else msg_Warn( p_vout, "no valid opengl effect provided, using " "\"none\"" ); p_sys->i_effect = OPENGL_EFFECT_NONE; #endif } - if( val.psz_string ) free( val.psz_string ); + free( val.psz_string ); if( p_sys->i_effect & ( OPENGL_EFFECT_CUBE | OPENGL_EFFECT_TRANSPARENT_CUBE ) ) @@ -492,7 +502,7 @@ static int Init( vout_thread_t *p_vout ) glTranslatef( 0.0, 0.0, - 5.0 ); } #ifdef OPENGL_MORE_EFFECT - else + else { /* Set the perpective */ glMatrixMode( GL_PROJECTION ); @@ -502,11 +512,11 @@ static int Init( vout_thread_t *p_vout ) glLoadIdentity(); glTranslatef( 0.0, 0.0, -3.0 ); - float f_pov_x, f_pov_y, f_pov_z; - f_pov_x = var_CreateGetFloat( p_vout, "opengl-pov-x"); - f_pov_y = var_CreateGetFloat( p_vout, "opengl-pov-y"); - f_pov_z = var_CreateGetFloat( p_vout, "opengl-pov-z"); - gluLookAt(0, 0, 0, f_pov_x, f_pov_y, f_pov_z, 0, 1, 0); + float f_pov_x, f_pov_y, f_pov_z; + f_pov_x = var_CreateGetFloat( p_vout, "opengl-pov-x"); + f_pov_y = var_CreateGetFloat( p_vout, "opengl-pov-y"); + f_pov_z = var_CreateGetFloat( p_vout, "opengl-pov-z"); + gluLookAt(0, 0, 0, f_pov_x, f_pov_y, f_pov_z, 0, 1, 0); } #endif if( p_sys->p_vout->pf_unlock ) @@ -536,8 +546,8 @@ static void End( vout_thread_t *p_vout ) /* Free the texture buffer*/ glDeleteTextures( 2, p_sys->p_textures ); - if( p_sys->pp_buffer[0] ) free( p_sys->pp_buffer[0] ); - if( p_sys->pp_buffer[1] ) free( p_sys->pp_buffer[1] ); + free( p_sys->pp_buffer[0] ); + free( p_sys->pp_buffer[1] ); if( p_sys->p_vout->pf_unlock ) { @@ -556,8 +566,7 @@ static void DestroyVout( vlc_object_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 ); + vlc_object_release( p_sys->p_vout ); free( p_sys ); } @@ -613,16 +622,16 @@ static int Manage( vout_thread_t *p_vout ) { case OPENGL_EFFECT_CUBE: #ifdef OPENGL_MORE_EFFECT - case CYLINDER: - case TORUS: - case SPHERE: - case SQUAREXY: - case SQUARER: - case ASINXY: - case ASINR: - case SINEXY: - case SINER: -#endif + case CYLINDER: + case TORUS: + case SPHERE: + case SQUAREXY: + case SQUARER: + case ASINXY: + case ASINR: + case SINEXY: + case SINER: +#endif glEnable( GL_CULL_FACE ); break; @@ -645,22 +654,22 @@ static int Manage( vout_thread_t *p_vout ) glTranslatef( 0.0, 0.0, - 5.0 ); } #ifdef OPENGL_MORE_EFFECT - else - { - 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, -3.0 ); - - float f_pov_x, f_pov_y, f_pov_z; - f_pov_x = var_CreateGetFloat( p_vout, "opengl-pov-x"); - f_pov_y = var_CreateGetFloat( p_vout, "opengl-pov-y"); - f_pov_z = var_CreateGetFloat( p_vout, "opengl-pov-z"); - gluLookAt(0, 0, 0, f_pov_x, f_pov_y, f_pov_z, 0, 1, 0); - } -#endif + else + { + 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, -3.0 ); + + float f_pov_x, f_pov_y, f_pov_z; + f_pov_x = var_CreateGetFloat( p_vout, "opengl-pov-x"); + f_pov_y = var_CreateGetFloat( p_vout, "opengl-pov-y"); + f_pov_z = var_CreateGetFloat( p_vout, "opengl-pov-z"); + gluLookAt(0, 0, 0, f_pov_x, f_pov_y, f_pov_z, 0, 1, 0); + } +#endif } if( p_sys->p_vout->pf_unlock ) @@ -668,7 +677,12 @@ static int Manage( vout_thread_t *p_vout ) 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; + } return i_ret; } @@ -677,6 +691,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: @@ -741,107 +756,106 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic ) /***************************************************************************** * Transform: Calculate the distorted grid coordinates *****************************************************************************/ -void Transform(float p, int distortion, float width, float height,int i, int j, int i_visible_width, int i_visible_height, double *ix,double *iy) +static void Transform( int distortion, float width, float height,int i, int j, int i_visible_width, int i_visible_height, double *ix, double *iy ) { - double x,y,xnew,ynew; - double r,theta,rnew,thetanew; + double x,y,xnew,ynew; + double r,theta,rnew,thetanew; - x = (double)i * (width / ((double)i_visible_width)); - y = (double)j * (height / ((double)i_visible_height)); + x = (double)i * (width / ((double)i_visible_width)); + y = (double)j * (height / ((double)i_visible_height)); - x = (2.0 * (double)x / width) - 1; - y = (2.0 * (double)y / height) - 1; - xnew = x; - ynew = y; - r = sqrt(x*x+y*y); - theta = atan2(y,x); + x = (2.0 * (double)x / width) - 1; + y = (2.0 * (double)y / height) - 1; + xnew = x; + ynew = y; + r = sqrt(x*x+y*y); + theta = atan2(y,x); - switch (distortion) - { + switch (distortion) + { /* GRID2D TRANSFORMATION */ - case SINEXY: - xnew = sin(PID2*x); - ynew = sin(PID2*y); - break; - case SINER: - rnew = sin(PID2*r); - thetanew = theta; - xnew = rnew * cos(thetanew); - ynew = rnew * sin(thetanew); - break; - case SQUAREXY: - xnew = x*x*SIGN(x); - ynew = y*y*SIGN(y); - break; - case SQUARER: - rnew = r*r; - thetanew = theta; - xnew = rnew * cos(thetanew); - ynew = rnew * sin(thetanew); - break; - case ASINXY: - xnew = asin(x) / PID2; - ynew = asin(y) / PID2; - break; - case ASINR: - rnew = asin(r) / PID2; - thetanew = theta; - xnew = rnew * cos(thetanew); - ynew = rnew * sin(thetanew); - break; + case SINEXY: + xnew = sin(PID2*x); + ynew = sin(PID2*y); + break; + case SINER: + rnew = sin(PID2*r); + thetanew = theta; + xnew = rnew * cos(thetanew); + ynew = rnew * sin(thetanew); + break; + case SQUAREXY: + xnew = x*x*SIGN(x); + ynew = y*y*SIGN(y); + break; + case SQUARER: + rnew = r*r; + thetanew = theta; + xnew = rnew * cos(thetanew); + ynew = rnew * sin(thetanew); + break; + case ASINXY: + xnew = asin(x) / PID2; + ynew = asin(y) / PID2; + break; + case ASINR: + rnew = asin(r) / PID2; + thetanew = theta; + xnew = rnew * cos(thetanew); + ynew = rnew * sin(thetanew); + break; /* OTHER WAY: 3D MODEL */ - default: - xnew = x; - ynew = y; - } + default: + xnew = x; + ynew = y; + } - *ix = width * (xnew + 1) / (2.0); - *iy = height * (ynew + 1) / (2.0); + *ix = width * (xnew + 1) / (2.0); + *iy = height * (ynew + 1) / (2.0); } - /***************************************************************************** * Z_Compute: Calculate the Z-coordinate *****************************************************************************/ -float Z_Compute(float p, int distortion, float x, float y) +static float Z_Compute(float p, int distortion, float x, float y) { - float f_z = 0.0; - double d_p = p / 100.0; + float f_z = 0.0; + double d_p = p / 100.0; - switch (distortion) - { + switch (distortion) + { /* 3D MODEL */ - case CYLINDER: - if (d_p > 0) - f_z = (1 - d_p * d_p) / (2 * d_p) - sqrt(fabs((d_p * d_p + 1) / (2 * d_p) * (d_p * d_p + 1) / (2 * d_p) - x * x)); - else - f_z = (1 - d_p * d_p) / (2 * d_p) + d_p + sqrt(fabs((d_p * d_p + 1) / (2 * d_p) * (d_p * d_p + 1) / (2 * d_p) - x * x)); - break; - case TORUS: - if (d_p > 0) - f_z = (1 - d_p * d_p) / (d_p) - sqrt(fabs((d_p * d_p + 1) / (2 * d_p) * (d_p * d_p + 1) / (2 * d_p) - x * x)) - sqrt(fabs((d_p * d_p + 1) / (2 * d_p) * (d_p * d_p + 1) / (2 * d_p) - y * y)); - else - f_z = (1 - d_p * d_p) / (d_p) + 2 * d_p + sqrt(fabs((d_p * d_p + 1) / (2 * d_p) * (d_p * d_p + 1) / (2 * d_p) - x * x)) + sqrt(fabs((d_p * d_p + 1) / (2 * d_p) * (d_p * d_p + 1) / (2 * d_p) - y * y)); - break; - case SPHERE: - if (d_p > 0) - f_z = (1 - d_p * d_p) / (2 * d_p) - sqrt(fabs((d_p * d_p + 1) / (2 * d_p) * (d_p * d_p + 1) / (2 * d_p) - x * x - y * y)); - else - f_z = (1 - d_p * d_p) / (2 * d_p) + d_p + sqrt(fabs((d_p * d_p + 1) / (2 * d_p) * (d_p * d_p + 1) / (2 * d_p) - x * x - y * y)); - break; + case CYLINDER: + if (d_p > 0) + f_z = (1 - d_p * d_p) / (2 * d_p) - sqrt(fabs((d_p * d_p + 1) / (2 * d_p) * (d_p * d_p + 1) / (2 * d_p) - x * x)); + else + f_z = (1 - d_p * d_p) / (2 * d_p) + d_p + sqrt(fabs((d_p * d_p + 1) / (2 * d_p) * (d_p * d_p + 1) / (2 * d_p) - x * x)); + break; + case TORUS: + if (d_p > 0) + f_z = (1 - d_p * d_p) / (d_p) - sqrt(fabs((d_p * d_p + 1) / (2 * d_p) * (d_p * d_p + 1) / (2 * d_p) - x * x)) - sqrt(fabs((d_p * d_p + 1) / (2 * d_p) * (d_p * d_p + 1) / (2 * d_p) - y * y)); + else + f_z = (1 - d_p * d_p) / (d_p) + 2 * d_p + sqrt(fabs((d_p * d_p + 1) / (2 * d_p) * (d_p * d_p + 1) / (2 * d_p) - x * x)) + sqrt(fabs((d_p * d_p + 1) / (2 * d_p) * (d_p * d_p + 1) / (2 * d_p) - y * y)); + break; + case SPHERE: + if (d_p > 0) + f_z = (1 - d_p * d_p) / (2 * d_p) - sqrt(fabs((d_p * d_p + 1) / (2 * d_p) * (d_p * d_p + 1) / (2 * d_p) - x * x - y * y)); + else + f_z = (1 - d_p * d_p) / (2 * d_p) + d_p + sqrt(fabs((d_p * d_p + 1) / (2 * d_p) * (d_p * d_p + 1) / (2 * d_p) - x * x - y * y)); + break; /* OTHER WAY: GRID2D TRANSFORMATION */ - case SINEXY:; - case SINER: - case SQUAREXY: - case SQUARER:; - case ASINXY: - case ASINR: - f_z = 0.0; - break; - default: - f_z = 0.0; - } - return f_z; + case SINEXY:; + case SINER: + case SQUAREXY: + case SQUARER:; + case ASINXY: + case ASINR: + f_z = 0.0; + break; + default: + f_z = 0.0; + } + return f_z; } #endif @@ -851,6 +865,7 @@ float Z_Compute(float p, int distortion, float x, float y) *****************************************************************************/ 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, f_x, f_y; @@ -897,55 +912,55 @@ static void DisplayVideo( vout_thread_t *p_vout, picture_t *p_pic ) } else #ifdef OPENGL_MORE_EFFECT - if ((p_sys->i_effect > OPENGL_EFFECT_TRANSPARENT_CUBE) || - ((p_sys->i_effect == OPENGL_EFFECT_NONE))) - { - unsigned int i_i, i_j; - unsigned int i_accuracy = config_GetInt( p_vout, "opengl-accuracy"); - unsigned int i_n = pow(2, i_accuracy); - unsigned int i_n_x = (p_vout->fmt_out.i_visible_width / (i_n * 2)); - unsigned int i_n_y = (p_vout->fmt_out.i_visible_height / i_n); - double d_x, d_y; - int i_distortion = p_sys->i_effect; - float f_p = p_sys->f_radius; - - glEnable( VLCGL_TARGET ); - glBegin(GL_QUADS); - for (i_i = 0; i_i < p_vout->fmt_out.i_visible_width; i_i += i_n_x) - { - if ( i_i == i_n_x * i_n / 2) i_n_x += p_vout->fmt_out.i_visible_width % i_n; - if ((i_i == (p_vout->fmt_out.i_visible_width / i_n) * i_n / 2 + i_n_x) && - (p_vout->fmt_out.i_visible_width / i_n != i_n_x)) - i_n_x -= p_vout->fmt_out.i_visible_width % i_n; - - int i_m; - int i_index_max = 0; - - for (i_j = 0; i_j < p_vout->fmt_out.i_visible_height; i_j += i_n_y) - { - if ( i_j == i_n_y * i_n / 2) i_n_y += p_vout->fmt_out.i_visible_height % i_n; - if ((i_j == (p_vout->fmt_out.i_visible_height / i_n) * i_n / 2 + i_n_y) && - (p_vout->fmt_out.i_visible_height / i_n != i_n_y)) - i_n_y -= p_vout->fmt_out.i_visible_height % i_n; - - for (i_m = i_index_max; i_m < i_index_max + 4; i_m++) - { - int i_k = ((i_m % 4) == 1) || ((i_m % 4) == 2); - int i_l = ((i_m % 4) == 2) || ((i_m % 4) == 3); - - Transform(f_p, i_distortion, f_width, f_height, i_i + i_k * i_n_x, i_j + i_l * i_n_y, p_vout->fmt_out.i_visible_width, p_vout->fmt_out.i_visible_height, &d_x, &d_y); - glTexCoord2f(f_x + d_x, f_y + d_y); - d_x = - 1.0 + 2.0 * ((double)(i_k * i_n_x + i_i) / (double)p_vout->fmt_out.i_visible_width); - d_y = 1.0 - 2.0 * (((double)i_l * i_n_y + i_j) / (double)p_vout->fmt_out.i_visible_height); - glVertex3f((float)d_x, (float)d_y, Z_Compute(f_p, i_distortion, (float)d_x, (float)d_y)); - } - } - } - glEnd(); - } - else + if ((p_sys->i_effect > OPENGL_EFFECT_TRANSPARENT_CUBE) || + ((p_sys->i_effect == OPENGL_EFFECT_NONE))) + { + unsigned int i_i, i_j; + unsigned int i_accuracy = config_GetInt( p_vout, "opengl-accuracy"); + unsigned int i_n = pow(2, i_accuracy); + unsigned int i_n_x = (p_vout->fmt_out.i_visible_width / (i_n * 2)); + unsigned int i_n_y = (p_vout->fmt_out.i_visible_height / i_n); + double d_x, d_y; + int i_distortion = p_sys->i_effect; + float f_p = p_sys->f_radius; + + glEnable( VLCGL_TARGET ); + glBegin(GL_QUADS); + for (i_i = 0; i_i < p_vout->fmt_out.i_visible_width; i_i += i_n_x) + { + if ( i_i == i_n_x * i_n / 2) i_n_x += p_vout->fmt_out.i_visible_width % i_n; + if ((i_i == (p_vout->fmt_out.i_visible_width / i_n) * i_n / 2 + i_n_x) && + (p_vout->fmt_out.i_visible_width / i_n != i_n_x)) + i_n_x -= p_vout->fmt_out.i_visible_width % i_n; + + int i_m; + int i_index_max = 0; + + for (i_j = 0; i_j < p_vout->fmt_out.i_visible_height; i_j += i_n_y) + { + if ( i_j == i_n_y * i_n / 2) i_n_y += p_vout->fmt_out.i_visible_height % i_n; + if ((i_j == (p_vout->fmt_out.i_visible_height / i_n) * i_n / 2 + i_n_y) && + (p_vout->fmt_out.i_visible_height / i_n != i_n_y)) + i_n_y -= p_vout->fmt_out.i_visible_height % i_n; + + for (i_m = i_index_max; i_m < i_index_max + 4; i_m++) + { + int i_k = ((i_m % 4) == 1) || ((i_m % 4) == 2); + int i_l = ((i_m % 4) == 2) || ((i_m % 4) == 3); + + Transform( i_distortion, f_width, f_height, i_i + i_k * i_n_x, i_j + i_l * i_n_y, p_vout->fmt_out.i_visible_width, p_vout->fmt_out.i_visible_height, &d_x, &d_y); + glTexCoord2f(f_x + d_x, f_y + d_y); + d_x = - 1.0 + 2.0 * ((double)(i_k * i_n_x + i_i) / (double)p_vout->fmt_out.i_visible_width); + d_y = 1.0 - 2.0 * (((double)i_l * i_n_y + i_j) / (double)p_vout->fmt_out.i_visible_height); + glVertex3f((float)d_x, (float)d_y, Z_Compute(f_p, i_distortion, (float)d_x, (float)d_y)); + } + } + } + glEnd(); + } + else #endif - { + { glRotatef( 0.5 * p_sys->f_speed , 0.3, 0.5, 0.7 ); glEnable( VLCGL_TARGET ); @@ -1085,5 +1100,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 ); }