/*****************************************************************************
* sdl.c: SDL video output display method
*****************************************************************************
- * Copyright (C) 1998-2001 VideoLAN
- * $Id: sdl.c,v 1.7 2003/01/13 13:28:55 sam Exp $
+ * Copyright (C) 1998-2001 the VideoLAN team
+ * $Id$
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Pierre Baillet <oct@zoy.org>
*
* 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
*****************************************************************************/
#include <errno.h> /* ENOMEM */
-#include <stdlib.h> /* free() */
-#include <string.h> /* strerror() */
-#include <vlc/vlc.h>
-#include <vlc/intf.h>
-#include <vlc/vout.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_interface.h>
+#include <vlc_playlist.h>
+#include <vlc_vout.h>
+#include <vlc_keys.h>
+//#include <vlc_aout.h>
#include <sys/types.h>
#ifndef WIN32
#include SDL_INCLUDE_FILE
-#include "netutils.h"
-
-#define SDL_MAX_DIRECTBUFFERS 10
+/* SDL is not able to crop overlays - so use only 1 direct buffer */
+#define SDL_MAX_DIRECTBUFFERS 1
#define SDL_DEFAULT_BPP 16
/*****************************************************************************
int i_width;
int i_height;
+#if SDL_VERSION_ATLEAST(1,2,10)
+ unsigned int i_desktop_width;
+ unsigned int i_desktop_height;
+#endif
+
/* For YUV output */
SDL_Overlay * p_overlay; /* An overlay we keep to grab the XVideo port */
/* For RGB output */
int i_surfaces;
- vlc_bool_t b_cursor;
- vlc_bool_t b_cursor_autohidden;
+ bool b_cursor;
+ bool b_cursor_autohidden;
mtime_t i_lastmoved;
+ mtime_t i_mouse_hide_timeout;
mtime_t i_lastpressed; /* to track dbl-clicks */
};
static void SetPalette ( vout_thread_t *,
uint16_t *, uint16_t *, uint16_t * );
+static int ConvertKey( SDLKey );
+
+
+#define CHROMA_TEXT N_("SDL chroma format")
+#define CHROMA_LONGTEXT N_( \
+ "Force the SDL renderer to use a specific chroma format instead of " \
+ "trying to improve performances by using the most efficient one.")
+
/*****************************************************************************
* Module descriptor
*****************************************************************************/
vlc_module_begin();
- set_description( _("Simple DirectMedia Layer video module") );
+ set_shortname( "SDL" );
+ set_category( CAT_VIDEO );
+ set_subcategory( SUBCAT_VIDEO_VOUT );
+ set_description( N_("Simple DirectMedia Layer video output") );
set_capability( "video output", 60 );
add_shortcut( "sdl" );
+ add_string( "sdl-chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT, true );
set_callbacks( Open, Close );
- /* XXX: check for conflicts with the SDL audio output */
- var_Create( p_module->p_libvlc, "sdl", VLC_VAR_MUTEX );
+#if defined( __i386__ ) || defined( __x86_64__ )
+ /* On i386, SDL is linked against svgalib */
+ linked_with_a_crap_library_which_uses_atexit();
+#endif
vlc_module_end();
/*****************************************************************************
static int Open ( vlc_object_t *p_this )
{
vout_thread_t * p_vout = (vout_thread_t *)p_this;
- vlc_value_t lockval;
+ /* XXX: check for conflicts with the SDL audio output */
+ vlc_mutex_t *lock = var_AcquireMutex( "sdl" );
#ifdef HAVE_SETENV
char *psz_method;
#endif
- var_Get( p_this->p_libvlc, "sdl", &lockval );
- vlc_mutex_lock( lockval.p_address );
-
- if( SDL_WasInit( SDL_INIT_VIDEO ) != 0 )
- {
- vlc_mutex_unlock( lockval.p_address );
- return VLC_EGENERIC;
- }
+ if( lock == NULL )
+ return VLC_ENOMEM;
- /* Allocate structure */
p_vout->p_sys = malloc( sizeof( vout_sys_t ) );
if( p_vout->p_sys == NULL )
{
- msg_Err( p_vout, "out of memory" );
- vlc_mutex_unlock( lockval.p_address );
+ vlc_mutex_unlock( lock );
return VLC_ENOMEM;
}
+ memset( p_vout->p_sys, 0, sizeof( vout_sys_t ) );
+
+ /* Check if SDL video module has been initialized */
+ if( SDL_WasInit( SDL_INIT_VIDEO ) != 0 )
+ {
+ vlc_mutex_unlock( lock );
+ free( p_vout->p_sys );
+ return VLC_EGENERIC;
+ }
+
+ /* Allocate structure */
p_vout->pf_init = Init;
p_vout->pf_end = End;
p_vout->pf_manage = Manage;
p_vout->pf_render = NULL;
p_vout->pf_display = Display;
+ p_vout->pf_control = NULL;
#ifdef HAVE_SETENV
- psz_method = config_GetPsz( p_vout, "vout" );
+ char* psz = psz_method = config_GetPsz( p_vout, "vout" );
if( psz_method )
{
while( *psz_method && *psz_method != ':' )
setenv( "SDL_VIDEODRIVER", psz_method + 1, 1 );
}
}
+ free( psz );
#endif
/* Initialize library */
/* Win32 SDL implementation doesn't support SDL_INIT_EVENTTHREAD yet*/
| SDL_INIT_EVENTTHREAD
#endif
-#ifdef DEBUG
+#ifndef NDEBUG
/* In debug mode you may want vlc to dump a core instead of staying
* stuck */
| SDL_INIT_NOPARACHUTE
{
msg_Err( p_vout, "cannot initialize SDL (%s)", SDL_GetError() );
free( p_vout->p_sys );
- vlc_mutex_unlock( lockval.p_address );
+ vlc_mutex_unlock( lock );
return VLC_EGENERIC;
}
- vlc_mutex_unlock( lockval.p_address );
+ vlc_mutex_unlock( lock );
+
+ /* Translate keys into unicode */
+ SDL_EnableUNICODE(1);
+ /* Get the desktop resolution */
+#if SDL_VERSION_ATLEAST(1,2,10)
+ /* FIXME: SDL has a problem with virtual desktop */
+ p_vout->p_sys->i_desktop_width = SDL_GetVideoInfo()->current_w;
+ p_vout->p_sys->i_desktop_height = SDL_GetVideoInfo()->current_h;
+#endif
+
+ /* Create the cursor */
p_vout->p_sys->b_cursor = 1;
p_vout->p_sys->b_cursor_autohidden = 0;
- p_vout->p_sys->i_lastmoved = mdate();
+ p_vout->p_sys->i_lastmoved = p_vout->p_sys->i_lastpressed = mdate();
+ p_vout->p_sys->i_mouse_hide_timeout =
+ var_GetInteger(p_vout, "mouse-hide-timeout") * 1000;
if( OpenDisplay( p_vout ) )
{
msg_Err( p_vout, "cannot set up SDL (%s)", SDL_GetError() );
SDL_QuitSubSystem( SDL_INIT_VIDEO );
free( p_vout->p_sys );
- return( 1 );
+ return VLC_EGENERIC;
}
- return( 0 );
+ return VLC_SUCCESS;
}
/*****************************************************************************
I_OUTPUTPICTURES++;
}
- return( 0 );
+ return VLC_SUCCESS;
}
/*****************************************************************************
* Manage: handle Sys events
*****************************************************************************
* This function should be called regularly by video output thread. It returns
- * a non null value if an error occured.
+ * a non null value if an error occurred.
*****************************************************************************/
static int Manage( vout_thread_t *p_vout )
{
SDL_Event event; /* SDL event */
vlc_value_t val;
- int i_width, i_height, i_x, i_y;
+ unsigned int i_width, i_height, i_x, i_y;
/* Process events */
- while( SDL_PollEvent(&event) )
+ while( SDL_PollEvent( &event ) )
{
switch( event.type )
{
- case SDL_VIDEORESIZE: /* Resizing of window */
- /* Update dimensions */
+ /* Resizing of window */
+ case SDL_VIDEORESIZE:
p_vout->i_changes |= VOUT_SIZE_CHANGE;
p_vout->i_window_width = p_vout->p_sys->i_width = event.resize.w;
p_vout->i_window_height = p_vout->p_sys->i_height = event.resize.h;
break;
+ /* Mouse move */
case SDL_MOUSEMOTION:
vout_PlacePicture( p_vout, p_vout->p_sys->i_width,
p_vout->p_sys->i_height,
&i_x, &i_y, &i_width, &i_height );
- val.i_int = ( event.motion.x - i_x )
- * p_vout->render.i_width / i_width;
+ /* Compute the x coordinate and check if the value is
+ in [0,p_vout->fmt_in.i_visible_width] */
+ val.i_int = ( event.motion.x - i_x ) *
+ p_vout->fmt_in.i_visible_width / i_width +
+ p_vout->fmt_in.i_x_offset;
+
+ if( (int)(event.motion.x - i_x) < 0 )
+ val.i_int = 0;
+ else if( (unsigned int)val.i_int > p_vout->fmt_in.i_visible_width )
+ val.i_int = p_vout->fmt_in.i_visible_width;
+
var_Set( p_vout, "mouse-x", val );
- val.i_int = ( event.motion.y - i_y )
- * p_vout->render.i_height / i_height;
+
+ /* compute the y coordinate and check if the value is
+ in [0,p_vout->fmt_in.i_visible_height] */
+ val.i_int = ( event.motion.y - i_y ) *
+ p_vout->fmt_in.i_visible_height / i_height +
+ p_vout->fmt_in.i_y_offset;
+
+ if( (int)(event.motion.y - i_y) < 0 )
+ val.i_int = 0;
+ else if( (unsigned int)val.i_int > p_vout->fmt_in.i_visible_height )
+ val.i_int = p_vout->fmt_in.i_visible_height;
+
var_Set( p_vout, "mouse-y", val );
- val.b_bool = VLC_TRUE;
+ val.b_bool = true;
var_Set( p_vout, "mouse-moved", val );
- if( p_vout->p_sys->b_cursor &&
- (abs(event.motion.xrel) > 2 || abs(event.motion.yrel) > 2) )
+ if( p_vout->p_sys->b_cursor )
{
if( p_vout->p_sys->b_cursor_autohidden )
{
}
break;
+ /* Mouse button released */
case SDL_MOUSEBUTTONUP:
switch( event.button.button )
{
case SDL_BUTTON_LEFT:
- val.b_bool = VLC_TRUE;
- var_Set( p_vout, "mouse-clicked", val );
+ {
+ var_Get( p_vout, "mouse-button-down", &val );
+ val.i_int &= ~1;
+ var_Set( p_vout, "mouse-button-down", val );
+
+ val.b_bool = true;
+ var_Set( p_vout, "mouse-clicked", val );
+
+ val.b_bool = false;
+ var_Set( p_vout->p_libvlc, "intf-popupmenu", val );
+ }
+ break;
+
+ case SDL_BUTTON_MIDDLE:
+ {
+ var_Get( p_vout, "mouse-button-down", &val );
+ val.i_int &= ~2;
+ var_Set( p_vout, "mouse-button-down", val );
+
+ vlc_value_t val;
+ var_Get( p_vout->p_libvlc, "intf-show", &val );
+ val.b_bool = !val.b_bool;
+ var_Set( p_vout->p_libvlc, "intf-show", val );
+ }
break;
case SDL_BUTTON_RIGHT:
{
intf_thread_t *p_intf;
+
+ var_Get( p_vout, "mouse-button-down", &val );
+ val.i_int &= ~4;
+ var_Set( p_vout, "mous-button-down", val );
p_intf = vlc_object_find( p_vout, VLC_OBJECT_INTF,
FIND_ANYWHERE );
if( p_intf )
p_intf->b_menu_change = 1;
vlc_object_release( p_intf );
}
+
+ val.b_bool = true;
+ var_Set( p_vout->p_libvlc, "intf-popupmenu", val );
}
break;
}
break;
+ /* Mouse button pressed */
case SDL_MOUSEBUTTONDOWN:
switch( event.button.button )
{
case SDL_BUTTON_LEFT:
- /* In this part we will eventually manage
- * clicks for DVD navigation for instance. */
+ var_Get( p_vout, "mouse-button-down", &val );
+ val.i_int |= 1;
+ var_Set( p_vout, "mouse-button-down", val );
/* detect double-clicks */
if( ( mdate() - p_vout->p_sys->i_lastpressed ) < 300000 )
p_vout->p_sys->i_lastpressed = mdate();
break;
- case 4:
- input_Seek( p_vout, 15, INPUT_SEEK_SECONDS | INPUT_SEEK_CUR );
+ case SDL_BUTTON_MIDDLE:
+ var_Get( p_vout, "mouse-button-down", &val );
+ val.i_int |= 2;
+ var_Set( p_vout, "mouse-button-down", val );
break;
- case 5:
- input_Seek( p_vout, -15, INPUT_SEEK_SECONDS | INPUT_SEEK_CUR );
+ case SDL_BUTTON_RIGHT:
+ var_Get( p_vout, "mouse-button-down", &val );
+ val.i_int |= 4;
+ var_Set( p_vout, "mouse-button-down", val );
break;
}
break;
+ /* Quit event (close the window) */
case SDL_QUIT:
- p_vout->p_vlc->b_die = 1;
+ {
+#if 0
+ playlist_t *p_playlist = pl_Yield( p_vout );
+ if( p_playlist != NULL )
+ {
+ playlist_Stop( p_playlist );
+ pl_Release( p_vout );
+ }
+#else
+#warning FIXME FIXME ?
+#endif
+ }
break;
- case SDL_KEYDOWN: /* if a key is pressed */
+ /* Key pressed */
+ case SDL_KEYDOWN:
+ /* convert the key if possible */
+ val.i_int = ConvertKey( event.key.keysym.sym );
- switch( event.key.keysym.sym )
+ if( !val.i_int )
{
- case SDLK_ESCAPE:
- if( p_vout->b_fullscreen )
+ /* Find the right caracter */
+ if( ( event.key.keysym.unicode & 0xff80 ) == 0 )
{
- p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE;
+ val.i_int = event.key.keysym.unicode & 0x7f;
+ /* FIXME: find a better solution than this
+ hack to find the right caracter */
+ if( val.i_int >= 1 && val.i_int <= 26 )
+ val.i_int += 96;
+ else if( val.i_int >= 65 && val.i_int <= 90 )
+ val.i_int += 32;
}
- else
- {
- p_vout->p_vlc->b_die = 1;
- }
- break;
-
- case SDLK_q: /* quit */
- p_vout->p_vlc->b_die = 1;
- break;
-
- case SDLK_f: /* switch to fullscreen */
- p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE;
- break;
-
- case SDLK_c: /* toggle grayscale */
- p_vout->b_grayscale = ! p_vout->b_grayscale;
- p_vout->i_changes |= VOUT_GRAYSCALE_CHANGE;
- break;
-
- case SDLK_i: /* toggle info */
- p_vout->b_info = ! p_vout->b_info;
- p_vout->i_changes |= VOUT_INFO_CHANGE;
- break;
-
- case SDLK_s: /* toggle scaling */
- p_vout->b_scale = ! p_vout->b_scale;
- p_vout->i_changes |= VOUT_SCALE_CHANGE;
- break;
-
- case SDLK_SPACE: /* toggle interface */
- p_vout->b_interface = ! p_vout->b_interface;
- p_vout->i_changes |= VOUT_INTF_CHANGE;
- break;
+ }
- case SDLK_MENU:
+ if( val.i_int )
+ {
+ if( ( event.key.keysym.mod & KMOD_SHIFT ) )
{
- intf_thread_t *p_intf;
- p_intf = vlc_object_find( p_vout, VLC_OBJECT_INTF,
- FIND_ANYWHERE );
- if( p_intf != NULL )
- {
- p_intf->b_menu_change = 1;
- vlc_object_release( p_intf );
- }
+ val.i_int |= KEY_MODIFIER_SHIFT;
}
- break;
-
- case SDLK_LEFT:
- input_Seek( p_vout, -5, INPUT_SEEK_SECONDS | INPUT_SEEK_CUR );
- break;
-
- case SDLK_RIGHT:
- input_Seek( p_vout, 5, INPUT_SEEK_SECONDS | INPUT_SEEK_CUR );
- break;
-
- case SDLK_UP:
- input_Seek( p_vout, 60, INPUT_SEEK_SECONDS | INPUT_SEEK_CUR );
- break;
-
- case SDLK_DOWN:
- input_Seek( p_vout, -60, INPUT_SEEK_SECONDS | INPUT_SEEK_CUR );
- break;
-
- case SDLK_F1: network_ChannelJoin( p_vout, 1 ); break;
- case SDLK_F2: network_ChannelJoin( p_vout, 2 ); break;
- case SDLK_F3: network_ChannelJoin( p_vout, 3 ); break;
- case SDLK_F4: network_ChannelJoin( p_vout, 4 ); break;
- case SDLK_F5: network_ChannelJoin( p_vout, 5 ); break;
- case SDLK_F6: network_ChannelJoin( p_vout, 6 ); break;
- case SDLK_F7: network_ChannelJoin( p_vout, 7 ); break;
- case SDLK_F8: network_ChannelJoin( p_vout, 8 ); break;
- case SDLK_F9: network_ChannelJoin( p_vout, 9 ); break;
- case SDLK_F10: network_ChannelJoin( p_vout, 10 ); break;
- case SDLK_F11: network_ChannelJoin( p_vout, 11 ); break;
- case SDLK_F12: network_ChannelJoin( p_vout, 12 ); break;
-
- case SDLK_b:
+ if( ( event.key.keysym.mod & KMOD_CTRL ) )
{
- aout_instance_t * p_aout;
- audio_volume_t i_volume;
- p_aout = vlc_object_find( p_vout, VLC_OBJECT_AOUT,
- FIND_ANYWHERE );
- if( p_aout != NULL )
- {
- if ( !aout_VolumeDown( p_aout, 1, &i_volume ) )
- {
- msg_Dbg( p_vout, "audio volume is now %d", i_volume );
- }
- else
- {
- msg_Dbg( p_vout, "audio volume: operation not supported" );
- }
- vlc_object_release( (vlc_object_t *)p_aout );
- }
+ val.i_int |= KEY_MODIFIER_CTRL;
}
- break;
-
- case SDLK_n:
+ if( ( event.key.keysym.mod & KMOD_ALT ) )
{
- aout_instance_t * p_aout;
- audio_volume_t i_volume;
- p_aout = vlc_object_find( p_vout, VLC_OBJECT_AOUT,
- FIND_ANYWHERE );
- if( p_aout != NULL )
- {
- if ( !aout_VolumeUp( p_aout, 1, &i_volume ) )
- {
- msg_Dbg( p_vout, "audio volume is now %d", i_volume );
- }
- else
- {
- msg_Dbg( p_vout, "audio volume: operation not supported" );
- }
- vlc_object_release( (vlc_object_t *)p_aout );
- }
+ val.i_int |= KEY_MODIFIER_ALT;
}
- break;
-
- default:
- break;
+ var_Set( p_vout->p_libvlc, "key-pressed", val );
}
- break;
default:
break;
/* Fullscreen change */
if( p_vout->i_changes & VOUT_FULLSCREEN_CHANGE )
{
- p_vout->b_fullscreen = ! p_vout->b_fullscreen;
+ vlc_value_t val_fs;
+
+ /* Update the object variable and trigger callback */
+ val_fs.b_bool = !p_vout->b_fullscreen;
+ p_vout->b_fullscreen = !p_vout->b_fullscreen;
+ var_Set( p_vout, "fullscreen", val_fs );
+
+ /*TODO: add the "always on top" code here !*/
p_vout->p_sys->b_cursor_autohidden = 0;
SDL_ShowCursor( p_vout->p_sys->b_cursor &&
p_vout->i_changes |= VOUT_SIZE_CHANGE;
}
- /*
- * Size change
- */
+ /* Crop or Aspect Ratio Changes */
+ if( p_vout->i_changes & VOUT_CROP_CHANGE ||
+ p_vout->i_changes & VOUT_ASPECT_CHANGE )
+ {
+ p_vout->i_changes &= ~VOUT_CROP_CHANGE;
+ p_vout->i_changes &= ~VOUT_ASPECT_CHANGE;
+
+ p_vout->fmt_out.i_x_offset = p_vout->fmt_in.i_x_offset;
+ p_vout->fmt_out.i_y_offset = p_vout->fmt_in.i_y_offset;
+ p_vout->fmt_out.i_visible_width = p_vout->fmt_in.i_visible_width;
+ p_vout->fmt_out.i_visible_height = p_vout->fmt_in.i_visible_height;
+ p_vout->fmt_out.i_aspect = p_vout->fmt_in.i_aspect;
+ p_vout->fmt_out.i_sar_num = p_vout->fmt_in.i_sar_num;
+ p_vout->fmt_out.i_sar_den = p_vout->fmt_in.i_sar_den;
+ p_vout->output.i_aspect = p_vout->fmt_in.i_aspect;
+
+ p_vout->i_changes |= VOUT_SIZE_CHANGE;
+ }
+
+ /* Size change */
if( p_vout->i_changes & VOUT_SIZE_CHANGE )
{
msg_Dbg( p_vout, "video display resized (%dx%d)",
* we can handle rescaling ourselves */
if( p_vout->p_sys->p_overlay != NULL )
p_vout->i_changes &= ~VOUT_SIZE_CHANGE;
-
}
/* Pointer change */
if( ! p_vout->p_sys->b_cursor_autohidden &&
- ( mdate() - p_vout->p_sys->i_lastmoved > 2000000 ) )
+ ( mdate() - p_vout->p_sys->i_lastmoved >
+ p_vout->p_sys->i_mouse_hide_timeout ) )
{
/* Hide the mouse automatically */
p_vout->p_sys->b_cursor_autohidden = 1;
SDL_ShowCursor( 0 );
}
- return( 0 );
+ return VLC_SUCCESS;
}
+/*****************************************************************************
+ * Key events handling
+ *****************************************************************************/
+static struct
+{
+ SDLKey sdl_key;
+ int i_vlckey;
+} sdlkeys_to_vlckeys[] =
+{
+ { SDLK_F1, KEY_F1 },
+ { SDLK_F2, KEY_F2 },
+ { SDLK_F3, KEY_F3 },
+ { SDLK_F4, KEY_F4 },
+ { SDLK_F5, KEY_F5 },
+ { SDLK_F6, KEY_F6 },
+ { SDLK_F7, KEY_F7 },
+ { SDLK_F8, KEY_F8 },
+ { SDLK_F9, KEY_F9 },
+ { SDLK_F10, KEY_F10 },
+ { SDLK_F11, KEY_F11 },
+ { SDLK_F12, KEY_F12 },
+
+ { SDLK_RETURN, KEY_ENTER },
+ { SDLK_KP_ENTER, KEY_ENTER },
+ { SDLK_SPACE, KEY_SPACE },
+ { SDLK_ESCAPE, KEY_ESC },
+
+ { SDLK_MENU, KEY_MENU },
+ { SDLK_LEFT, KEY_LEFT },
+ { SDLK_RIGHT, KEY_RIGHT },
+ { SDLK_UP, KEY_UP },
+ { SDLK_DOWN, KEY_DOWN },
+
+ { SDLK_HOME, KEY_HOME },
+ { SDLK_END, KEY_END },
+ { SDLK_PAGEUP, KEY_PAGEUP },
+ { SDLK_PAGEDOWN, KEY_PAGEDOWN },
+
+ { SDLK_INSERT, KEY_INSERT },
+ { SDLK_DELETE, KEY_DELETE },
+ /*TODO: find a equivalent for SDL
+ { , KEY_MEDIA_NEXT_TRACK }
+ { , KEY_MEDIA_PREV_TRACK }
+ { , KEY_VOLUME_MUTE }
+ { , KEY_VOLUME_DOWN }
+ { , KEY_VOLUME_UP }
+ { , KEY_MEDIA_PLAY_PAUSE }
+ { , KEY_MEDIA_PLAY_PAUSE }*/
+
+ { 0, 0 }
+};
+
+static int ConvertKey( SDLKey sdl_key )
+{
+ int i;
+ for( i=0; sdlkeys_to_vlckeys[i].sdl_key != 0; i++ )
+ {
+ if( sdlkeys_to_vlckeys[i].sdl_key == sdl_key )
+ {
+ return sdlkeys_to_vlckeys[i].i_vlckey;
+ }
+ }
+ return 0;
+}
+
+
/*****************************************************************************
* Display: displays previously rendered output
*****************************************************************************
*****************************************************************************/
static void Display( vout_thread_t *p_vout, picture_t *p_pic )
{
- int x, y, w, h;
+ unsigned int x, y, w, h;
SDL_Rect disp;
vout_PlacePicture( p_vout, p_vout->p_sys->i_width, p_vout->p_sys->i_height,
*****************************************************************************/
static int OpenDisplay( vout_thread_t *p_vout )
{
- Uint32 i_flags;
- int i_bpp;
+ uint32_t i_flags;
+ int i_bpp;
+
+ /* SDL fucked up fourcc definitions on bigendian machines */
+ uint32_t i_sdl_chroma;
+ char *psz_chroma = NULL;
+ uint32_t i_chroma = 0;
+
+ bool b_overlay = config_GetInt( p_vout, "overlay" );
/* Set main window's size */
+#if SDL_VERSION_ATLEAST(1,2,10)
+ p_vout->p_sys->i_width = p_vout->b_fullscreen ? p_vout->p_sys->i_desktop_width :
+ p_vout->i_window_width;
+ p_vout->p_sys->i_height = p_vout->b_fullscreen ? p_vout->p_sys->i_desktop_height :
+ p_vout->i_window_height;
+#else
p_vout->p_sys->i_width = p_vout->b_fullscreen ? p_vout->output.i_width :
p_vout->i_window_width;
p_vout->p_sys->i_height = p_vout->b_fullscreen ? p_vout->output.i_height :
p_vout->i_window_height;
+#endif
/* Initialize flags and cursor */
i_flags = SDL_ANYFORMAT | SDL_HWPALETTE | SDL_HWSURFACE | SDL_DOUBLEBUF;
if( i_bpp == 0 )
{
msg_Err( p_vout, "no video mode available" );
- return( 1 );
+ return VLC_EGENERIC;
}
p_vout->p_sys->p_display = SDL_SetVideoMode( p_vout->p_sys->i_width,
if( p_vout->p_sys->p_display == NULL )
{
msg_Err( p_vout, "cannot set video mode" );
- return( 1 );
+ return VLC_EGENERIC;
}
SDL_LockSurface( p_vout->p_sys->p_display );
- /* Choose the chroma we will try first. */
- switch( p_vout->render.i_chroma )
+ if( ( psz_chroma = config_GetPsz( p_vout, "sdl-chroma" ) ) )
{
- case VLC_FOURCC('Y','U','Y','2'):
- case VLC_FOURCC('Y','U','N','V'):
- p_vout->output.i_chroma = SDL_YUY2_OVERLAY;
- break;
- case VLC_FOURCC('U','Y','V','Y'):
- case VLC_FOURCC('U','Y','N','V'):
- case VLC_FOURCC('Y','4','2','2'):
- p_vout->output.i_chroma = SDL_UYVY_OVERLAY;
- break;
- case VLC_FOURCC('Y','V','Y','U'):
- p_vout->output.i_chroma = SDL_YVYU_OVERLAY;
- break;
- case VLC_FOURCC('Y','V','1','2'):
- case VLC_FOURCC('I','4','2','0'):
- case VLC_FOURCC('I','Y','U','V'):
- default:
- p_vout->output.i_chroma = SDL_YV12_OVERLAY;
- break;
+ if( strlen( psz_chroma ) >= 4 )
+ {
+ memcpy(&i_chroma, psz_chroma, 4);
+ msg_Dbg( p_vout, "Forcing chroma to 0x%.8x (%4.4s)", i_chroma, (char*)&i_chroma );
+ }
+ else
+ {
+ free( psz_chroma );
+ psz_chroma = NULL;
+ }
}
- p_vout->p_sys->p_overlay =
- SDL_CreateYUVOverlay( 32, 32, p_vout->output.i_chroma,
- p_vout->p_sys->p_display );
- /* FIXME: if the first overlay we find is software, don't stop,
- * because we may find a hardware one later ... */
-
- /* If this best choice failed, fall back to other chromas */
- if( p_vout->p_sys->p_overlay == NULL )
+ if( b_overlay )
{
- p_vout->output.i_chroma = SDL_IYUV_OVERLAY;
- p_vout->p_sys->p_overlay =
- SDL_CreateYUVOverlay( 32, 32, p_vout->output.i_chroma,
- p_vout->p_sys->p_display );
- }
+ /* Choose the chroma we will try first. */
+ do
+ {
+ if( !psz_chroma ) i_chroma = 0;
+ switch( i_chroma ? i_chroma : p_vout->render.i_chroma )
+ {
+ case VLC_FOURCC('Y','U','Y','2'):
+ case VLC_FOURCC('Y','U','N','V'):
+ p_vout->output.i_chroma = VLC_FOURCC('Y','U','Y','2');
+ i_sdl_chroma = SDL_YUY2_OVERLAY;
+ break;
+ case VLC_FOURCC('U','Y','V','Y'):
+ case VLC_FOURCC('U','Y','N','V'):
+ case VLC_FOURCC('Y','4','2','2'):
+ p_vout->output.i_chroma = VLC_FOURCC('U','Y','V','Y');
+ i_sdl_chroma = SDL_UYVY_OVERLAY;
+ break;
+ case VLC_FOURCC('Y','V','Y','U'):
+ p_vout->output.i_chroma = VLC_FOURCC('Y','V','Y','U');
+ i_sdl_chroma = SDL_YVYU_OVERLAY;
+ break;
+ case VLC_FOURCC('Y','V','1','2'):
+ case VLC_FOURCC('I','4','2','0'):
+ case VLC_FOURCC('I','Y','U','V'):
+ default:
+ p_vout->output.i_chroma = VLC_FOURCC('Y','V','1','2');
+ i_sdl_chroma = SDL_YV12_OVERLAY;
+ break;
+ }
+ free( psz_chroma ); psz_chroma = NULL;
- if( p_vout->p_sys->p_overlay == NULL )
- {
- p_vout->output.i_chroma = SDL_YV12_OVERLAY;
- p_vout->p_sys->p_overlay =
- SDL_CreateYUVOverlay( 32, 32, p_vout->output.i_chroma,
- p_vout->p_sys->p_display );
- }
+ p_vout->p_sys->p_overlay =
+ SDL_CreateYUVOverlay( 32, 32, i_sdl_chroma,
+ p_vout->p_sys->p_display );
+ /* FIXME: if the first overlay we find is software, don't stop,
+ * because we may find a hardware one later ... */
+ }
+ while( i_chroma && !p_vout->p_sys->p_overlay );
- if( p_vout->p_sys->p_overlay == NULL )
- {
- p_vout->output.i_chroma = SDL_YUY2_OVERLAY;
- p_vout->p_sys->p_overlay =
- SDL_CreateYUVOverlay( 32, 32, p_vout->output.i_chroma,
- p_vout->p_sys->p_display );
+
+ /* If this best choice failed, fall back to other chromas */
+ if( p_vout->p_sys->p_overlay == NULL )
+ {
+ p_vout->output.i_chroma = VLC_FOURCC('I','Y','U','V');
+ p_vout->p_sys->p_overlay =
+ SDL_CreateYUVOverlay( 32, 32, SDL_IYUV_OVERLAY,
+ p_vout->p_sys->p_display );
+ }
+
+ if( p_vout->p_sys->p_overlay == NULL )
+ {
+ p_vout->output.i_chroma = VLC_FOURCC('Y','V','1','2');
+ p_vout->p_sys->p_overlay =
+ SDL_CreateYUVOverlay( 32, 32, SDL_YV12_OVERLAY,
+ p_vout->p_sys->p_display );
+ }
+
+ if( p_vout->p_sys->p_overlay == NULL )
+ {
+ p_vout->output.i_chroma = VLC_FOURCC('Y','U','Y','2');
+ p_vout->p_sys->p_overlay =
+ SDL_CreateYUVOverlay( 32, 32, SDL_YUY2_OVERLAY,
+ p_vout->p_sys->p_display );
+ }
}
if( p_vout->p_sys->p_overlay == NULL )
{
- msg_Warn( p_vout, "no SDL overlay for 0x%.8x (%4.4s)",
- p_vout->render.i_chroma, (char*)&p_vout->render.i_chroma );
+ if( b_overlay )
+ msg_Warn( p_vout, "no SDL overlay for 0x%.8x (%4.4s)",
+ p_vout->render.i_chroma,
+ (char*)&p_vout->render.i_chroma );
+ else
+ msg_Warn( p_vout, "SDL overlay disabled by the user" );
switch( p_vout->p_sys->p_display->format->BitsPerPixel )
{
p_vout->p_sys->p_display->format->BitsPerPixel );
SDL_UnlockSurface( p_vout->p_sys->p_display );
SDL_FreeSurface( p_vout->p_sys->p_display );
- return( -1 );
+ return VLC_EGENERIC;
}
p_vout->output.i_rmask = p_vout->p_sys->p_display->format->Rmask;
SDL_EventState( SDL_KEYUP, SDL_IGNORE ); /* ignore keys up */
- return( 0 );
+ return VLC_SUCCESS;
}
/*****************************************************************************
if( p_vout->p_sys->i_surfaces )
{
/* We already allocated this surface, return */
- return -1;
+ return VLC_EGENERIC;
}
p_pic->p_sys = malloc( sizeof( picture_sys_t ) );
if( p_pic->p_sys == NULL )
{
- return -1;
+ return VLC_ENOMEM;
}
switch( p_vout->p_sys->p_display->format->BitsPerPixel )
p_pic->p->i_pixel_pitch = 4;
break;
default:
- return( -1 );
+ return VLC_EGENERIC;
}
p_pic->p->p_pixels = p_vout->p_sys->p_display->pixels;
p_pic->p->i_lines = p_vout->p_sys->p_display->h;
+ p_pic->p->i_visible_lines = p_vout->p_sys->p_display->h;
p_pic->p->i_pitch = p_vout->p_sys->p_display->pitch;
p_pic->p->i_visible_pitch =
p_pic->p->i_pixel_pitch * p_vout->p_sys->p_display->w;
if( p_pic->p_sys == NULL )
{
- return -1;
+ return VLC_ENOMEM;
}
p_pic->p_sys->p_overlay =
if( p_pic->p_sys->p_overlay == NULL )
{
free( p_pic->p_sys );
- return -1;
+ return VLC_EGENERIC;
}
SDL_LockYUVOverlay( p_pic->p_sys->p_overlay );
p_pic->Y_PIXELS = p_pic->p_sys->p_overlay->pixels[0];
p_pic->p[Y_PLANE].i_lines = p_pic->p_sys->p_overlay->h;
+ p_pic->p[Y_PLANE].i_visible_lines = p_pic->p_sys->p_overlay->h;
p_pic->p[Y_PLANE].i_pitch = p_pic->p_sys->p_overlay->pitches[0];
switch( p_vout->output.i_chroma )
p_pic->U_PIXELS = p_pic->p_sys->p_overlay->pixels[2];
p_pic->p[U_PLANE].i_lines = p_pic->p_sys->p_overlay->h / 2;
+ p_pic->p[U_PLANE].i_visible_lines = p_pic->p_sys->p_overlay->h / 2;
p_pic->p[U_PLANE].i_pitch = p_pic->p_sys->p_overlay->pitches[2];
p_pic->p[U_PLANE].i_pixel_pitch = 1;
p_pic->p[U_PLANE].i_visible_pitch = p_pic->p_sys->p_overlay->w / 2;
p_pic->V_PIXELS = p_pic->p_sys->p_overlay->pixels[1];
p_pic->p[V_PLANE].i_lines = p_pic->p_sys->p_overlay->h / 2;
+ p_pic->p[V_PLANE].i_visible_lines = p_pic->p_sys->p_overlay->h / 2;
p_pic->p[V_PLANE].i_pitch = p_pic->p_sys->p_overlay->pitches[1];
p_pic->p[V_PLANE].i_pixel_pitch = 1;
p_pic->p[V_PLANE].i_visible_pitch = p_pic->p_sys->p_overlay->w / 2;
p_pic->U_PIXELS = p_pic->p_sys->p_overlay->pixels[1];
p_pic->p[U_PLANE].i_lines = p_pic->p_sys->p_overlay->h / 2;
+ p_pic->p[U_PLANE].i_visible_lines = p_pic->p_sys->p_overlay->h / 2;
p_pic->p[U_PLANE].i_pitch = p_pic->p_sys->p_overlay->pitches[1];
p_pic->p[U_PLANE].i_pixel_pitch = 1;
p_pic->p[U_PLANE].i_visible_pitch = p_pic->p_sys->p_overlay->w / 2;
p_pic->V_PIXELS = p_pic->p_sys->p_overlay->pixels[2];
p_pic->p[V_PLANE].i_lines = p_pic->p_sys->p_overlay->h / 2;
+ p_pic->p[V_PLANE].i_visible_lines = p_pic->p_sys->p_overlay->h / 2;
p_pic->p[V_PLANE].i_pitch = p_pic->p_sys->p_overlay->pitches[2];
p_pic->p[V_PLANE].i_pixel_pitch = 1;
p_pic->p[V_PLANE].i_visible_pitch = p_pic->p_sys->p_overlay->w / 2;
}
}
- return 0;
+ return VLC_SUCCESS;
}
/*****************************************************************************
/* Set palette */
if( SDL_SetColors( p_vout->p_sys->p_display, colors, 0, 256 ) == 0 )
{
- msg_Err( p_vout, "failed setting palette" );
+ msg_Err( p_vout, "failed to set palette" );
}
}
projects / vlc / blobdiff