X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_output%2Fsdl.c;h=97f326cc349e767fba640e2d7b6815625b35b711;hb=2c595f3810f717639fd1a1666c77b6e176d9ec53;hp=aa225524100a41684c01c0ece698666f4e429054;hpb=d83b49689ac6287782cc35b5bd7fe58513ffc7ca;p=vlc diff --git a/modules/video_output/sdl.c b/modules/video_output/sdl.c index aa22552410..97f326cc34 100644 --- a/modules/video_output/sdl.c +++ b/modules/video_output/sdl.c @@ -28,7 +28,12 @@ *****************************************************************************/ #include /* ENOMEM */ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include #include #include #include @@ -59,8 +64,10 @@ struct vout_sys_t 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 */ @@ -68,12 +75,11 @@ struct vout_sys_t /* 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 */ - - vlc_mutex_t lock; }; /***************************************************************************** @@ -118,10 +124,10 @@ vlc_module_begin(); set_shortname( "SDL" ); set_category( CAT_VIDEO ); set_subcategory( SUBCAT_VIDEO_VOUT ); - set_description( _("Simple DirectMedia Layer video output") ); + 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, VLC_TRUE ); + add_string( "sdl-chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT, true ); set_callbacks( Open, Close ); #if defined( __i386__ ) || defined( __x86_64__ ) /* On i386, SDL is linked against svgalib */ @@ -156,7 +162,7 @@ static int Open ( vlc_object_t *p_this ) return VLC_ENOMEM; } - vlc_mutex_init( p_vout, &p_vout->p_sys->lock ); + 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 ) @@ -196,7 +202,7 @@ static int Open ( vlc_object_t *p_this ) /* 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 @@ -215,13 +221,18 @@ static int Open ( vlc_object_t *p_this ) 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 = 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 ) ) { @@ -339,8 +350,6 @@ static void Close ( vlc_object_t *p_this ) CloseDisplay( p_vout ); SDL_QuitSubSystem( SDL_INIT_VIDEO ); - vlc_mutex_destroy( &p_vout->p_sys->lock ); - free( p_vout->p_sys ); } @@ -356,8 +365,6 @@ static int Manage( vout_thread_t *p_vout ) vlc_value_t val; unsigned int i_width, i_height, i_x, i_y; - vlc_mutex_lock( &p_vout->p_sys->lock ); - /* Process events */ while( SDL_PollEvent( &event ) ) { @@ -376,18 +383,36 @@ static int Manage( vout_thread_t *p_vout ) 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 ) { @@ -406,12 +431,20 @@ static int Manage( vout_thread_t *p_vout ) switch( event.button.button ) { case SDL_BUTTON_LEFT: - var_Get( p_vout, "mouse-button-down", &val ); - val.i_int &= ~1; - var_Set( p_vout, "mouse-button-down", val ); + { + playlist_t *p_playlist; + vlc_value_t val; - 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: @@ -422,16 +455,10 @@ static int Manage( vout_thread_t *p_vout ) val.i_int &= ~2; var_Set( p_vout, "mouse-button-down", val ); - p_playlist = vlc_object_find( p_vout, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - if( p_playlist != NULL ) - { - vlc_value_t val; - var_Get( p_playlist, "intf-show", &val ); - val.b_bool = !val.b_bool; - var_Set( p_playlist, "intf-show", val ); - vlc_object_release( p_playlist ); - } + 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; @@ -451,16 +478,8 @@ static int Manage( vout_thread_t *p_vout ) vlc_object_release( p_intf ); } - p_playlist = vlc_object_find( p_vout, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - - if( p_playlist != NULL ) - { - vlc_value_t val; - val.b_bool = VLC_TRUE; - var_Set( p_playlist, "intf-popupmenu", val ); - vlc_object_release( p_playlist ); - } + val.b_bool = true; + var_Set( p_vout->p_libvlc, "intf-popupmenu", val ); } break; } @@ -499,12 +518,16 @@ static int Manage( vout_thread_t *p_vout ) /* Quit event (close the window) */ case SDL_QUIT: { - playlist_t *p_playlist = (playlist_t *)vlc_object_find( p_vout, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE ); +#if 0 + playlist_t *p_playlist = pl_Yield( p_vout ); if( p_playlist != NULL ) { playlist_Stop( p_playlist ); - vlc_object_release( p_playlist ); + pl_Release( p_playlist ); } +#else +#warning FIXME FIXME ? +#endif } break; @@ -606,15 +629,14 @@ static int Manage( vout_thread_t *p_vout ) /* 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 ); } - vlc_mutex_unlock( &p_vout->p_sys->lock ); - return VLC_SUCCESS; } @@ -694,8 +716,6 @@ static void Display( vout_thread_t *p_vout, picture_t *p_pic ) unsigned int x, y, w, h; SDL_Rect disp; - vlc_mutex_lock( &p_vout->p_sys->lock ); - vout_PlacePicture( p_vout, p_vout->p_sys->i_width, p_vout->p_sys->i_height, &x, &y, &w, &h ); disp.x = x; @@ -715,8 +735,6 @@ static void Display( vout_thread_t *p_vout, picture_t *p_pic ) SDL_DisplayYUVOverlay( p_pic->p_sys->p_overlay , &disp ); SDL_LockYUVOverlay( p_pic->p_sys->p_overlay); } - - vlc_mutex_unlock( &p_vout->p_sys->lock ); } /* following functions are local */ @@ -737,11 +755,20 @@ static int OpenDisplay( vout_thread_t *p_vout ) 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; @@ -781,75 +808,82 @@ static int OpenDisplay( vout_thread_t *p_vout ) } } - /* Choose the chroma we will try first. */ - do + if( b_overlay ) { - if( !psz_chroma ) i_chroma = 0; - switch( i_chroma ? i_chroma : p_vout->render.i_chroma ) + /* Choose the chroma we will try first. */ + do { - 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( !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; - 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 ); + 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 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 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','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 ) + { + 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 ) {