X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fvideo%2Fomapdss%2Fosdl_video.c;h=fe9a29ce97f97df0bef03bb21f902afb640c79d6;hb=3af567bec0b9f4c99170d5cff7045f2a79da131b;hp=b2271cc1bd4a5657716a2c9c2b3dc5d605736eaa;hpb=0c7caf2be89c7285aed60c5cb7a5ace9776033ab;p=sdl_omap.git

diff --git a/src/video/omapdss/osdl_video.c b/src/video/omapdss/osdl_video.c
index b2271cc..fe9a29c 100644
--- a/src/video/omapdss/osdl_video.c
+++ b/src/video/omapdss/osdl_video.c
@@ -17,14 +17,18 @@
 #include <unistd.h>
 #include <linux/fb.h>
 
-#include "omapsdl.h"
+#include "osdl.h"
 #include "omapfb.h"
 #include "linux/fbdev.h"
 #include "linux/xenv.h"
 
-struct omapfb_saved_layer {
+#define MIN(a, b) ( ((a) < (b)) ? (a) : (b) )
+
+struct omapfb_state {
 	struct omapfb_plane_info pi;
 	struct omapfb_mem_info mi;
+	struct omapfb_plane_info pi_old;
+	struct omapfb_mem_info mi_old;
 };
 
 static const char *get_fb_device(void)
@@ -36,12 +40,13 @@ static const char *get_fb_device(void)
 	return fbname;
 }
 
