X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fvideo%2Fomapdss%2Fosdl_video.c;h=fc780010332d5cdf95e1618b4a4882f4e123b354;hb=6f13ad979616aae6272b6cc2f46566ed9823a7a6;hp=d492d369330c8221078d2dc4f253fd7b1ab636cb;hpb=f641fccb7413775feab03ea268cc503cfb47b9b7;p=sdl_omap.git diff --git a/src/video/omapdss/osdl_video.c b/src/video/omapdss/osdl_video.c index d492d36..fc78001 100644 --- a/src/video/omapdss/osdl_video.c +++ b/src/video/omapdss/osdl_video.c @@ -27,6 +27,15 @@ struct omapfb_saved_layer { struct omapfb_mem_info mi; }; +static const char *get_fb_device(void) +{ + const char *fbname = getenv("SDL_FBDEV"); + if (fbname == NULL) + fbname = "/dev/fb1"; + + return fbname; +} + static int osdl_setup_omapfb(int fd, int enabled, int x, int y, int w, int h, int mem) { struct omapfb_plane_info pi; @@ -35,13 +44,13 @@ static int osdl_setup_omapfb(int fd, int enabled, int x, int y, int w, int h, in ret = ioctl(fd, OMAPFB_QUERY_PLANE, &pi); if (ret != 0) { - perror("QUERY_PLANE"); + err_perror("QUERY_PLANE"); return -1; } ret = ioctl(fd, OMAPFB_QUERY_MEM, &mi); if (ret != 0) { - perror("QUERY_MEM"); + err_perror("QUERY_MEM"); return -1; } @@ -50,13 +59,13 @@ static int osdl_setup_omapfb(int fd, int enabled, int x, int y, int w, int h, in pi.enabled = 0; ret = ioctl(fd, OMAPFB_SETUP_PLANE, &pi); if (ret != 0) - perror("SETUP_PLANE"); + err_perror("SETUP_PLANE"); } mi.size = mem; ret = ioctl(fd, OMAPFB_SETUP_MEM, &mi); if (ret != 0) { - perror("SETUP_MEM"); + err_perror("SETUP_MEM"); return -1; } @@ -68,7 +77,8 @@ static int osdl_setup_omapfb(int fd, int enabled, int x, int y, int w, int h, in ret = ioctl(fd, OMAPFB_SETUP_PLANE, &pi); if (ret != 0) { - perror("SETUP_PLANE"); + err_perror("SETUP_PLANE"); + err("(%d %d %d %d)\n", x, y, w, h); return -1; } @@ -82,16 +92,14 @@ static int read_sysfs(const char *fname, char *buff, size_t size) f = fopen(fname, "r"); if (f == NULL) { - fprintf(stderr, "open %s: ", fname); - perror(NULL); + err_perror("open %s: ", fname); return -1; } ret = fread(buff, 1, size - 1, f); fclose(f); if (ret <= 0) { - fprintf(stderr, "read %s: ", fname); - perror(NULL); + err_perror("read %s: ", fname); return -1; } @@ -102,75 +110,47 @@ static int read_sysfs(const char *fname, char *buff, size_t size) return 0; } -static int osdl_setup_omap_layer(struct SDL_PrivateVideoData *pdata, - const char *fbname, int width, int height, int bpp) +int osdl_video_detect_screen(struct SDL_PrivateVideoData *pdata) { - int x = 0, y = 0, w = width, h = height; /* layer size and pos */ - int screen_w = w, screen_h = h; int fb_id, overlay_id = -1, screen_id = -1; + struct fb_var_screeninfo fbvar; char buff[64], screen_name[64]; + const char *fbname; struct stat status; - const char *tmp; - int i, ret, fd; + int fd, i, ret; + int w, h; FILE *f; - fd = open(fbname, O_RDWR); - if (fd == -1) { - fprintf(stderr, "open %s: ", fbname); - perror(NULL); - return -1; - } - - /* FIXME: assuming layer doesn't change here */ - if (pdata->saved_layer == NULL) { - struct omapfb_saved_layer *slayer; - slayer = calloc(1, sizeof(*slayer)); - if (slayer == NULL) - return -1; + fbname = get_fb_device(); - ret = ioctl(fd, OMAPFB_QUERY_PLANE, &slayer->pi); - if (ret != 0) { - perror("QUERY_PLANE"); - return -1; - } - - ret = ioctl(fd, OMAPFB_QUERY_MEM, &slayer->mi); - if (ret != 0) { - perror("QUERY_MEM"); - return -1; - } - - pdata->saved_layer = slayer; - } - - /* Figure out screen resolution, we will want to center if scaling is not enabled. + /* Figure out screen resolution, we need to know default resolution + * to report to SDL and for centering stuff. * The only way to achieve this seems to be walking some sysfs files.. */ ret = stat(fbname, &status); if (ret != 0) { - fprintf(stderr, "can't stat %s: ", fbname); - perror(NULL); - return -1; + err_perror("can't stat %s", fbname); + goto skip_screen; } fb_id = minor(status.st_rdev); snprintf(buff, sizeof(buff), "/sys/class/graphics/fb%d/overlays", fb_id); f = fopen(buff, "r"); if (f == NULL) { - fprintf(stderr, "can't open %s, skip screen detection\n", buff); + err("can't open %s, skip screen detection", buff); goto skip_screen; } ret = fscanf(f, "%d", &overlay_id); fclose(f); if (ret != 1) { - fprintf(stderr, "can't parse %s, skip screen detection\n", buff); + err("can't parse %s, skip screen detection", buff); goto skip_screen; } snprintf(buff, sizeof(buff), "/sys/devices/platform/omapdss/overlay%d/manager", overlay_id); ret = read_sysfs(buff, screen_name, sizeof(screen_name)); if (ret < 0) { - fprintf(stderr, "skip screen detection\n"); + err("skip screen detection"); goto skip_screen; } @@ -187,28 +167,97 @@ static int osdl_setup_omap_layer(struct SDL_PrivateVideoData *pdata, } if (screen_id < 0) { - fprintf(stderr, "could not find screen\n"); + err("could not find screen"); goto skip_screen; } snprintf(buff, sizeof(buff), "/sys/devices/platform/omapdss/display%d/timings", screen_id); f = fopen(buff, "r"); if (f == NULL) { - fprintf(stderr, "can't open %s, skip screen detection\n", buff); + err("can't open %s, skip screen detection", buff); goto skip_screen; } - ret = fscanf(f, "%*d,%d/%*d/%*d/%*d,%d/%*d/%*d/%*d", &screen_w, &screen_h); + ret = fscanf(f, "%*d,%d/%*d/%*d/%*d,%d/%*d/%*d/%*d", &w, &h); fclose(f); if (ret != 2) { - fprintf(stderr, "can't parse %s (%d), skip screen detection\n", buff, ret); + err("can't parse %s (%d), skip screen detection", buff, ret); goto skip_screen; } - printf("detected %dx%d '%s' (%d) screen attached to fb %d and overlay %d\n", - screen_w, screen_h, screen_name, screen_id, fb_id, overlay_id); + log("detected %dx%d '%s' (%d) screen attached to fb %d and overlay %d", + w, h, screen_name, screen_id, fb_id, overlay_id); + + pdata->screen_w = w; + pdata->screen_h = h; + return 0; skip_screen: + /* attempt to extract this from FB then */ + fd = open(fbname, O_RDWR); + if (fd == -1) { + err_perror("open %s", fbname); + return -1; + } + + ret = ioctl(fd, FBIOGET_VSCREENINFO, &fbvar); + close(fd); + if (ret == -1) { + err_perror("ioctl %s", fbname); + return -1; + } + + if (fbvar.xres == 0 || fbvar.yres == 0) { + err("VSCREENINFO has nothing meaningful"); + return -1; + } + + pdata->screen_w = fbvar.xres; + pdata->screen_h = fbvar.yres; + return 0; +} + +static int osdl_setup_omap_layer(struct SDL_PrivateVideoData *pdata, + const char *fbname, int width, int height, int bpp) +{ + int x = 0, y = 0, w = width, h = height; /* layer size and pos */ + int screen_w = w, screen_h = h; + const char *tmp; + int ret, fd; + + if (pdata->screen_w != 0) + screen_w = pdata->screen_w; + if (pdata->screen_h != 0) + screen_h = pdata->screen_h; + + fd = open(fbname, O_RDWR); + if (fd == -1) { + err_perror("open %s", fbname); + return -1; + } + + /* FIXME: assuming layer doesn't change here */ + if (pdata->saved_layer == NULL) { + struct omapfb_saved_layer *slayer; + slayer = calloc(1, sizeof(*slayer)); + if (slayer == NULL) + return -1; + + ret = ioctl(fd, OMAPFB_QUERY_PLANE, &slayer->pi); + if (ret != 0) { + err_perror("QUERY_PLANE"); + return -1; + } + + ret = ioctl(fd, OMAPFB_QUERY_MEM, &slayer->mi); + if (ret != 0) { + err_perror("QUERY_MEM"); + return -1; + } + + pdata->saved_layer = slayer; + } + tmp = getenv("SDL_OMAP_LAYER_SIZE"); if (tmp != NULL) { int w_, h_; @@ -217,8 +266,8 @@ skip_screen: else if (sscanf(tmp, "%dx%d", &w_, &h_) == 2) w = w_, h = h_; else - fprintf(stderr, "layer size specified incorrectly, " - "should be like 800x480"); + err("layer size specified incorrectly, " + "should be like 800x480"); } x = screen_w / 2 - w / 2; @@ -236,9 +285,7 @@ int osdl_video_set_mode(struct SDL_PrivateVideoData *pdata, int width, int heigh bpp = 16; // FIXME - fbname = getenv("SDL_FBDEV"); - if (fbname == NULL) - fbname = "/dev/fb1"; + fbname = get_fb_device(); if (pdata->fbdev != NULL) { vout_fbdev_finish(pdata->fbdev); @@ -278,10 +325,7 @@ void osdl_video_finish(struct SDL_PrivateVideoData *pdata) { static const char *fbname; - fbname = getenv("SDL_FBDEV"); - if (fbname == NULL) - fbname = "/dev/fb1"; - + fbname = get_fb_device(); if (pdata->fbdev != NULL) { vout_fbdev_finish(pdata->fbdev); pdata->fbdev = NULL;