X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=plugins%2Fsdl%2Fvout_sdl.c;h=8a1e4e34741f6d19bdbb813e21a5d746d5b7f9d7;hb=d4f18c4eadb23de73e7ae1d1e2e899cbbfbef567;hp=c8d722ccc5c8a2db4ee87d54b9fec379a0e09dea;hpb=38e1bc07300f4e36385003cb20f56b7be0fa11a2;p=vlc diff --git a/plugins/sdl/vout_sdl.c b/plugins/sdl/vout_sdl.c index c8d722ccc5..8a1e4e3474 100644 --- a/plugins/sdl/vout_sdl.c +++ b/plugins/sdl/vout_sdl.c @@ -1,9 +1,12 @@ /***************************************************************************** * vout_sdl.c: SDL video output display method ***************************************************************************** - * Copyright (C) 1998, 1999, 2000 VideoLAN + * Copyright (C) 1998-2001 VideoLAN + * $Id: vout_sdl.c,v 1.85 2002/03/18 19:14:52 sam Exp $ * - * Authors: + * Authors: Samuel Hocevar + * Pierre Baillet + * Arnaud de Bossoreille de Ribou * * 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 @@ -23,24 +26,31 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include "defs.h" - #include /* ENOMEM */ #include /* free() */ #include /* strerror() */ -#include +#include + +#include +#ifndef WIN32 +# include /* BSD: struct in_addr */ +#endif -#include "config.h" -#include "common.h" -#include "threads.h" -#include "mtime.h" -#include "plugins.h" +#include SDL_INCLUDE_FILE + +#include "netutils.h" #include "video.h" #include "video_output.h" -#include "intf_msg.h" +#include "interface.h" + +#include "stream_control.h" /* needed by input_ext-intf.h... */ +#include "input_ext-intf.h" + +#define SDL_MAX_DIRECTBUFFERS 10 +#define SDL_DEFAULT_BPP 16 /***************************************************************************** * vout_sys_t: video output SDL method descriptor @@ -50,77 +60,182 @@ *****************************************************************************/ typedef struct vout_sys_s { + SDL_Surface * p_display; /* display device */ + int i_width; int i_height; - SDL_Surface * p_display; /* display device */ - SDL_Overlay * p_overlay; /* overlay device */ - boolean_t b_fullscreen; - boolean_t b_reopen_display; - Uint8 * p_buffer[2]; - /* Buffers informations */ - boolean_t b_must_acquire; /* must be acquired before writing */ -} vout_sys_t; + + /* For YUV output */ + SDL_Overlay * p_overlay; /* An overlay we keep to grab the XVideo port */ + + /* For RGB output */ + int i_surfaces; + + boolean_t b_cursor; + boolean_t b_cursor_autohidden; + mtime_t i_lastmoved; + +} vout_sys_t; /***************************************************************************** - * Local prototypes + * picture_sys_t: direct buffer method descriptor + ***************************************************************************** + * This structure is part of the picture descriptor, it describes the + * SDL specific properties of a direct buffer. *****************************************************************************/ -static int SDLOpenDisplay ( vout_thread_t *p_vout ); -static void SDLCloseDisplay ( vout_thread_t *p_vout ); +typedef struct picture_sys_s +{ + SDL_Overlay *p_overlay; + +} picture_sys_t; + +/***************************************************************************** + * Seeking function TODO: put this in a generic location ! + *****************************************************************************/ +static __inline__ void vout_Seek( off_t i_seek ) +{ + off_t i_tell; + + vlc_mutex_lock( &p_input_bank->lock ); + if( p_input_bank->pp_input[0] != NULL ) + { +#define S p_input_bank->pp_input[0]->stream + i_tell = S.p_selected_area->i_tell + i_seek * (off_t)50 * S.i_mux_rate; + + i_tell = ( i_tell <= 0 /*S.p_selected_area->i_start*/ ) + ? 0 /*S.p_selected_area->i_start*/ + : ( i_tell >= S.p_selected_area->i_size ) + ? S.p_selected_area->i_size + : i_tell; + + input_Seek( p_input_bank->pp_input[0], i_tell ); +#undef S + } + vlc_mutex_unlock( &p_input_bank->lock ); +} /***************************************************************************** - * vout_SDLCreate: allocate SDL video thread output method + * Local prototypes. + *****************************************************************************/ +static int vout_Create ( struct vout_thread_s * ); +static int vout_Init ( struct vout_thread_s * ); +static void vout_End ( struct vout_thread_s * ); +static void vout_Destroy ( struct vout_thread_s * ); +static int vout_Manage ( struct vout_thread_s * ); +static void vout_Render ( struct vout_thread_s *, struct picture_s * ); +static void vout_Display ( struct vout_thread_s *, struct picture_s * ); + +static int OpenDisplay ( struct vout_thread_s * ); +static void CloseDisplay ( struct vout_thread_s * ); +static int NewPicture ( struct vout_thread_s *, struct picture_s * ); +static void SetPalette ( struct vout_thread_s *, u16 *, u16 *, u16 * ); + +/***************************************************************************** + * Functions exported as capabilities. They are declared as static so that + * we don't pollute the namespace too much. + *****************************************************************************/ +void _M( vout_getfunctions )( function_list_t * p_function_list ) +{ + p_function_list->functions.vout.pf_create = vout_Create; + p_function_list->functions.vout.pf_init = vout_Init; + p_function_list->functions.vout.pf_end = vout_End; + p_function_list->functions.vout.pf_destroy = vout_Destroy; + p_function_list->functions.vout.pf_manage = vout_Manage; + p_function_list->functions.vout.pf_render = vout_Render; + p_function_list->functions.vout.pf_display = vout_Display; +} + +/***************************************************************************** + * vout_Create: allocate SDL video thread output method ***************************************************************************** * This function allocate and initialize a SDL vout method. It uses some of the * vout properties to choose the correct mode, and change them according to the * mode actually used. *****************************************************************************/ -int vout_SDLCreate( vout_thread_t *p_vout, char *psz_display, - int i_root_window, void *p_data ) +static int vout_Create( vout_thread_t *p_vout ) { + char *psz_method; + + if( SDL_WasInit( SDL_INIT_VIDEO ) != 0 ) + { + return( 1 ); + } + /* Allocate structure */ p_vout->p_sys = malloc( sizeof( vout_sys_t ) ); if( p_vout->p_sys == NULL ) { - intf_ErrMsg( "error: %s", strerror(ENOMEM) ); + intf_ErrMsg( "vout error: can't create p_sys (%s)", strerror(ENOMEM) ); return( 1 ); } - p_vout->p_sys->p_display = NULL; - p_vout->p_sys->p_overlay = NULL; - p_vout->p_sys->b_must_acquire = 0; + psz_method = config_GetPszVariable( "vout" ); + if( psz_method ) + { + while( *psz_method && *psz_method != ':' ) + { + psz_method++; + } + + if( *psz_method ) + { + setenv( "SDL_VIDEODRIVER", psz_method + 1, 1 ); + } + } /* Initialize library */ - if( SDL_Init(SDL_INIT_VIDEO) < 0 ) + if( SDL_Init( SDL_INIT_VIDEO +#ifndef WIN32 + /* Win32 SDL implementation doesn't support SDL_INIT_EVENTTHREAD yet*/ + | SDL_INIT_EVENTTHREAD +#endif +#ifdef DEBUG + /* In debug mode you may want vlc to dump a core instead of staying + * stuck */ + | SDL_INIT_NOPARACHUTE +#endif + ) < 0 ) { - intf_ErrMsg( "error: can't initialize SDL library: %s", - SDL_GetError() ); + intf_ErrMsg( "vout error: can't initialize SDL (%s)", SDL_GetError() ); free( p_vout->p_sys ); return( 1 ); } - /* Force the software yuv even if it is not used */ - /* If we don't do this, p_vout is not correctly initialized - and it's impossible to switch between soft/hard yuv */ - p_vout->b_need_render = 1; + p_vout->p_sys->b_cursor = 1; + p_vout->p_sys->b_cursor_autohidden = 0; + p_vout->p_sys->i_lastmoved = mdate(); - if(psz_display != NULL && strcmp(psz_display,"fullscreen")==0) + if( p_vout->render.i_height * p_vout->render.i_aspect + >= p_vout->render.i_width * VOUT_ASPECT_FACTOR ) { - p_vout->p_sys->b_fullscreen = 1; + p_vout->p_sys->i_width = p_vout->render.i_height + * p_vout->render.i_aspect / VOUT_ASPECT_FACTOR; + p_vout->p_sys->i_height = p_vout->render.i_height; } else { - p_vout->p_sys->b_fullscreen = 0; + p_vout->p_sys->i_width = p_vout->render.i_width; + p_vout->p_sys->i_height = p_vout->render.i_width + * VOUT_ASPECT_FACTOR / p_vout->render.i_aspect; } - p_vout->p_sys->i_width = VOUT_WIDTH_DEFAULT; - p_vout->p_sys->i_height = VOUT_HEIGHT_DEFAULT; - - p_vout->p_sys->b_reopen_display = 0; +#if 0 + if( p_vout->p_sys->i_width <= 300 && p_vout->p_sys->i_height <= 300 ) + { + p_vout->p_sys->i_width <<= 1; + p_vout->p_sys->i_height <<= 1; + } + else if( p_vout->p_sys->i_width <= 400 && p_vout->p_sys->i_height <= 400 ) + { + p_vout->p_sys->i_width += p_vout->p_sys->i_width >> 1; + p_vout->p_sys->i_height += p_vout->p_sys->i_height >> 1; + } +#endif - if( SDLOpenDisplay(p_vout) ) + if( OpenDisplay( p_vout ) ) { - intf_ErrMsg( "error: can't initialize SDL library: %s", - SDL_GetError() ); + intf_ErrMsg( "vout error: can't set up SDL (%s)", SDL_GetError() ); + SDL_QuitSubSystem( SDL_INIT_VIDEO ); free( p_vout->p_sys ); return( 1 ); } @@ -129,286 +244,646 @@ int vout_SDLCreate( vout_thread_t *p_vout, char *psz_display, } /***************************************************************************** - * vout_SDLInit: initialize SDL video thread output method + * vout_Init: initialize SDL video thread output method ***************************************************************************** * This function initialize the SDL display device. *****************************************************************************/ -int vout_SDLInit( vout_thread_t *p_vout ) +static int vout_Init( vout_thread_t *p_vout ) { - /* Acquire first buffer */ - if( p_vout->p_sys->b_must_acquire ) + int i_index; + picture_t *p_pic; + + p_vout->p_sys->i_surfaces = 0; + + I_OUTPUTPICTURES = 0; + + /* Initialize the output structure */ + if( p_vout->p_sys->p_overlay == NULL ) + { + /* All we have is an RGB image with square pixels */ + p_vout->output.i_width = p_vout->p_sys->i_width; + p_vout->output.i_height = p_vout->p_sys->i_height; + p_vout->output.i_aspect = p_vout->p_sys->i_width + * VOUT_ASPECT_FACTOR + / p_vout->p_sys->i_height; + } + else { - SDL_LockSurface(p_vout->p_sys->p_display); + /* We may need to convert the chroma, but at least we keep the + * aspect ratio */ + p_vout->output.i_width = p_vout->render.i_width; + p_vout->output.i_height = p_vout->render.i_height; + p_vout->output.i_aspect = p_vout->render.i_aspect; + } + + /* Try to initialize SDL_MAX_DIRECTBUFFERS direct buffers */ + while( I_OUTPUTPICTURES < SDL_MAX_DIRECTBUFFERS ) + { + p_pic = NULL; + + /* Find an empty picture slot */ + for( i_index = 0 ; i_index < VOUT_MAX_PICTURES ; i_index++ ) + { + if( p_vout->p_picture[ i_index ].i_status == FREE_PICTURE ) + { + p_pic = p_vout->p_picture + i_index; + break; + } + } + + /* Allocate the picture if we found one */ + if( p_pic == NULL || NewPicture( p_vout, p_pic ) ) + { + break; + } + + p_pic->i_status = DESTROYED_PICTURE; + p_pic->i_type = DIRECT_PICTURE; + + PP_OUTPUTPICTURE[ I_OUTPUTPICTURES ] = p_pic; + + I_OUTPUTPICTURES++; } return( 0 ); } /***************************************************************************** - * vout_SDLEnd: terminate Sys video thread output method + * vout_End: terminate Sys video thread output method ***************************************************************************** * Terminate an output method created by vout_SDLCreate *****************************************************************************/ -void vout_SDLEnd( vout_thread_t *p_vout ) +static void vout_End( vout_thread_t *p_vout ) { - /* Release buffer */ - if( p_vout->p_sys->b_must_acquire ) + int i_index; + + /* Free the output buffers we allocated */ + for( i_index = I_OUTPUTPICTURES ; i_index ; ) { - SDL_UnlockSurface ( p_vout->p_sys->p_display ); + i_index--; + if( p_vout->p_sys->p_overlay == NULL ) + { + /* RGB picture */ + } + else + { + SDL_UnlockYUVOverlay( + PP_OUTPUTPICTURE[ i_index ]->p_sys->p_overlay ); + SDL_FreeYUVOverlay( + PP_OUTPUTPICTURE[ i_index ]->p_sys->p_overlay ); + } + free( PP_OUTPUTPICTURE[ i_index ]->p_sys ); } - free( p_vout->p_sys ); } /***************************************************************************** - * vout_SDLDestroy: destroy Sys video thread output method + * vout_Destroy: destroy Sys video thread output method ***************************************************************************** * Terminate an output method created by vout_SDLCreate *****************************************************************************/ -void vout_SDLDestroy( vout_thread_t *p_vout ) +static void vout_Destroy( vout_thread_t *p_vout ) { - SDLCloseDisplay( p_vout ); + CloseDisplay( p_vout ); + + SDL_QuitSubSystem( SDL_INIT_VIDEO ); + free( p_vout->p_sys ); } /***************************************************************************** - * vout_SDLManage: handle Sys events + * vout_Manage: handle Sys events ***************************************************************************** * This function should be called regularly by video output thread. It returns * a non null value if an error occured. *****************************************************************************/ -int vout_SDLManage( vout_thread_t *p_vout ) +static int vout_Manage( vout_thread_t *p_vout ) { - /* If the display has to be reopened we do so */ - if( p_vout->p_sys->b_reopen_display ) + SDL_Event event; /* SDL event */ + + /* Process events */ + while( SDL_PollEvent(&event) ) { - p_vout->p_sys->b_must_acquire = 0; - if( p_vout->p_sys->p_display ) + switch( event.type ) { - if( p_vout->p_sys->p_overlay ) + case SDL_VIDEORESIZE: /* Resizing of window */ + p_vout->p_sys->i_width = event.resize.w; + p_vout->p_sys->i_height = event.resize.h; + CloseDisplay( p_vout ); + OpenDisplay( p_vout ); + break; + + case SDL_MOUSEMOTION: + if( p_vout->p_sys->b_cursor && + (abs(event.motion.xrel) > 2 || abs(event.motion.yrel) > 2) ) { - SDL_FreeYUVOverlay(p_vout->p_sys->p_overlay); - p_vout->p_sys->p_overlay = NULL; + if( p_vout->p_sys->b_cursor_autohidden ) + { + p_vout->p_sys->b_cursor_autohidden = 0; + SDL_ShowCursor( 1 ); + } + else + { + p_vout->p_sys->i_lastmoved = mdate(); + } } - SDL_FreeSurface( p_vout->p_sys->p_display ); - p_vout->p_sys->p_display = NULL; - } + break; - if( SDLOpenDisplay(p_vout) ) - { - intf_ErrMsg( "error: can't open DISPLAY default display" ); - return( 1 ); + case SDL_MOUSEBUTTONUP: + switch( event.button.button ) + { + case SDL_BUTTON_RIGHT: + p_main->p_intf->b_menu_change = 1; + break; + } + break; + + case SDL_MOUSEBUTTONDOWN: + switch( event.button.button ) + { + case SDL_BUTTON_LEFT: + /* In this part we will eventually manage + * clicks for DVD navigation for instance. For the + * moment just pause the stream. */ + input_SetStatus( p_input_bank->pp_input[0], + INPUT_STATUS_PAUSE ); + break; + + case 4: + vout_Seek( 15 ); + break; + + case 5: + vout_Seek( -15 ); + break; + } + break; + + case SDL_QUIT: + p_main->p_intf->b_die = 1; + break; + + case SDL_KEYDOWN: /* if a key is pressed */ + + switch( event.key.keysym.sym ) + { + case SDLK_q: /* quit */ + case SDLK_ESCAPE: + p_main->p_intf->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: + p_main->p_intf->b_menu_change = 1; + break; + + case SDLK_LEFT: + vout_Seek( -5 ); + break; + + case SDLK_RIGHT: + vout_Seek( 5 ); + break; + + case SDLK_UP: + vout_Seek( 60 ); + break; + + case SDLK_DOWN: + vout_Seek( -60 ); + break; + + case SDLK_F10: network_ChannelJoin( 0 ); break; + case SDLK_F1: network_ChannelJoin( 1 ); break; + case SDLK_F2: network_ChannelJoin( 2 ); break; + case SDLK_F3: network_ChannelJoin( 3 ); break; + case SDLK_F4: network_ChannelJoin( 4 ); break; + case SDLK_F5: network_ChannelJoin( 5 ); break; + case SDLK_F6: network_ChannelJoin( 6 ); break; + case SDLK_F7: network_ChannelJoin( 7 ); break; + case SDLK_F8: network_ChannelJoin( 8 ); break; + case SDLK_F9: network_ChannelJoin( 9 ); break; + + default: + break; + } + break; + + default: + break; } - p_vout->p_sys->b_reopen_display = 0; } + + /* Fullscreen change */ + if( p_vout->i_changes & VOUT_FULLSCREEN_CHANGE ) + { + p_vout->b_fullscreen = ! p_vout->b_fullscreen; + + SDL_WM_ToggleFullScreen(p_vout->p_sys->p_display); + + p_vout->p_sys->b_cursor_autohidden = 0; + SDL_ShowCursor( p_vout->p_sys->b_cursor && + ! p_vout->p_sys->b_cursor_autohidden ); + + p_vout->i_changes &= ~VOUT_FULLSCREEN_CHANGE; + } + + /* Pointer change */ + if( ! p_vout->p_sys->b_cursor_autohidden && + ( mdate() - p_vout->p_sys->i_lastmoved > 2000000 ) ) + { + /* Hide the mouse automatically */ + p_vout->p_sys->b_cursor_autohidden = 1; + SDL_ShowCursor( 0 ); + } + return( 0 ); } /***************************************************************************** - * vout_SDLDisplay: displays previously rendered output + * vout_Render: render previously calculated output + *****************************************************************************/ +static void vout_Render( vout_thread_t *p_vout, picture_t *p_pic ) +{ + ; +} + +/***************************************************************************** + * vout_Display: displays previously rendered output ***************************************************************************** - * This function send the currently rendered image to the display, wait until - * it is displayed and switch the two rendering buffer, preparing next frame. + * This function sends the currently rendered image to the display. *****************************************************************************/ -void vout_SDLDisplay( vout_thread_t *p_vout ) +static void vout_Display( vout_thread_t *p_vout, picture_t *p_pic ) { - SDL_Rect disp; - if(p_vout->b_need_render) - { - /* Change display frame */ - if( p_vout->p_sys->b_must_acquire ) - { - - SDL_Flip( p_vout->p_sys->p_display ); - - /* Swap buffers and change write frame */ - SDL_LockSurface ( p_vout->p_sys->p_display ); - } - } - else - { - - /* - * p_vout->p_rendered_pic->p_y/u/v contains the YUV buffers to render - */ - if( p_vout->p_sys->b_must_acquire ) - { - /* TODO: support for streams other than 4:2:0 */ - /* create the overlay if necessary */ - if( p_vout->p_sys->p_overlay == NULL ) - { - p_vout->p_sys->p_overlay = SDL_CreateYUVOverlay( - p_vout->p_rendered_pic->i_width, - p_vout->p_rendered_pic->i_height, - SDL_YV12_OVERLAY, - p_vout->p_sys->p_display - ); - intf_Msg("[YUV acceleration] : %d,", - p_vout->p_sys->p_overlay->hw_overlay); - } + int x, y, w, h; + SDL_Rect disp; - SDL_LockYUVOverlay(p_vout->p_sys->p_overlay); - /* copy the data into video buffers */ - /* Y first */ - memcpy(p_vout->p_sys->p_overlay->pixels[0], - p_vout->p_rendered_pic->p_y, - p_vout->p_sys->p_overlay->h * - p_vout->p_sys->p_overlay->pitches[0]); - /* then V */ - memcpy(p_vout->p_sys->p_overlay->pixels[1], - p_vout->p_rendered_pic->p_v, - p_vout->p_sys->p_overlay->h * - p_vout->p_sys->p_overlay->pitches[1] / 2); - /* and U */ - memcpy(p_vout->p_sys->p_overlay->pixels[2], - p_vout->p_rendered_pic->p_u, - p_vout->p_sys->p_overlay->h * - p_vout->p_sys->p_overlay->pitches[2] / 2); - - disp.w = (&p_vout->p_buffer[p_vout->i_buffer_index])->i_pic_width; - disp.h = (&p_vout->p_buffer[p_vout->i_buffer_index])->i_pic_height; - disp.x = (p_vout->i_width - disp.w)/2; - disp.y = (p_vout->i_height - disp.h)/2; - - SDL_DisplayYUVOverlay( p_vout->p_sys->p_overlay , &disp ); - SDL_UnlockYUVOverlay(p_vout->p_sys->p_overlay); - } + vout_PlacePicture( p_vout, p_vout->p_sys->i_width, p_vout->p_sys->i_height, + &x, &y, &w, &h ); + disp.x = x; + disp.y = y; + disp.w = w; + disp.h = h; + + if( p_vout->p_sys->p_overlay == NULL ) + { + /* RGB picture */ + SDL_Flip( p_vout->p_sys->p_display ); + } + else + { + /* Overlay picture */ + SDL_UnlockYUVOverlay( p_pic->p_sys->p_overlay); + SDL_DisplayYUVOverlay( p_pic->p_sys->p_overlay , &disp ); + SDL_LockYUVOverlay( p_pic->p_sys->p_overlay); } } /* following functions are local */ /***************************************************************************** - * SDLOpenDisplay: open and initialize SDL device + * OpenDisplay: open and initialize SDL device ***************************************************************************** * Open and initialize display according to preferences specified in the vout * thread fields. *****************************************************************************/ -static int SDLOpenDisplay( vout_thread_t *p_vout ) +static int OpenDisplay( vout_thread_t *p_vout ) { - SDL_Rect clipping_rect; - Uint32 flags; - int bpp; - /* Open display - * TODO: Check that we can request for a DOUBLEBUF HWSURFACE display - */ - - /* init flags and cursor */ - flags = SDL_ANYFORMAT; - - if( p_vout->p_sys->b_fullscreen ) - flags |= SDL_FULLSCREEN; - else - flags |= SDL_RESIZABLE; + Uint32 i_flags; + int i_bpp; - if( p_vout->b_need_render ) - flags |= SDL_HWSURFACE | SDL_DOUBLEBUF; - else - flags |= SDL_SWSURFACE; /* save video memory */ - - bpp = SDL_VideoModeOK(p_vout->p_sys->i_width, - p_vout->p_sys->i_height, - p_vout->i_screen_depth, flags); + /* Initialize flags and cursor */ + i_flags = SDL_ANYFORMAT | SDL_HWPALETTE | SDL_HWSURFACE | SDL_DOUBLEBUF; + i_flags |= p_vout->b_fullscreen ? SDL_FULLSCREEN : SDL_RESIZABLE; - if(bpp == 0) + i_bpp = SDL_VideoModeOK( p_vout->p_sys->i_width, p_vout->p_sys->i_height, + SDL_DEFAULT_BPP, i_flags ); + if( i_bpp == 0 ) { - intf_ErrMsg( "error: can't open DISPLAY default display" ); + intf_ErrMsg( "vout error: no video mode available" ); return( 1 ); } - p_vout->p_sys->p_display = SDL_SetVideoMode(p_vout->p_sys->i_width, - p_vout->p_sys->i_height, - bpp, flags); + p_vout->p_sys->p_display = SDL_SetVideoMode( p_vout->p_sys->i_width, + p_vout->p_sys->i_height, + i_bpp, i_flags ); if( p_vout->p_sys->p_display == NULL ) { - intf_ErrMsg( "error: can't open DISPLAY default display" ); + intf_ErrMsg( "vout error: cannot set video mode" ); return( 1 ); } - if( p_vout->p_sys->b_fullscreen ) - SDL_ShowCursor( 0 ); - else - SDL_ShowCursor( 1 ); - - SDL_WM_SetCaption( VOUT_TITLE , VOUT_TITLE ); - SDL_EventState(SDL_KEYUP , SDL_IGNORE); /* ignore keys up */ + SDL_LockSurface( p_vout->p_sys->p_display ); - if( p_vout->b_need_render ) + /* Choose the chroma we will try first. */ + switch( p_vout->render.i_chroma ) { - p_vout->p_sys->p_buffer[ 0 ] = p_vout->p_sys->p_display->pixels; - SDL_Flip(p_vout->p_sys->p_display); - p_vout->p_sys->p_buffer[ 1 ] = p_vout->p_sys->p_display->pixels; - SDL_Flip(p_vout->p_sys->p_display); - - /* Set clipping for text */ - clipping_rect.x = 0; - clipping_rect.y = 0; - clipping_rect.w = p_vout->p_sys->p_display->w; - clipping_rect.h = p_vout->p_sys->p_display->h; - SDL_SetClipRect(p_vout->p_sys->p_display, &clipping_rect); - - /* Set thread information */ - p_vout->i_width = p_vout->p_sys->p_display->w; - p_vout->i_height = p_vout->p_sys->p_display->h; - p_vout->i_bytes_per_line = p_vout->p_sys->p_display->pitch; - - p_vout->i_screen_depth = - p_vout->p_sys->p_display->format->BitsPerPixel; - p_vout->i_bytes_per_pixel = - p_vout->p_sys->p_display->format->BytesPerPixel; - - p_vout->i_red_mask = p_vout->p_sys->p_display->format->Rmask; - p_vout->i_green_mask = p_vout->p_sys->p_display->format->Gmask; - p_vout->i_blue_mask = p_vout->p_sys->p_display->format->Bmask; - - /* FIXME: palette in 8bpp ?? */ - /* Set and initialize buffers */ - vout_SetBuffers( p_vout, p_vout->p_sys->p_buffer[ 0 ], - p_vout->p_sys->p_buffer[ 1 ] ); + case FOURCC_YUY2: + case FOURCC_YUNV: + p_vout->output.i_chroma = SDL_YUY2_OVERLAY; + break; + case FOURCC_UYVY: + case FOURCC_UYNV: + case FOURCC_Y422: + p_vout->output.i_chroma = SDL_UYVY_OVERLAY; + break; + case FOURCC_YVYU: + p_vout->output.i_chroma = SDL_YVYU_OVERLAY; + break; + case FOURCC_YV12: + case FOURCC_I420: + case FOURCC_IYUV: + default: + p_vout->output.i_chroma = SDL_YV12_OVERLAY; + break; } - else + + 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 ) { - p_vout->p_sys->p_buffer[ 0 ] = p_vout->p_sys->p_display->pixels; - p_vout->p_sys->p_buffer[ 1 ] = p_vout->p_sys->p_display->pixels; + 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 ); + } - /* Set thread information */ - p_vout->i_width = p_vout->p_sys->p_display->w; - p_vout->i_height = p_vout->p_sys->p_display->h; - p_vout->i_bytes_per_line = p_vout->p_sys->p_display->pitch; + 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 ); + } - vout_SetBuffers( p_vout, p_vout->p_sys->p_buffer[ 0 ], - p_vout->p_sys->p_buffer[ 1 ] ); + 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 ); } - p_vout->i_changes |= VOUT_YUV_CHANGE; + if( p_vout->p_sys->p_overlay == NULL ) + { + intf_WarnMsg( 3, "vout warning: no SDL overlay for 0x%.8x (%4.4s)", + p_vout->render.i_chroma, + (char*)&p_vout->render.i_chroma ); + + switch( p_vout->p_sys->p_display->format->BitsPerPixel ) + { + case 8: + p_vout->output.i_chroma = FOURCC_RGB2; + p_vout->output.pf_setpalette = SetPalette; + break; + case 15: + p_vout->output.i_chroma = FOURCC_RV15; + break; + case 16: + p_vout->output.i_chroma = FOURCC_RV16; + break; + case 24: + p_vout->output.i_chroma = FOURCC_RV24; + break; + case 32: + p_vout->output.i_chroma = FOURCC_RV32; + break; + default: + intf_ErrMsg( "vout error: unknown screen depth" ); + SDL_UnlockSurface( p_vout->p_sys->p_display ); + SDL_FreeSurface( p_vout->p_sys->p_display ); + return( -1 ); + } + + p_vout->output.i_rmask = p_vout->p_sys->p_display->format->Rmask; + p_vout->output.i_gmask = p_vout->p_sys->p_display->format->Gmask; + p_vout->output.i_bmask = p_vout->p_sys->p_display->format->Bmask; + + SDL_WM_SetCaption( VOUT_TITLE " (software RGB SDL output)", + VOUT_TITLE " (software RGB SDL output)" ); + } + else + { + if( p_vout->p_sys->p_overlay->hw_overlay ) + { + SDL_WM_SetCaption( VOUT_TITLE " (hardware YUV SDL output)", + VOUT_TITLE " (hardware YUV SDL output)" ); + } + else + { + SDL_WM_SetCaption( VOUT_TITLE " (software YUV SDL output)", + VOUT_TITLE " (software YUV SDL output)" ); + } + } - /* Check buffers properties */ - p_vout->p_sys->b_must_acquire = 1; /* always acquire */ + SDL_EventState( SDL_KEYUP, SDL_IGNORE ); /* ignore keys up */ return( 0 ); } /***************************************************************************** - * SDLCloseDisplay: close and reset SDL device + * CloseDisplay: close and reset SDL device ***************************************************************************** - * This function returns all resources allocated by SDLOpenDisplay and restore + * This function returns all resources allocated by OpenDisplay and restore * the original state of the device. *****************************************************************************/ -static void SDLCloseDisplay( vout_thread_t *p_vout ) +static void CloseDisplay( vout_thread_t *p_vout ) { - if( p_vout->p_sys->p_display ) + SDL_FreeYUVOverlay( p_vout->p_sys->p_overlay ); + SDL_UnlockSurface ( p_vout->p_sys->p_display ); + SDL_FreeSurface( p_vout->p_sys->p_display ); +} + +/***************************************************************************** + * NewPicture: allocate a picture + ***************************************************************************** + * Returns 0 on success, -1 otherwise + *****************************************************************************/ +static int NewPicture( vout_thread_t *p_vout, picture_t *p_pic ) +{ + int i_width = p_vout->output.i_width; + int i_height = p_vout->output.i_height; + + if( p_vout->p_sys->p_overlay == NULL ) { - p_vout->p_sys->b_must_acquire = 0; - if( p_vout->p_sys->p_overlay ) + /* RGB picture */ + if( p_vout->p_sys->i_surfaces ) + { + /* We already allocated this surface, return */ + return -1; + } + + p_pic->p_sys = malloc( sizeof( picture_sys_t ) ); + + if( p_pic->p_sys == NULL ) { - SDL_FreeYUVOverlay(p_vout->p_sys->p_overlay); - p_vout->p_sys->p_overlay = NULL; + return -1; } - SDL_UnlockSurface(p_vout->p_sys->p_display); - SDL_FreeSurface( p_vout->p_sys->p_display ); - p_vout->p_sys->p_display = NULL; + + switch( p_vout->p_sys->p_display->format->BitsPerPixel ) + { + case 8: + p_pic->p->i_pixel_bytes = 1; + break; + case 15: + case 16: + p_pic->p->i_pixel_bytes = 2; + break; + case 24: + case 32: + p_pic->p->i_pixel_bytes = 4; + break; + default: + return( -1 ); + } + + 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_pitch = p_vout->p_sys->p_display->pitch; + + if( p_pic->p->i_pitch == + p_pic->p->i_pixel_bytes * p_vout->p_sys->p_display->w ) + { + p_pic->p->b_margin = 0; + } + else + { + p_pic->p->b_margin = 1; + p_pic->p->b_hidden = 1; + p_pic->p->i_visible_bytes = + p_pic->p->i_pixel_bytes * p_vout->p_sys->p_display->w; + } + + p_vout->p_sys->i_surfaces++; + + p_pic->i_planes = 1; + } + else + { + p_pic->p_sys = malloc( sizeof( picture_sys_t ) ); + + if( p_pic->p_sys == NULL ) + { + return -1; + } + + p_pic->p_sys->p_overlay = + SDL_CreateYUVOverlay( i_width, i_height, + p_vout->output.i_chroma, + p_vout->p_sys->p_display ); + + if( p_pic->p_sys->p_overlay == NULL ) + { + free( p_pic->p_sys ); + return -1; + } + + 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_pitch = p_pic->p_sys->p_overlay->pitches[0]; + + switch( p_vout->output.i_chroma ) + { + case SDL_YV12_OVERLAY: + p_pic->p[Y_PLANE].i_pixel_bytes = 1; + p_pic->p[Y_PLANE].b_margin = 0; + + 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_pitch = p_pic->p_sys->p_overlay->pitches[2]; + p_pic->p[U_PLANE].i_pixel_bytes = 1; + p_pic->p[U_PLANE].b_margin = 0; + + 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_pitch = p_pic->p_sys->p_overlay->pitches[1]; + p_pic->p[V_PLANE].i_pixel_bytes = 1; + p_pic->p[V_PLANE].b_margin = 0; + + p_pic->i_planes = 3; + break; + + case SDL_IYUV_OVERLAY: + p_pic->p[Y_PLANE].i_pixel_bytes = 1; + p_pic->p[Y_PLANE].b_margin = 0; + + 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_pitch = p_pic->p_sys->p_overlay->pitches[1]; + p_pic->p[U_PLANE].i_pixel_bytes = 1; + p_pic->p[U_PLANE].b_margin = 0; + + 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_pitch = p_pic->p_sys->p_overlay->pitches[2]; + p_pic->p[V_PLANE].i_pixel_bytes = 1; + p_pic->p[V_PLANE].b_margin = 0; + + p_pic->i_planes = 3; + break; + + default: + p_pic->p[Y_PLANE].i_pixel_bytes = 2; + p_pic->p[Y_PLANE].b_margin = 0; + + p_pic->i_planes = 1; + break; + } + } + + return 0; +} + +/***************************************************************************** + * SetPalette: sets an 8 bpp palette + *****************************************************************************/ +static void SetPalette( vout_thread_t *p_vout, u16 *red, u16 *green, u16 *blue ) +{ + SDL_Color colors[256]; + int i; + + /* Fill colors with color information */ + for( i = 0; i < 256; i++ ) + { + colors[ i ].r = red[ i ] >> 8; + colors[ i ].g = green[ i ] >> 8; + colors[ i ].b = blue[ i ] >> 8; } - SDL_Quit(); + /* Set palette */ + if( SDL_SetColors( p_vout->p_sys->p_display, colors, 0, 256 ) == 0 ) + { + intf_ErrMsg( "vout error: failed setting palette" ); + } }