-static int osdl_setup_omapfb(int fd, int enabled, int x, int y, int w, int h,
-	int mem, int *buffer_count)
+static int osdl_setup_omapfb(struct omapfb_state *ostate, int fd, int enabled,
+	int x, int y, int w, int h, int mem, int *buffer_count)
 {
 	struct omapfb_plane_info pi;
 	struct omapfb_mem_info mi;
 	int mem_blocks = *buffer_count;
+	unsigned int size_cur;
 	int ret;
 
 	memset(&pi, 0, sizeof(pi));
@@ -58,6 +63,7 @@ static int osdl_setup_omapfb(int fd, int enabled, int x, int y, int w, int h,
 		err_perror("QUERY_MEM");
 		return -1;
 	}
+	size_cur = mi.size;
 
 	/* must disable when changing stuff */
 	if (pi.enabled) {
@@ -67,19 +73,20 @@ static int osdl_setup_omapfb(int fd, int enabled, int x, int y, int w, int h,
 			err_perror("SETUP_PLANE");
 	}
 
-	if (mi.size < mem * mem_blocks) {
-		for (; mem_blocks > 0; mem_blocks--) {
-			mi.size = mem * mem_blocks;
-			ret = ioctl(fd, OMAPFB_SETUP_MEM, &mi);
-			if (ret == 0)
-				break;
-		}
-		if (ret != 0 || mem_blocks <= 0) {
-			err("failed to allocate at least %d bytes of vram:\n", mem);
-			err_perror("SETUP_MEM");
-			return -1;
-		}
+	/* allocate more mem, if needed */
+	for (; size_cur < mem * mem_blocks && mem_blocks > 0; mem_blocks--) {
+		mi.size = mem * mem_blocks;
+		ret = ioctl(fd, OMAPFB_SETUP_MEM, &mi);
+		if (ret == 0)
+			break;
+		mi.size = size_cur;
+	}
+	if (mem_blocks <= 0) {
+		err("failed to allocate at least %d bytes of vram:\n", mem);
+		err_perror("SETUP_MEM");
+		return -1;
 	}
+
 	*buffer_count = mem_blocks;
 
 	pi.pos_x = x;
@@ -95,9 +102,24 @@ static int osdl_setup_omapfb(int fd, int enabled, int x, int y, int w, int h,
 		return -1;
 	}
 
+	ostate->pi = pi;
+	ostate->mi = mi;
 	return 0;
 }
 
+static int osdl_setup_omapfb_enable(struct omapfb_state *ostate,
+	int fd, int enabled)
+{
+	int ret;
+
+	ostate->pi.enabled = enabled;
+	ret = ioctl(fd, OMAPFB_SETUP_PLANE, &ostate->pi);
+	if (ret != 0)
+		err_perror("SETUP_PLANE");
+
+	return ret;
+}
+
 static int read_sysfs(const char *fname, char *buff, size_t size)
 {
 	FILE *f;
@@ -274,18 +296,18 @@ static int osdl_setup_omap_layer(struct SDL_PrivateVideoData *pdata,
 
 	/* FIXME: assuming layer doesn't change here */
 	if (pdata->saved_layer == NULL) {
-		struct omapfb_saved_layer *slayer;
+		struct omapfb_state *slayer;
 		slayer = calloc(1, sizeof(*slayer));
 		if (slayer == NULL)
 			goto out;
 
-		ret = ioctl(fd, OMAPFB_QUERY_PLANE, &slayer->pi);
+		ret = ioctl(fd, OMAPFB_QUERY_PLANE, &slayer->pi_old);
 		if (ret != 0) {
 			err_perror("QUERY_PLANE");
 			goto out;
 		}
 
-		ret = ioctl(fd, OMAPFB_QUERY_MEM, &slayer->mi);
+		ret = ioctl(fd, OMAPFB_QUERY_MEM, &slayer->mi_old);
 		if (ret != 0) {
 			err_perror("QUERY_MEM");
 			goto out;
@@ -296,13 +318,28 @@ static int osdl_setup_omap_layer(struct SDL_PrivateVideoData *pdata,
 
 	tmp = getenv("SDL_OMAP_LAYER_SIZE");
 	if (tmp != NULL) {
-		if (strcasecmp(tmp, "fullscreen") == 0)
+		if (strcasecmp(tmp, "fullscreen") == 0) {
 			w = screen_w, h = screen_h;
-		else if (sscanf(tmp, "%dx%d", &tmp_w, &tmp_h) == 2)
+		}
+		else if (strcasecmp(tmp, "scaled") == 0) {
+			float factor = MIN(((float)screen_w) / width, ((float)screen_h) / height);
+			w = (int)(factor*width), h = (int)(factor*height);
+		}
+		else if (strcasecmp(tmp, "pixelperfect") == 0) {
+			float factor = MIN(((float)screen_w) / width, ((float)screen_h) / height);
+			w = ((int)factor) * width, h = ((int)factor) * height;
+			/* factor < 1.f => 0x0 layer, so fall back to 'scaled' */
+			if (!w || !h) {
+				w = (int)(factor * width), h = (int)(factor * height);
+			}
+		}
+		else if (sscanf(tmp, "%dx%d", &tmp_w, &tmp_h) == 2) {
 			w = tmp_w, h = tmp_h;
-		else
+		}
+		else {
 			err("layer size specified incorrectly, "
 				"should be like 800x480");
+		}
 	}
 
 	/* the layer can't be set larger than screen */
@@ -316,7 +353,7 @@ static int osdl_setup_omap_layer(struct SDL_PrivateVideoData *pdata,
 
 	x = screen_w / 2 - w / 2;
 	y = screen_h / 2 - h / 2;
-	ret = osdl_setup_omapfb(fd, 1, x, y, w, h,
+	ret = osdl_setup_omapfb(pdata->saved_layer, fd, 0, x, y, w, h,
 				width * height * ((bpp + 7) / 8), buffer_count);
 	if (ret == 0) {
 		pdata->layer_x = x;
@@ -333,7 +370,8 @@ out:
 
 void *osdl_video_set_mode(struct SDL_PrivateVideoData *pdata,
 			  int border_l, int border_r, int border_t, int border_b,
-			  int width, int height, int bpp, int *doublebuf)
+			  int width, int height, int bpp, int *doublebuf,
+			  const char *wm_title)
 {
 	int buffers_try, buffers_set;
 	const char *fbname;
@@ -373,9 +411,19 @@ void *osdl_video_set_mode(struct SDL_PrivateVideoData *pdata,
 		goto fail;
 
 	if (!pdata->xenv_up) {
-		ret = xenv_init();
-		if (ret == 0)
+		int xenv_flags = XENV_CAP_KEYS | XENV_CAP_MOUSE;
+		ret = xenv_init(&xenv_flags, wm_title);
+		if (ret == 0) {
 			pdata->xenv_up = 1;
+			pdata->xenv_mouse = (xenv_flags & XENV_CAP_MOUSE) ? 1 : 0;
+		}
+	}
+
+	ret = osdl_setup_omapfb_enable(pdata->saved_layer,
+		vout_fbdev_get_fd(pdata->fbdev), 1);
+	if (ret != 0) {
+		err("layer enable failed");
+		goto fail;
 	}
 
 	if (buffers_try != buffers_set) {
@@ -406,6 +454,69 @@ void *osdl_video_flip(struct SDL_PrivateVideoData *pdata)
 	return ret;
 }
 
+int osdl_video_pause(struct SDL_PrivateVideoData *pdata, int is_pause)
+{
+	struct omapfb_state *state = pdata->saved_layer;
+	struct omapfb_plane_info pi;
+	struct omapfb_mem_info mi;
+	int enabled;
+	int fd = -1;
+	int ret;
+
+	if (pdata->fbdev != NULL)
+		fd = vout_fbdev_get_fd(pdata->fbdev);
+	if (fd == -1) {
+		err("bad fd %d", fd);
+		return -1;
+	}
+	if (state == NULL) {
+		err("missing layer state\n");
+		return -1;
+	}
+
+	if (is_pause) {
+		ret = vout_fbdev_save(pdata->fbdev);
+		if (ret != 0)
+			return ret;
+		pi = state->pi_old;
+		mi = state->mi_old;
+		enabled = pi.enabled;
+	} else {
+		pi = state->pi;
+		mi = state->mi;
+		enabled = 1;
+	}
+	pi.enabled = 0;
+	ret = ioctl(fd, OMAPFB_SETUP_PLANE, &pi);
+	if (ret != 0) {
+		err_perror("SETUP_PLANE");
+		return -1;
+	}
+
+	ret = ioctl(fd, OMAPFB_SETUP_MEM, &mi);
+	if (ret != 0)
+		err_perror("SETUP_MEM");
+
+	if (!is_pause) {
+		ret = vout_fbdev_restore(pdata->fbdev);
+		if (ret != 0) {
+			err("fbdev_restore failed\n");
+			return ret;
+		}
+	}
+
+	if (enabled) {
+		pi.enabled = 1;
+		ret = ioctl(fd, OMAPFB_SETUP_PLANE, &pi);
+		if (ret != 0) {
+			err_perror("SETUP_PLANE");
+			return -1;
+		}
+	}
+
+	return 0;
+}
+
 void osdl_video_finish(struct SDL_PrivateVideoData *pdata)
 {
 	static const char *fbname;
@@ -418,20 +529,20 @@ void osdl_video_finish(struct SDL_PrivateVideoData *pdata)
 
 	/* restore the OMAP layer */
 	if (pdata->saved_layer != NULL) {
-		struct omapfb_saved_layer *slayer = pdata->saved_layer;
+		struct omapfb_state *slayer = pdata->saved_layer;
 		int fd;
 
 		fd = open(fbname, O_RDWR);
 		if (fd != -1) {
-			int enabled = slayer->pi.enabled;
+			int enabled = slayer->pi_old.enabled;
 
 			/* be sure to disable while setting up */
-			slayer->pi.enabled = 0;
-			ioctl(fd, OMAPFB_SETUP_PLANE, &slayer->pi);
-			ioctl(fd, OMAPFB_SETUP_MEM, &slayer->mi);
+			slayer->pi_old.enabled = 0;
+			ioctl(fd, OMAPFB_SETUP_PLANE, &slayer->pi_old);
+			ioctl(fd, OMAPFB_SETUP_MEM, &slayer->mi_old);
 			if (enabled) {
-				slayer->pi.enabled = enabled;
-				ioctl(fd, OMAPFB_SETUP_PLANE, &slayer->pi);
+				slayer->pi_old.enabled = enabled;
+				ioctl(fd, OMAPFB_SETUP_PLANE, &slayer->pi_old);
 			}
 			close(fd);
 		}