* Authors: Cyril Deguet <asmax@videolan.org>
* Gildas Bazin <gbazin@videolan.org>
* Eric Petit <titer@m0k.org>
- * Cedric Cocquebert <cedric.cocquebert@supelec.fr>
+ * Cedric Cocquebert <cedric.cocquebert@supelec.fr>
*
* 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
/*****************************************************************************
* Preamble
*****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <errno.h> /* ENOMEM */
-#include <stdlib.h> /* malloc(), free() */
-#include <string.h>
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_vout.h>
#ifdef __APPLE__
-#include <OpenGL/gl.h>
-#include <OpenGL/glext.h>
+# include <OpenGL/gl.h>
+# include <OpenGL/glext.h>
+#else
+# include <GL/gl.h>
+#endif
+#ifndef YCBCR_MESA
+# define YCBCR_MESA 0x8757
+#endif
+#ifndef UNSIGNED_SHORT_8_8_MESA
+# define UNSIGNED_SHORT_8_8_MESA 0x85BA
+#endif
+/* RV16 */
+#ifndef GL_UNSIGNED_SHORT_5_6_5
+# define GL_UNSIGNED_SHORT_5_6_5 0x8363
+#endif
+#ifndef GL_CLAMP_TO_EDGE
+# define GL_CLAMP_TO_EDGE 0x812F
+#endif
+
+#ifdef __APPLE__
/* On OS X, use GL_TEXTURE_RECTANGLE_EXT instead of GL_TEXTURE_2D.
This allows sizes which are not powers of 2 */
-#define VLCGL_TARGET GL_TEXTURE_RECTANGLE_EXT
+# define VLCGL_TARGET GL_TEXTURE_RECTANGLE_EXT
/* OS X OpenGL supports YUV. Hehe. */
-#define VLCGL_FORMAT GL_YCBCR_422_APPLE
-#define VLCGL_TYPE GL_UNSIGNED_SHORT_8_8_APPLE
+# define VLCGL_FORMAT GL_YCBCR_422_APPLE
+# define VLCGL_TYPE GL_UNSIGNED_SHORT_8_8_APPLE
#else
-#include <GL/gl.h>
-#define VLCGL_TARGET GL_TEXTURE_2D
-
-/* RV16 */
-#ifndef GL_UNSIGNED_SHORT_5_6_5
-#define GL_UNSIGNED_SHORT_5_6_5 0x8363
-#endif
-//#define VLCGL_RGB_FORMAT GL_RGB
-//#define VLCGL_RGB_TYPE GL_UNSIGNED_SHORT_5_6_5
-
-/* RV24 */
-//#define VLCGL_RGB_FORMAT GL_RGB
-//#define VLCGL_RGB_TYPE GL_UNSIGNED_BYTE
+# define VLCGL_TARGET GL_TEXTURE_2D
/* RV32 */
-#define VLCGL_RGB_FORMAT GL_RGBA
-#define VLCGL_RGB_TYPE GL_UNSIGNED_BYTE
+# 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
+# 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
+# define VLCGL_FORMAT VLCGL_RGB_FORMAT
+# define VLCGL_TYPE VLCGL_RGB_TYPE
#endif
-#ifndef GL_CLAMP_TO_EDGE
-# define GL_CLAMP_TO_EDGE 0x812F
-#endif
-
-/* OpenGL effects */
-#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
-#endif
-
-#ifdef OPENGL_MORE_EFFECT
- #include <math.h>
- #ifdef SYS_DARWIN
- #include <OpenGL/glu.h>
- #else
- #include <GL/glu.h>
- #endif
-/* 3D MODEL */
- #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") };
-#endif
/*****************************************************************************
* Vout interface
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
- *****************************************************************************/
-#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" )
-#define RADIUS_LONGTEXT N_( "Radius of the OpenGL cylinder effect, if enabled" )
-#define POV_X_TEXT N_("Point of view x-coordinate")
-#define POV_X_LONGTEXT N_("Point of view (X coordinate) of the cube/cylinder "\
- "effect, if enabled.")
-#define POV_Y_TEXT N_("Point of view y-coordinate")
-#define POV_Y_LONGTEXT N_("Point of view (Y coordinate) of the cube/cylinder "\
- "effect, if enabled.")
-#define POV_Z_TEXT N_("Point of view z-coordinate")
-#define POV_Z_LONGTEXT N_("Point of view (Z coordinate) of the cube/cylinder "\
- "effect, if enabled.")
-#endif
-#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_("Effect")
-#define EFFECT_LONGTEXT N_( \
- "Several visual OpenGL effects are available." )
-
-#ifndef OPENGL_MORE_EFFECT
-static char *ppsz_effects[] = {
- "none", "cube", "transparent-cube" };
-static char *ppsz_effects_text[] = {
- N_("None"), N_("Cube"), N_("Transparent Cube") };
-#endif
+#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( _("OpenGL video output") );
+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 );
+ 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_TRUE );
-#ifdef OPENGL_MORE_EFFECT
- add_integer_with_range( "opengl-accuracy", 4, 1, 10, NULL, ACCURACY_TEXT,
- ACCURACY_LONGTEXT, VLC_TRUE );
- add_float_with_range( "opengl-pov-x", 0.0, -1.0, 1.0, NULL, POV_X_TEXT,
- POV_X_LONGTEXT, VLC_TRUE );
- add_float_with_range( "opengl-pov-y", 0.0, -1.0, 1.0, NULL, POV_Y_TEXT,
- POV_Y_LONGTEXT, VLC_TRUE );
- add_float_with_range( "opengl-pov-z", -1.0, -1.0, 1.0, NULL, POV_Z_TEXT,
- POV_Z_LONGTEXT, VLC_TRUE );
- add_float( "opengl-cylinder-radius", -100.0, NULL, RADIUS_TEXT,
- RADIUS_LONGTEXT, VLC_TRUE );
-
+ set_capability( "video output", 20 )
#endif
- 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 );
-vlc_module_end();
+ add_shortcut( "opengl" )
+ /* Allow opengl provider plugin selection */
+ add_module( "opengl-provider", "opengl provider", NULL, NULL,
+ PROVIDER_TEXT, PROVIDER_LONGTEXT, true )
+ set_callbacks( CreateVout, DestroyVout )
+vlc_module_end ()
/*****************************************************************************
* vout_sys_t: video output method descriptor
int i_tex_width;
int i_tex_height;
GLuint p_textures[2];
-
- int i_effect;
-
- float f_speed;
- float f_radius;
};
/*****************************************************************************
{
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;
p_sys->i_index = 0;
#ifdef __APPLE__
/* 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 );
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->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;
+ var_Create( p_sys->p_vout, "video-deco",
+ VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
+
+ /* Forward events from the opengl provider */
+ 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_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_sys->p_vout, "video-on-top", SendEvents, p_vout );
+ var_AddCallback( p_vout, "autoscale", SendEvents, p_sys->p_vout );
+ var_AddCallback( p_vout, "scale", SendEvents, p_sys->p_vout );
+ psz = var_CreateGetString( p_vout, "opengl-provider" );
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 );
+ /* no need for var_DelCallback here :-) */
+ vlc_object_release( p_sys->p_vout );
+ free( p_sys );
return VLC_ENOOBJ;
}
- p_sys->f_speed = var_CreateGetFloat( p_vout, "opengl-cube-speed" );
- p_sys->f_radius = var_CreateGetFloat( p_vout, "opengl-cylinder-radius" );
-
p_vout->pf_init = Init;
p_vout->pf_end = End;
p_vout->pf_manage = Manage;
p_vout->pf_display = DisplayVideo;
p_vout->pf_control = Control;
- /* Forward events from the opengl provider */
- 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-button-down", VLC_VAR_INTEGER );
- var_Create( p_sys->p_vout, "video-on-top",
- VLC_VAR_BOOL | 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 );
-
return VLC_SUCCESS;
}
{
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 );
/* 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_chroma = VLC_CODEC_YUYV;
i_pixel_pitch = 2;
-#elif (VLCGL_FORMAT == GL_YCBCR_422_APPLE)
- p_vout->output.i_chroma = VLC_FOURCC('U','Y','V','Y');
+#elif defined( GL_YCBCR_422_APPLE ) && (VLCGL_FORMAT == GL_YCBCR_422_APPLE)
+ p_vout->output.i_chroma = VLC_CODEC_UYVY;
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_chroma = VLC_CODEC_RGB24;
# if defined( WORDS_BIGENDIAN )
p_vout->output.i_rmask = 0x00ff0000;
p_vout->output.i_gmask = 0x0000ff00;
# endif
i_pixel_pitch = 3;
# else
- p_vout->output.i_chroma = VLC_FOURCC('R','V','1','6');
+ p_vout->output.i_chroma = VLC_CODEC_RGB16;
# if defined( WORDS_BIGENDIAN )
p_vout->output.i_rmask = 0x001f;
p_vout->output.i_gmask = 0x07e0;
i_pixel_pitch = 2;
# endif
#else
- p_vout->output.i_chroma = VLC_FOURCC('R','V','3','2');
+ p_vout->output.i_chroma = VLC_CODEC_RGB32;
# if defined( WORDS_BIGENDIAN )
p_vout->output.i_rmask = 0xff000000;
p_vout->output.i_gmask = 0x00ff0000;
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];
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);
- }
- 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
- {
-#ifdef OPENGL_MORE_EFFECT
- 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;
- }
-#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 );
-
- 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 );
- }
-#ifdef OPENGL_MORE_EFFECT
- else
- {
- /* 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, -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 )
{
p_sys->p_vout->pf_unlock( p_sys->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 )
{
p_sys->p_vout->pf_unlock( p_sys->p_vout );
}
+
+ /* We must release the opengl provider here: opengl requiere init and end
+ to be done in the same thread */
+ module_unneed( p_sys->p_vout, p_sys->p_vout->p_module );
+ vlc_object_release( p_sys->p_vout );
}
/*****************************************************************************
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( p_sys );
}
if( i_fullscreen_change )
{
InitTextures( p_vout );
-
- switch( p_sys->i_effect )
- {
- 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
- 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 );
- }
-#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
}
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;
}
*****************************************************************************/
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:
}
}
-
-#ifdef OPENGL_MORE_EFFECT
-/*****************************************************************************
- * 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)
-{
- 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 = (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)
- {
-/* 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;
-/* OTHER WAY: 3D MODEL */
- default:
- xnew = x;
- ynew = y;
- }
-
- *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)
-{
- float f_z = 0.0;
- double d_p = p / 100.0;
-
- 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;
-/* 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;
-}
-#endif
-
-
/*****************************************************************************
* DisplayVideo: displays previously rendered output
*****************************************************************************/
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;
glClear( GL_COLOR_BUFFER_BIT );
- if( p_sys->i_effect == OPENGL_EFFECT_NONE )
- {
- 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();
- }
- 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
-#endif
- {
- glRotatef( 0.5 * p_sys->f_speed , 0.3, 0.5, 0.7 );
-
- glEnable( VLCGL_TARGET );
- glBegin( GL_QUADS );
-
- /* Front */
- 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, f_y ); glVertex3f( 1.0, 1.0, 1.0 );
-
- /* Left */
- 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, f_y ); glVertex3f( - 1.0, 1.0, 1.0 );
-
- /* Back */
- 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, f_y ); glVertex3f( - 1.0, 1.0, - 1.0 );
-
- /* Right */
- 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, f_y ); glVertex3f( 1.0, 1.0, - 1.0 );
-
- /* Top */
- 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, f_y ); glVertex3f( 1.0, 1.0, - 1.0 );
-
- /* Bottom */
- 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, f_y ); 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 );
{
vout_sys_t *p_sys = p_vout->p_sys;
- 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 );
- }
+ if( p_sys->p_vout->pf_control )
+ return p_sys->p_vout->pf_control( p_sys->p_vout, i_query, args );
+ return VLC_EGENERIC;
}
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 );
}
projects / vlc / blobdiff