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;
-static int vout_mode_overlay = -1, vout_mode_gl = -1;
+static int vout_mode_overlay = -1, vout_mode_overlay2x = -1, vout_mode_gl = -1;
static void *display, *window;
static int gl_quirks;
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_overlay2x
+ && 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)
}
// 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);
}
}
- if (plat_target.vout_method == vout_mode_overlay) {
- plat_sdl_overlay = SDL_CreateYUVOverlay(w, h, SDL_UYVY_OVERLAY, plat_sdl_screen);
+ if (plat_target.vout_method == vout_mode_overlay
+ || plat_target.vout_method == vout_mode_overlay2x) {
+ int W = plat_target.vout_method == vout_mode_overlay2x && w == 320 ? 2*w : w;
+ plat_sdl_overlay = SDL_CreateYUVOverlay(W, h, SDL_UYVY_OVERLAY, plat_sdl_screen);
if (plat_sdl_overlay != NULL) {
if ((long)plat_sdl_overlay->pixels[0] & 3)
fprintf(stderr, "warning: overlay pointer is unaligned\n");
if (plat_target.vout_method == 0) {
SDL_PumpEvents();
+#if defined SDL_SURFACE_SW
plat_sdl_screen = SDL_SetVideoMode(w, h, 16, SDL_SWSURFACE);
+#elif defined(SDL_TRIPLEBUF) && defined(SDL_BUFFER_3X)
+ plat_sdl_screen = SDL_SetVideoMode(w, h, 16, SDL_HWSURFACE | SDL_TRIPLEBUF);
+#else
+ plat_sdl_screen = SDL_SetVideoMode(w, h, 16, SDL_HWSURFACE | SDL_DOUBLEBUF);
+#endif
if (plat_sdl_screen == NULL) {
fprintf(stderr, "SDL_SetVideoMode failed: %s\n", SDL_GetError());
return -1;
}
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;
}
int plat_sdl_init(void)
{
- static const char *vout_list[] = { NULL, NULL, NULL, NULL };
+ static const char *vout_list[] = { NULL, NULL, NULL, NULL, NULL };
const SDL_VideoInfo *info;
SDL_SysWMinfo wminfo;
- char vid_drv_name[64];
+ const char *env;
int overlay_works = 0;
int gl_works = 0;
int i, ret, h;
+ int try_gl;
ret = SDL_Init(SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE);
if (ret != 0) {
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;
}
g_menuscreen_w = window_w = plat_sdl_screen->w;
g_menuscreen_h = window_h = plat_sdl_screen->h;
+ g_menuscreen_pp = g_menuscreen_w;
+
+ // 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);
window = (void *)wminfo.info.x11.window;
}
}
+#else
+ (void)wminfo;
#endif
- ret = gl_init(display, window, &gl_quirks);
+ ret = -1;
+ try_gl = 1;
+ env = getenv("DISPLAY");
+ if (env && env[0] != ':') {
+ fprintf(stderr, "looks like a remote DISPLAY, "
+ "not trying GL (use PICOFE_GL=1 to override)\n");
+ // because some drivers just kill the program with no way to recover
+ try_gl = 0;
+ }
+ env = getenv("PICOFE_GL");
+ if (env)
+ try_gl = atoi(env);
+ if (try_gl)
+ ret = gl_init(display, window, &gl_quirks);
if (ret == 0) {
+ gl_announce();
gl_works = 1;
gl_finish();
}
if (overlay_works) {
plat_target.vout_method = vout_mode_overlay = i;
vout_list[i++] = "Video Overlay";
+#ifdef SDL_OVERLAY_2X
+ vout_mode_overlay2x = i;
+ vout_list[i++] = "Video Overlay 2x";
+#endif
}
if (gl_works) {
plat_target.vout_method = vout_mode_gl = i;
}
plat_target.vout_methods = vout_list;
+ plat_sdl_change_video_mode(g_menuscreen_w, g_menuscreen_h, 1);
return 0;
fail:
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();
}