/*****************************************************************************
* Preamble
*****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <errno.h> /* ENOMEM */
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_vout.h>
#ifdef __APPLE__
#define SIGN(x) (x < 0 ? (-1) : 1)
#define PID2 1.570796326794896619231322
- static const char *ppsz_effects[] = {
+ static const char *const ppsz_effects[] = {
"none", "cube", "transparent-cube", "cylinder", "torus", "sphere","SQUAREXY","SQUARER", "ASINXY", "ASINR", "SINEXY", "SINER" };
- static const char *ppsz_effects_text[] = {
+ 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
#ifdef OPENGL_MORE_EFFECT
static float Z_Compute ( float, int, float, float );
-static void Transform ( float, int, float, float, int, int, int, int, double *, double * );
+static void Transform ( int, float, float, int, int, int, int, double *, double * );
/*****************************************************************************
* Module descriptor
#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." )
"Several visual OpenGL effects are available." )
#ifndef OPENGL_MORE_EFFECT
-static const char *ppsz_effects[] = {
+static const char *const ppsz_effects[] = {
"none", "cube", "transparent-cube" };
-static const char *ppsz_effects_text[] = {
+static const char *const ppsz_effects_text[] = {
N_("None"), N_("Cube"), N_("Transparent Cube") };
#endif
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
#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 );
+ EFFECT_LONGTEXT, false );
change_string_list( ppsz_effects, ppsz_effects_text, 0 );
vlc_module_end();
{
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 );
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;
}
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];
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 ) )
/* 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 )
{
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 );
}
p_vout->i_changes = VOUT_CROP_CHANGE; //to force change
p_sys->p_vout->i_alignment = p_vout->i_alignment;
}
-
return i_ret;
}
*****************************************************************************/
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:
/*****************************************************************************
* Transform: Calculate the distorted grid coordinates
*****************************************************************************/
-static 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;
*****************************************************************************/
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;
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);
+ 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);
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 );
}
projects / vlc / blobdiff