* vout_sdl.c: SDL video output display method
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
- * $Id: vout_sdl.c,v 1.76 2002/01/04 14:01:34 sam Exp $
+ * $Id: vout_sdl.c,v 1.85 2002/03/18 19:14:52 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Pierre Baillet <oct@zoy.org>
#include "stream_control.h" /* needed by input_ext-intf.h... */
#include "input_ext-intf.h"
-#define SDL_MAX_DIRECTBUFFERS 5
+#define SDL_MAX_DIRECTBUFFERS 10
#define SDL_DEFAULT_BPP 16
/*****************************************************************************
typedef struct vout_sys_s
{
SDL_Surface * p_display; /* display device */
- SDL_Overlay * p_overlay; /* An overlay we keep to grab the XVideo port */
int i_width;
int i_height;
/* For YUV output */
- u32 i_chroma; /* The internally selected chroma */
+ SDL_Overlay * p_overlay; /* An overlay we keep to grab the XVideo port */
/* For RGB output */
int i_surfaces;
- int i_red_mask;
- int i_green_mask;
- int i_blue_mask;
boolean_t b_cursor;
boolean_t b_cursor_autohidden;
*****************************************************************************/
static __inline__ void vout_Seek( off_t i_seek )
{
-#define area p_main->p_intf->p_input->stream.p_selected_area
- off_t i_tell = area->i_tell;
+ off_t i_tell;
- i_tell += i_seek * (off_t)50 * p_main->p_intf->p_input->stream.i_mux_rate;
-
- i_tell = ( i_tell <= area->i_start ) ? area->i_start
- : ( i_tell >= area->i_size ) ? area->i_size
- : i_tell;
-
- input_Seek( p_main->p_intf->p_input, i_tell );
-#undef area
-}
-
-/*****************************************************************************
- * Return the best suited FourCC value for a given chroma. We use this
- * because a decoder may output FOURCC_IYUV, which is exactly the same as
- * FOURCC_I420, but X servers usually know FOURCC_I420 and not FOURCC_IYUV.
- *****************************************************************************/
-static __inline__ u32 BestChroma( u32 i_chroma )
-{
- /* XXX: don't forget to update vout_Init if you change this */
- switch( i_chroma )
+ vlc_mutex_lock( &p_input_bank->lock );
+ if( p_input_bank->pp_input[0] != NULL )
{
- /* These ones are almost the same */
- case FOURCC_I420:
- case FOURCC_IYUV:
- case FOURCC_YV12:
- return SDL_YV12_OVERLAY;
+#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;
- /* These ones are all the same */
- case FOURCC_UYVY:
- case FOURCC_UYNV:
- case FOURCC_Y422:
- return SDL_UYVY_OVERLAY;
-
- /* These ones are all the same */
- case FOURCC_YUY2:
- case FOURCC_YUNV:
- return SDL_YUY2_OVERLAY;
-
- /* We know this one */
- case FOURCC_YVYU:
- return SDL_YVYU_OVERLAY;
+ 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;
- /* This is seldom supported, but we know how to convert it */
- case FOURCC_I422:
- return SDL_YUY2_OVERLAY;
-
- /* We don't know this chroma, but maybe SDL does */
- default:
- return i_chroma;
+ input_Seek( p_input_bank->pp_input[0], i_tell );
+#undef S
}
+ vlc_mutex_unlock( &p_input_bank->lock );
}
/*****************************************************************************
* Local prototypes.
*****************************************************************************/
-static int vout_Probe ( probedata_t *p_data );
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_Render ( struct vout_thread_s *, struct picture_s * );
static void vout_Display ( struct vout_thread_s *, struct picture_s * );
-static int SDLOpenDisplay ( vout_thread_t *p_vout );
-static void SDLCloseDisplay ( vout_thread_t *p_vout );
-static int SDLNewPicture ( vout_thread_t *p_vout, picture_t *p_pic );
+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
*****************************************************************************/
void _M( vout_getfunctions )( function_list_t * p_function_list )
{
- p_function_list->pf_probe = vout_Probe;
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_manage = vout_Manage;
p_function_list->functions.vout.pf_render = vout_Render;
p_function_list->functions.vout.pf_display = vout_Display;
- p_function_list->functions.vout.pf_setpalette = NULL;
-}
-
-/*****************************************************************************
- * vout_Probe: probe the video driver and return a score
- *****************************************************************************
- * This function tries to initialize SDL and returns a score to the
- * plugin manager so that it can select the best plugin.
- *****************************************************************************/
-static int vout_Probe( probedata_t *p_data )
-{
- if( SDL_WasInit( SDL_INIT_VIDEO ) != 0 )
- {
- return( 0 );
- }
-
- return( 100 );
}
/*****************************************************************************
*****************************************************************************/
static int vout_Create( vout_thread_t *p_vout )
{
+ char *psz_method;
+
if( SDL_WasInit( SDL_INIT_VIDEO ) != 0 )
{
return( 1 );
return( 1 );
}
+ 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
#ifndef WIN32
}
#endif
- if( SDLOpenDisplay( p_vout ) )
+ if( OpenDisplay( p_vout ) )
{
intf_ErrMsg( "vout error: can't set up SDL (%s)", SDL_GetError() );
SDL_QuitSubSystem( SDL_INIT_VIDEO );
if( p_vout->p_sys->p_overlay == NULL )
{
/* All we have is an RGB image with square pixels */
- p_vout->output.i_chroma = p_vout->p_sys->i_chroma;
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
}
else
{
- switch( p_vout->render.i_chroma )
- {
- case FOURCC_I420:
- case FOURCC_IYUV:
- case FOURCC_YV12:
-
- case FOURCC_UYVY:
- case FOURCC_UYNV:
- case FOURCC_Y422:
-
- case FOURCC_YUY2:
- case FOURCC_YUNV:
-
- case FOURCC_YVYU:
- /* We can directly handle all these chromas */
- p_vout->output.i_chroma = p_vout->render.i_chroma;
- 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;
- break;
-
- case FOURCC_I422:
- /* We need to convert this one, but at least we keep the
- * aspect ratio */
- p_vout->output.i_chroma = p_vout->p_sys->i_chroma;
- 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;
- break;
-
- default:
- /* All we have is an RGB image with square pixels */
- p_vout->output.i_chroma = p_vout->p_sys->i_chroma;
- 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;
- break;
- }
+ /* 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 */
}
/* Allocate the picture if we found one */
- if( p_pic == NULL || SDLNewPicture( p_vout, p_pic ) )
+ if( p_pic == NULL || NewPicture( p_vout, p_pic ) )
{
break;
}
*****************************************************************************/
static void vout_Destroy( vout_thread_t *p_vout )
{
- SDLCloseDisplay( p_vout );
+ CloseDisplay( p_vout );
SDL_QuitSubSystem( SDL_INIT_VIDEO );
case SDL_VIDEORESIZE: /* Resizing of window */
p_vout->p_sys->i_width = event.resize.w;
p_vout->p_sys->i_height = event.resize.h;
- SDLCloseDisplay( p_vout );
- SDLOpenDisplay( p_vout );
+ CloseDisplay( p_vout );
+ OpenDisplay( p_vout );
break;
case SDL_MOUSEMOTION:
/* In this part we will eventually manage
* clicks for DVD navigation for instance. For the
* moment just pause the stream. */
- input_SetStatus( p_main->p_intf->p_input, INPUT_STATUS_PAUSE );
+ input_SetStatus( p_input_bank->pp_input[0],
+ INPUT_STATUS_PAUSE );
break;
case 4:
case SDLK_F9: network_ChannelJoin( 9 ); break;
default:
- intf_DbgMsg( "unhandled key %i", event.key.keysym.sym );
break;
}
break;
/* 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 )
{
Uint32 i_flags;
int i_bpp;
SDL_LockSurface( p_vout->p_sys->p_display );
- /* Ask BestChroma what we should use as a chroma */
- p_vout->p_sys->i_chroma = BestChroma( p_vout->render.i_chroma );
+ /* Choose the chroma we will try first. */
+ switch( p_vout->render.i_chroma )
+ {
+ 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;
+ }
p_vout->p_sys->p_overlay =
- SDL_CreateYUVOverlay( 32, 32, p_vout->p_sys->i_chroma,
+ 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 ... */
- /* See if BestChroma's guess was valid */
+ /* If this best choice failed, fall back to other chromas */
if( p_vout->p_sys->p_overlay == NULL )
{
- intf_WarnMsg( 3, "vout warning: cannot set SDL overlay 0x%.8llx",
- p_vout->p_sys->i_chroma );
+ 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 );
+ }
+
+ 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 );
+ }
+
+ 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( 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->p_sys->i_chroma = FOURCC_BI_RGB;
+ p_vout->output.i_chroma = FOURCC_RGB2;
+ p_vout->output.pf_setpalette = SetPalette;
break;
case 15:
- p_vout->p_sys->i_chroma = FOURCC_RV15;
+ p_vout->output.i_chroma = FOURCC_RV15;
break;
case 16:
- p_vout->p_sys->i_chroma = FOURCC_RV16;
+ p_vout->output.i_chroma = FOURCC_RV16;
break;
case 24:
- p_vout->p_sys->i_chroma = FOURCC_BI_BITFIELDS;
+ p_vout->output.i_chroma = FOURCC_RV24;
break;
case 32:
- p_vout->p_sys->i_chroma = FOURCC_BI_BITFIELDS;
+ p_vout->output.i_chroma = FOURCC_RV32;
break;
default:
intf_ErrMsg( "vout error: unknown screen depth" );
return( -1 );
}
- p_vout->p_sys->i_red_mask = p_vout->p_sys->p_display->format->Rmask;
- p_vout->p_sys->i_green_mask = p_vout->p_sys->p_display->format->Gmask;
- p_vout->p_sys->i_blue_mask = p_vout->p_sys->p_display->format->Bmask;
+ 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)" );
}
/*****************************************************************************
- * 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 )
{
SDL_FreeYUVOverlay( p_vout->p_sys->p_overlay );
SDL_UnlockSurface ( p_vout->p_sys->p_display );
}
/*****************************************************************************
- * SDLNewPicture: allocate a picture
+ * NewPicture: allocate a picture
*****************************************************************************
* Returns 0 on success, -1 otherwise
*****************************************************************************/
-static int SDLNewPicture( vout_thread_t *p_vout, picture_t *p_pic )
+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;
- switch( p_vout->p_sys->i_chroma )
+ if( p_vout->p_sys->p_overlay == NULL )
{
- case SDL_YV12_OVERLAY:
- case SDL_IYUV_OVERLAY:
- case SDL_YUY2_OVERLAY:
- case SDL_UYVY_OVERLAY:
- case SDL_YVYU_OVERLAY:
- 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->p_sys->i_chroma,
- p_vout->p_sys->p_display );
-
- if( p_pic->p_sys->p_overlay == NULL )
- {
- free( p_pic->p_sys );
- return -1;
- }
+ /* RGB picture */
+ if( p_vout->p_sys->i_surfaces )
+ {
+ /* We already allocated this surface, return */
+ return -1;
+ }
- SDL_LockYUVOverlay( p_pic->p_sys->p_overlay );
+ p_pic->p_sys = malloc( sizeof( picture_sys_t ) );
- 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];
+ if( p_pic->p_sys == NULL )
+ {
+ return -1;
+ }
- switch( p_vout->p_sys->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;
+ 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 );
+ }
- case SDL_IYUV_OVERLAY:
- p_pic->p[Y_PLANE].i_pixel_bytes = 1;
- p_pic->p[Y_PLANE].b_margin = 0;
+ 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;
- 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;
+ 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_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_vout->p_sys->i_surfaces++;
- p_pic->i_planes = 3;
- break;
+ p_pic->i_planes = 1;
+ }
+ else
+ {
+ p_pic->p_sys = malloc( sizeof( picture_sys_t ) );
- default:
- p_pic->p[Y_PLANE].i_pixel_bytes = 2;
- p_pic->p[Y_PLANE].b_margin = 0;
+ if( p_pic->p_sys == NULL )
+ {
+ return -1;
+ }
- p_pic->i_planes = 1;
- break;
- }
+ p_pic->p_sys->p_overlay =
+ SDL_CreateYUVOverlay( i_width, i_height,
+ p_vout->output.i_chroma,
+ p_vout->p_sys->p_display );
- return 0;
+ if( p_pic->p_sys->p_overlay == NULL )
+ {
+ free( p_pic->p_sys );
+ return -1;
+ }
- default:
- /* RGB picture */
- if( p_vout->p_sys->i_surfaces )
- {
- /* We already allocated this surface, return */
- return -1;
- }
+ SDL_LockYUVOverlay( p_pic->p_sys->p_overlay );
- p_pic->p_sys = malloc( sizeof( picture_sys_t ) );
+ 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];
- if( p_pic->p_sys == NULL )
- {
- return -1;
- }
+ 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;
- 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;
+ 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;
- p_pic->p->i_pixel_bytes = 2;
- if( p_pic->p->i_pitch != 2 * p_vout->p_sys->p_display->w )
- {
- intf_ErrMsg("OOO XXX OOO --- Wooooooohoooo !! --- OOO XXX OOO");
- intf_ErrMsg("%i != 2 * %i", p_pic->p->i_pitch, p_vout->p_sys->p_display->w );
- }
- p_pic->p->b_margin = 0;
+ default:
+ p_pic->p[Y_PLANE].i_pixel_bytes = 2;
+ p_pic->p[Y_PLANE].b_margin = 0;
- p_pic->p->i_red_mask = p_vout->p_sys->p_display->format->Rmask;
- p_pic->p->i_green_mask = p_vout->p_sys->p_display->format->Gmask;
- p_pic->p->i_blue_mask = p_vout->p_sys->p_display->format->Bmask;
+ p_pic->i_planes = 1;
+ break;
+ }
+ }
- p_vout->p_sys->i_surfaces++;
+ return 0;
+}
- p_pic->i_planes = 1;
+/*****************************************************************************
+ * 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;
+ }
- return 0;
+ /* Set palette */
+ if( SDL_SetColors( p_vout->p_sys->p_display, colors, 0, 256 ) == 0 )
+ {
+ intf_ErrMsg( "vout error: failed setting palette" );
}
}