X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fvideo%2Fomapdss%2Fosdl_video.c;h=bf42a00788beac3d5bee013996fa9f57d7566da5;hb=ee7e6b2d8bc82029aac405d13f719f4532851224;hp=b6abb93d0c372ae510e7fcbbd0368b4043597a56;hpb=090bcb85b9cebd193299c9e93f4de8c5888094f4;p=sdl_omap.git

diff --git a/src/video/omapdss/osdl_video.c b/src/video/omapdss/osdl_video.c
index b6abb93..bf42a00 100644
--- a/src/video/omapdss/osdl_video.c
+++ b/src/video/omapdss/osdl_video.c
@@ -22,6 +22,8 @@
 #include "linux/fbdev.h"
 #include "linux/xenv.h"
 
+#define MIN(a, b) ( ((a) < (b)) ? (a) : (b) )
+
 struct omapfb_state {
 	struct omapfb_plane_info pi;
 	struct omapfb_mem_info mi;
@@ -44,6 +46,7 @@ static int osdl_setup_omapfb(struct omapfb_state *ostate, int fd, int enabled,
 	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));
@@ -60,6 +63,7 @@ static int osdl_setup_omapfb(struct omapfb_state *ostate, int fd, int enabled,
 		err_perror("QUERY_MEM");
 		return -1;
 	}
+	size_cur = mi.size;
 
 	/* must disable when changing stuff */
 	if (pi.enabled) {
@@ -69,19 +73,20 @@ static int osdl_setup_omapfb(struct omapfb_state *ostate, int fd, int enabled,
 			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;
@@ -102,6 +107,19 @@ static int osdl_setup_omapfb(struct omapfb_state *ostate, int fd, int enabled,
 	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;
@@ -300,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 */
@@ -320,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(pdata->saved_layer, 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;
@@ -386,6 +419,13 @@ void *osdl_video_set_mode(struct SDL_PrivateVideoData *pdata,
 		}
 	}
 
+	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) {
 		log("only %d/%d buffers available, expect tearing\n",
 			buffers_set, buffers_try);
@@ -414,6 +454,14 @@ void *osdl_video_flip(struct SDL_PrivateVideoData *pdata)
 	return ret;
 }
 
+void *osdl_video_get_active_buffer(struct SDL_PrivateVideoData *pdata)
+{
+	if (pdata->fbdev == NULL)
+		return NULL;
+
+	return vout_fbdev_get_active_mem(pdata->fbdev);
+}
+
 int osdl_video_pause(struct SDL_PrivateVideoData *pdata, int is_pause)
 {
 	struct omapfb_state *state = pdata->saved_layer;
@@ -477,6 +525,11 @@ int osdl_video_pause(struct SDL_PrivateVideoData *pdata, int is_pause)
 	return 0;
 }
 
+int osdl_video_get_window(void **display, int *screen, void **window)
+{
+	return xenv_get_window(display, screen, window);
+}
+
 void osdl_video_finish(struct SDL_PrivateVideoData *pdata)
 {
 	static const char *fbname;