Skip to content

V
vlc-gpu
Commit 7f9999df authored by Antoine Cellerier's avatar Antoine Cellerier
Browse files
Options

Enforce --no-overlay option in SDL video output.

parent 2e2178f7
Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 58 deletions
modules/video_output/sdl.c
View file @ 7f9999df
...@@ -162,6 +162,8 @@ static int Open ( vlc_object_t *p_this ) ...@@ -162,6 +162,8 @@ static int Open ( vlc_object_t *p_this )
return VLC_ENOMEM; return VLC_ENOMEM;
} }
memset( p_vout->p_sys, 0, sizeof( vout_sys_t ) );
/* Check if SDL video module has been initialized */ /* Check if SDL video module has been initialized */
if( SDL_WasInit( SDL_INIT_VIDEO ) != 0 ) if( SDL_WasInit( SDL_INIT_VIDEO ) != 0 )
{ {
...@@ -762,6 +764,8 @@ static int OpenDisplay( vout_thread_t *p_vout ) ...@@ -762,6 +764,8 @@ static int OpenDisplay( vout_thread_t *p_vout )
char *psz_chroma = NULL; char *psz_chroma = NULL;
uint32_t i_chroma = 0; uint32_t i_chroma = 0;
bool b_overlay = config_GetInt( p_vout, "overlay" );
/* Set main window's size */ /* Set main window's size */
#if SDL_VERSION_ATLEAST(1,2,10) #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->p_sys->i_width = p_vout->b_fullscreen ? p_vout->p_sys->i_desktop_width :
...@@ -813,75 +817,82 @@ static int OpenDisplay( vout_thread_t *p_vout ) ...@@ -813,75 +817,82 @@ static int OpenDisplay( vout_thread_t *p_vout )
} }
} }
/* Choose the chroma we will try first. */ if( b_overlay )
do
{ {
if( !psz_chroma ) i_chroma = 0; /* Choose the chroma we will try first. */
switch( i_chroma ? i_chroma : p_vout->render.i_chroma ) do
{ {
case VLC_FOURCC('Y','U','Y','2'): if( !psz_chroma ) i_chroma = 0;
case VLC_FOURCC('Y','U','N','V'): switch( i_chroma ? i_chroma : p_vout->render.i_chroma )
p_vout->output.i_chroma = VLC_FOURCC('Y','U','Y','2'); {
i_sdl_chroma = SDL_YUY2_OVERLAY; case VLC_FOURCC('Y','U','Y','2'):
break; case VLC_FOURCC('Y','U','N','V'):
case VLC_FOURCC('U','Y','V','Y'): p_vout->output.i_chroma = VLC_FOURCC('Y','U','Y','2');
case VLC_FOURCC('U','Y','N','V'): i_sdl_chroma = SDL_YUY2_OVERLAY;
case VLC_FOURCC('Y','4','2','2'): break;
p_vout->output.i_chroma = VLC_FOURCC('U','Y','V','Y'); case VLC_FOURCC('U','Y','V','Y'):
i_sdl_chroma = SDL_UYVY_OVERLAY; case VLC_FOURCC('U','Y','N','V'):
break; case VLC_FOURCC('Y','4','2','2'):
case VLC_FOURCC('Y','V','Y','U'): p_vout->output.i_chroma = VLC_FOURCC('U','Y','V','Y');
p_vout->output.i_chroma = VLC_FOURCC('Y','V','Y','U'); i_sdl_chroma = SDL_UYVY_OVERLAY;
i_sdl_chroma = SDL_YVYU_OVERLAY; break;
break; case VLC_FOURCC('Y','V','Y','U'):
case VLC_FOURCC('Y','V','1','2'): p_vout->output.i_chroma = VLC_FOURCC('Y','V','Y','U');
case VLC_FOURCC('I','4','2','0'): i_sdl_chroma = SDL_YVYU_OVERLAY;
case VLC_FOURCC('I','Y','U','V'): break;
default: case VLC_FOURCC('Y','V','1','2'):
p_vout->output.i_chroma = VLC_FOURCC('Y','V','1','2'); case VLC_FOURCC('I','4','2','0'):
i_sdl_chroma = SDL_YV12_OVERLAY; case VLC_FOURCC('I','Y','U','V'):
break; default:
} p_vout->output.i_chroma = VLC_FOURCC('Y','V','1','2');
free( psz_chroma ); psz_chroma = NULL; i_sdl_chroma = SDL_YV12_OVERLAY;
break;
}
free( psz_chroma ); psz_chroma = NULL;
p_vout->p_sys->p_overlay = p_vout->p_sys->p_overlay =
SDL_CreateYUVOverlay( 32, 32, i_sdl_chroma, SDL_CreateYUVOverlay( 32, 32, i_sdl_chroma,
p_vout->p_sys->p_display ); p_vout->p_sys->p_display );
/* FIXME: if the first overlay we find is software, don't stop, /* FIXME: if the first overlay we find is software, don't stop,
* because we may find a hardware one later ... */ * because we may find a hardware one later ... */
} }
while( i_chroma && !p_vout->p_sys->p_overlay ); while( i_chroma && !p_vout->p_sys->p_overlay );
/* If this best choice failed, fall back to other chromas */ /* If this best choice failed, fall back to other chromas */
if( p_vout->p_sys->p_overlay == NULL ) if( p_vout->p_sys->p_overlay == NULL )
{ {
p_vout->output.i_chroma = VLC_FOURCC('I','Y','U','V'); p_vout->output.i_chroma = VLC_FOURCC('I','Y','U','V');
p_vout->p_sys->p_overlay = p_vout->p_sys->p_overlay =
SDL_CreateYUVOverlay( 32, 32, SDL_IYUV_OVERLAY, SDL_CreateYUVOverlay( 32, 32, SDL_IYUV_OVERLAY,
p_vout->p_sys->p_display ); p_vout->p_sys->p_display );
} }
if( p_vout->p_sys->p_overlay == NULL ) if( p_vout->p_sys->p_overlay == NULL )
{ {
p_vout->output.i_chroma = VLC_FOURCC('Y','V','1','2'); p_vout->output.i_chroma = VLC_FOURCC('Y','V','1','2');
p_vout->p_sys->p_overlay = p_vout->p_sys->p_overlay =
SDL_CreateYUVOverlay( 32, 32, SDL_YV12_OVERLAY, SDL_CreateYUVOverlay( 32, 32, SDL_YV12_OVERLAY,
p_vout->p_sys->p_display ); p_vout->p_sys->p_display );
} }
if( p_vout->p_sys->p_overlay == NULL ) if( p_vout->p_sys->p_overlay == NULL )
{ {
p_vout->output.i_chroma = VLC_FOURCC('Y','U','Y','2'); p_vout->output.i_chroma = VLC_FOURCC('Y','U','Y','2');
p_vout->p_sys->p_overlay = p_vout->p_sys->p_overlay =
SDL_CreateYUVOverlay( 32, 32, SDL_YUY2_OVERLAY, SDL_CreateYUVOverlay( 32, 32, SDL_YUY2_OVERLAY,
p_vout->p_sys->p_display ); p_vout->p_sys->p_display );
}
} }
if( p_vout->p_sys->p_overlay == NULL ) if( p_vout->p_sys->p_overlay == NULL )
{ {
msg_Warn( p_vout, "no SDL overlay for 0x%.8x (%4.4s)", if( b_overlay )
p_vout->render.i_chroma, (char*)&p_vout->render.i_chroma ); 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 ) switch( p_vout->p_sys->p_display->format->BitsPerPixel )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment