fix a buffer overflow

[libpicofe.git] / plat_sdl.c

diff --git a/plat_sdl.c b/plat_sdl.c
index 1f304aa..bbb466e 100644 (file)
--- a/plat_sdl.c
+++ b/plat_sdl.c
@@ -24,8 +24,10 @@
 SDL_Surface *plat_sdl_screen;
 SDL_Overlay *plat_sdl_overlay;
 int plat_sdl_gl_active;
+void (*plat_sdl_resize_cb)(int w, int h);
 void (*plat_sdl_quit_cb)(void);
 
+static char vid_drv_name[32];
 static int window_w, window_h;
 static int fs_w, fs_h;
 static int old_fullscreen;
@@ -47,6 +49,15 @@ int plat_sdl_change_video_mode(int w, int h, int force)
   else
     prev_h = h;
 
+  // invalid method might come from config..
+  if (plat_target.vout_method != 0
+      && plat_target.vout_method != vout_mode_overlay
+      && plat_target.vout_method != vout_mode_gl)
+  {
+    fprintf(stderr, "invalid vout_method: %d\n", plat_target.vout_method);
+    plat_target.vout_method = 0;
+  }
+
   // skip GL recreation if window doesn't change - avoids flicker
   if (plat_target.vout_method == vout_mode_gl && plat_sdl_gl_active
       && plat_target.vout_fullscreen == old_fullscreen && !force)
@@ -75,6 +86,7 @@ int plat_sdl_change_video_mode(int w, int h, int force)
     }
 
     // XXX: workaround some occasional mysterious deadlock in SDL_SetVideoMode
+    // (seen on r-pi)
     SDL_PumpEvents();
 
     plat_sdl_screen = SDL_SetVideoMode(win_w, win_h, 0, flags);
@@ -108,7 +120,7 @@ int plat_sdl_change_video_mode(int w, int h, int force)
   if (plat_target.vout_method == 0) {
     SDL_PumpEvents();
 
-    plat_sdl_screen = SDL_SetVideoMode(w, h, 16, SDL_SWSURFACE);
+    plat_sdl_screen = SDL_SetVideoMode(w, h, 16, SDL_HWSURFACE | SDL_DOUBLEBUF);
     if (plat_sdl_screen == NULL) {
       fprintf(stderr, "SDL_SetVideoMode failed: %s\n", SDL_GetError());
       return -1;
@@ -116,6 +128,9 @@ int plat_sdl_change_video_mode(int w, int h, int force)
   }
 
   old_fullscreen = plat_target.vout_fullscreen;
+  if (plat_sdl_resize_cb != NULL)
+    plat_sdl_resize_cb(plat_sdl_screen->w, plat_sdl_screen->h);
+
   return 0;
 }
 
@@ -164,7 +179,6 @@ int plat_sdl_init(void)
   static const char *vout_list[] = { NULL, NULL, NULL, NULL };
   const SDL_VideoInfo *info;
   SDL_SysWMinfo wminfo;
-  char vid_drv_name[64];
   int overlay_works = 0;
   int gl_works = 0;
   int i, ret, h;
@@ -179,6 +193,7 @@ int plat_sdl_init(void)
   if (info != NULL) {
     fs_w = info->current_w;
     fs_h = info->current_h;
+    printf("plat_sdl: using %dx%d as fullscreen resolution\n", fs_w, fs_h);
   }
 
   g_menuscreen_w = 640;
@@ -210,10 +225,18 @@ int plat_sdl_init(void)
   g_menuscreen_w = window_w = plat_sdl_screen->w;
   g_menuscreen_h = window_h = plat_sdl_screen->h;
 
+  // overlay/gl require native bpp in some cases..
+  plat_sdl_screen = SDL_SetVideoMode(g_menuscreen_w, g_menuscreen_h,
+    0, plat_sdl_screen->flags);
+  if (plat_sdl_screen == NULL) {
+    fprintf(stderr, "SDL_SetVideoMode failed: %s\n", SDL_GetError());
+    goto fail;
+  }
+
   plat_sdl_overlay = SDL_CreateYUVOverlay(plat_sdl_screen->w, plat_sdl_screen->h,
     SDL_UYVY_OVERLAY, plat_sdl_screen);
   if (plat_sdl_overlay != NULL) {
-    printf("overlay: fmt %x, planes: %d, pitch: %d, hw: %d\n",
+    printf("plat_sdl: overlay: fmt %x, planes: %d, pitch: %d, hw: %d\n",
       plat_sdl_overlay->format, plat_sdl_overlay->planes, *plat_sdl_overlay->pitches,
       plat_sdl_overlay->hw_overlay);
 
@@ -239,6 +262,8 @@ int plat_sdl_init(void)
       window = (void *)wminfo.info.x11.window;
     }
   }
+#else
+  (void)wminfo;
 #endif
 
   ret = gl_init(display, window, &gl_quirks);
@@ -276,6 +301,10 @@ void plat_sdl_finish(void)
     gl_finish();
     plat_sdl_gl_active = 0;
   }
+  // restore back to initial resolution
+  // resolves black screen issue on R-Pi
+  if (strcmp(vid_drv_name, "x11") != 0)
+    SDL_SetVideoMode(fs_w, fs_h, 16, SDL_SWSURFACE);
   SDL_Quit();
 }