Commit 7f9999df authored by Antoine Cellerier's avatar Antoine Cellerier

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

parent 2e2178f7
...@@ -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,6 +817,8 @@ static int OpenDisplay( vout_thread_t *p_vout ) ...@@ -813,6 +817,8 @@ static int OpenDisplay( vout_thread_t *p_vout )
} }
} }
if( b_overlay )
{
/* Choose the chroma we will try first. */ /* Choose the chroma we will try first. */
do do
{ {
...@@ -877,11 +883,16 @@ static int OpenDisplay( vout_thread_t *p_vout ) ...@@ -877,11 +883,16 @@ static int OpenDisplay( vout_thread_t *p_vout )
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 )
{ {
if( b_overlay )
msg_Warn( p_vout, "no SDL overlay for 0x%.8x (%4.4s)", msg_Warn( p_vout, "no SDL overlay for 0x%.8x (%4.4s)",
p_vout->render.i_chroma, (char*)&p_vout->render.i_chroma ); 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