Merge branch 'master' into libretro

Author: notaz

Makefile

@@ -363,9 +363,11 @@ endif
 
 ifeq "$(PLATFORM)" "generic"
 OBJS += frontend/libpicofe/in_sdl.o
-OBJS += frontend/libpicofe/plat_sdl.o
+#OBJS += frontend/libpicofe/plat_sdl.o
 OBJS += frontend/libpicofe/plat_dummy.o
 OBJS += frontend/plat_sdl.o
+frontend/plat_sdl.o frontend/libpicofe/plat_sdl.o: CFLAGS += -DSDL_OVERLAY_2X
+frontend/menu.o: CFLAGS += -DSDL_OVERLAY_2X -DMENU_SHOW_VARSCALER=1
 ifeq "$(HAVE_EVDEV)" "1"
 OBJS += frontend/libpicofe/linux/in_evdev.o
 endif
@@ -386,6 +388,7 @@ OBJS += frontend/libpicofe/linux/fbdev.o frontend/libpicofe/linux/xenv.o
 OBJS += frontend/libpicofe/linux/in_evdev.o
 OBJS += frontend/plat_pandora.o frontend/plat_omap.o
 frontend/main.o frontend/menu.o: CFLAGS += -include frontend/pandora/ui_feat.h
+frontend/main.o frontend/plugin_lib.o: CFLAGS += -DPANDORA
 frontend/libpicofe/linux/plat.o: CFLAGS += -DPANDORA
 USE_PLUGIN_LIB = 1
 USE_FRONTEND = 1
@@ -463,6 +466,7 @@ endif
 ifeq "$(USE_FRONTEND)" "1"
 OBJS += frontend/menu.o
 OBJS += frontend/libpicofe/input.o
+frontend/libpicofe/input.o: CFLAGS += -Wno-array-bounds
 frontend/menu.o: frontend/libpicofe/menu.c
 ifeq "$(HAVE_TSLIB)" "1"
 frontend/%.o: CFLAGS += -DHAVE_TSLIB

frontend/cspace.c

@@ -168,36 +168,53 @@ void bgr888_to_xrgb8888(void * __restrict__ dst_, const void * __restrict__ src_
 /* YUV stuff */
 static int yuv_ry[32], yuv_gy[32], yuv_by[32];
 static unsigned char yuv_u[32 * 2], yuv_v[32 * 2];
+static struct uyvy { uint32_t y:8; uint32_t vyu:24; } yuv_uyvy[32768];
 
 void bgr_to_uyvy_init(void)
 {
-  int i, v;
-
-  /* init yuv converter:
-    y0 = (int)((0.299f * r0) + (0.587f * g0) + (0.114f * b0));
-    y1 = (int)((0.299f * r1) + (0.587f * g1) + (0.114f * b1));
-    u = (int)(8 * 0.565f * (b0 - y0)) + 128;
-    v = (int)(8 * 0.713f * (r0 - y0)) + 128;
-  */
-  for (i = 0; i < 32; i++) {
-    yuv_ry[i] = (int)(0.299f * i * 65536.0f + 0.5f);
-    yuv_gy[i] = (int)(0.587f * i * 65536.0f + 0.5f);
-    yuv_by[i] = (int)(0.114f * i * 65536.0f + 0.5f);
-  }
-  for (i = -32; i < 32; i++) {
-    v = (int)(8 * 0.565f * i) + 128;
-    if (v < 0)
-      v = 0;
-    if (v > 255)
-      v = 255;
-    yuv_u[i + 32] = v;
-    v = (int)(8 * 0.713f * i) + 128;
-    if (v < 0)
-      v = 0;
-    if (v > 255)
-      v = 255;
-    yuv_v[i + 32] = v;
-  }
+	unsigned char yuv_y[256];
+	int i, v;
+
+	/* init yuv converter:
+	   y0 = (int)((0.299f * r0) + (0.587f * g0) + (0.114f * b0));
+	   y1 = (int)((0.299f * r1) + (0.587f * g1) + (0.114f * b1));
+	   u = (int)(8 * 0.565f * (b0 - y0)) + 128;
+	   v = (int)(8 * 0.713f * (r0 - y0)) + 128;
+	   */
+	for (i = 0; i < 32; i++) {
+		yuv_ry[i] = (int)(0.299f * i * 65536.0f + 0.5f);
+		yuv_gy[i] = (int)(0.587f * i * 65536.0f + 0.5f);
+		yuv_by[i] = (int)(0.114f * i * 65536.0f + 0.5f);
+	}
+	for (i = -32; i < 32; i++) {
+		v = (int)(8 * 0.565f * i) + 128;
+		if (v < 0)
+			v = 0;
+		if (v > 255)
+			v = 255;
+		yuv_u[i + 32] = v;
+		v = (int)(8 * 0.713f * i) + 128;
+		if (v < 0)
+			v = 0;
+		if (v > 255)
+			v = 255;
+		yuv_v[i + 32] = v;
+	}
+	// valid Y range seems to be 16..235
+	for (i = 0; i < 256; i++) {
+		yuv_y[i] = 16 + 219 * i / 32;
+	}
+	// everything combined into one large array for speed
+	for (i = 0; i < 32768; i++) {
+		int r = (i >> 0) & 0x1f, g = (i >> 5) & 0x1f, b = (i >> 10) & 0x1f;
+		int y = (yuv_ry[r] + yuv_gy[g] + yuv_by[b]) >> 16;
+		yuv_uyvy[i].y = yuv_y[y];
+#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+		yuv_uyvy[i].vyu = (yuv_v[b-y + 32] << 16) | (yuv_y[y] << 8) | yuv_u[r-y + 32];
+#else
+		yuv_uyvy[i].vyu = (yuv_v[r-y + 32] << 16) | (yuv_y[y] << 8) | yuv_u[b-y + 32];
+#endif
+	}
 }
 
 void rgb565_to_uyvy(void *d, const void *s, int pixels)
@@ -229,54 +246,89 @@ void rgb565_to_uyvy(void *d, const void *s, int pixels)
   }
 }
 
-void bgr555_to_uyvy(void *d, const void *s, int pixels)
+void bgr555_to_uyvy(void *d, const void *s, int pixels, int x2)
 {
-  unsigned int *dst = d;
-  const unsigned short *src = s;
-  const unsigned char *yu = yuv_u + 32;
-  const unsigned char *yv = yuv_v + 32;
-  int r0, g0, b0, r1, g1, b1;
-  int y0, y1, u, v;
-
-  for (; pixels > 1; src += 2, dst++, pixels -= 2)
-  {
-    b0 = (src[0] >> 10) & 0x1f;
-    g0 = (src[0] >> 5) & 0x1f;
-    r0 =  src[0] & 0x1f;
-    b1 = (src[1] >> 10) & 0x1f;
-    g1 = (src[1] >> 5) & 0x1f;
-    r1 =  src[1] & 0x1f;
-    y0 = (yuv_ry[r0] + yuv_gy[g0] + yuv_by[b0]) >> 16;
-    y1 = (yuv_ry[r1] + yuv_gy[g1] + yuv_by[b1]) >> 16;
-    u = yu[b0 - y0];
-    v = yv[r0 - y0];
-    y0 = 16 + 219 * y0 / 31;
-    y1 = 16 + 219 * y1 / 31;
-
-    *dst = (y1 << 24) | (v << 16) | (y0 << 8) | u;
-  }
+	uint32_t *dst = d;
+	const uint16_t *src = s;
+	int i;
+
+	if (x2) {
+		for (i = pixels; i >= 4; src += 4, dst += 4, i -= 4)
+		{
+			const struct uyvy *uyvy0 = yuv_uyvy + (src[0] & 0x7fff);
+			const struct uyvy *uyvy1 = yuv_uyvy + (src[1] & 0x7fff);
+			const struct uyvy *uyvy2 = yuv_uyvy + (src[2] & 0x7fff);
+			const struct uyvy *uyvy3 = yuv_uyvy + (src[3] & 0x7fff);
+#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+			dst[0] = uyvy0->y | (uyvy0->vyu << 8);
+			dst[1] = uyvy1->y | (uyvy1->vyu << 8);
+			dst[2] = uyvy2->y | (uyvy2->vyu << 8);
+			dst[3] = uyvy3->y | (uyvy3->vyu << 8);
+#else
+			dst[0] = (uyvy0->y << 24) | uyvy0->vyu;
+			dst[1] = (uyvy1->y << 24) | uyvy1->vyu;
+			dst[2] = (uyvy2->y << 24) | uyvy2->vyu;
+			dst[3] = (uyvy3->y << 24) | uyvy3->vyu;
+#endif
+		}
+	} else {
+		for (i = pixels; i >= 4; src += 4, dst += 2, i -= 4)
+		{
+			const struct uyvy *uyvy0 = yuv_uyvy + (src[0] & 0x7fff);
+			const struct uyvy *uyvy1 = yuv_uyvy + (src[1] & 0x7fff);
+			const struct uyvy *uyvy2 = yuv_uyvy + (src[2] & 0x7fff);
+			const struct uyvy *uyvy3 = yuv_uyvy + (src[3] & 0x7fff);
+#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+			dst[0] = uyvy1->y | (uyvy0->vyu << 8);
+			dst[1] = uyvy3->y | (uyvy2->vyu << 8);
+#else
+			dst[0] = (uyvy1->y << 24) | uyvy0->vyu;
+			dst[1] = (uyvy3->y << 24) | uyvy2->vyu;
+#endif
+		}
+	}
 }
 
-void bgr888_to_uyvy(void *d, const void *s, int pixels)
+void bgr888_to_uyvy(void *d, const void *s, int pixels, int x2)
 {
-  unsigned int *dst = d;
-  const unsigned char *src8 = s;
-  const unsigned char *yu = yuv_u + 32;
-  const unsigned char *yv = yuv_v + 32;
-  int r0, g0, b0, r1, g1, b1;
-  int y0, y1, u, v;
-
-  for (; pixels > 0; src8 += 3*2, dst++, pixels -= 2)
-  {
-    r0 = src8[0], g0 = src8[1], b0 = src8[2];
-    r1 = src8[3], g1 = src8[4], b1 = src8[5];
-    y0 = (r0 * 19595 + g0 * 38470 + b0 * 7471) >> 16;
-    y1 = (r1 * 19595 + g1 * 38470 + b1 * 7471) >> 16;
-    u = yu[(b0 - y0) / 8];
-    v = yv[(r0 - y0) / 8];
-    y0 = 16 + 219 * y0 / 255;
-    y1 = 16 + 219 * y1 / 255;
-
-    *dst = (y1 << 24) | (v << 16) | (y0 << 8) | u;
-  }
+	unsigned int *dst = d;
+	const unsigned char *src8 = s;
+	const unsigned char *yu = yuv_u + 32;
+	const unsigned char *yv = yuv_v + 32;
+	int r0, g0, b0, r1, g1, b1;
+	int y0, y1, u0, u1, v0, v1;
+
+	if (x2) {
+		for (; pixels >= 2; src8 += 3*2, pixels -= 2)
+		{
+			r0 = src8[0], g0 = src8[1], b0 = src8[2];
+			r1 = src8[3], g1 = src8[4], b1 = src8[5];
+			y0 = (r0 * 19595 + g0 * 38470 + b0 * 7471) >> 16;
+			y1 = (r1 * 19595 + g1 * 38470 + b1 * 7471) >> 16;
+			u0 = yu[(b0 - y0) / 8];
+			u1 = yu[(b1 - y1) / 8];
+			v0 = yv[(r0 - y0) / 8];
+			v1 = yv[(r1 - y1) / 8];
+			y0 = 16 + 219 * y0 / 255;
+			y1 = 16 + 219 * y1 / 255;
+
+			*dst++ = (y0 << 24) | (v0 << 16) | (y0 << 8) | u0;
+			*dst++ = (y1 << 24) | (v1 << 16) | (y1 << 8) | u1;
+		}
+	}
+	else {
+		for (; pixels >= 2; src8 += 3*2, dst++, pixels -= 2)
+		{
+			r0 = src8[0], g0 = src8[1], b0 = src8[2];
+			r1 = src8[3], g1 = src8[4], b1 = src8[5];
+			y0 = (r0 * 19595 + g0 * 38470 + b0 * 7471) >> 16;
+			y1 = (r1 * 19595 + g1 * 38470 + b1 * 7471) >> 16;
+			u0 = yu[(b0 - y0) / 8];
+			v0 = yv[(r0 - y0) / 8];
+			y0 = 16 + 219 * y0 / 255;
+			y1 = 16 + 219 * y1 / 255;
+
+			*dst = (y1 << 24) | (v0 << 16) | (y0 << 8) | u0;
+		}
+	}
 }

frontend/cspace.h

@@ -19,8 +19,8 @@ void bgr888_to_xrgb8888(void *dst, const void *src, int bytes);
 
 void bgr_to_uyvy_init(void);
 void rgb565_to_uyvy(void *d, const void *s, int pixels);
-void bgr555_to_uyvy(void *d, const void *s, int pixels);
-void bgr888_to_uyvy(void *d, const void *s, int pixels);
+void bgr555_to_uyvy(void *d, const void *s, int pixels, int x2);
+void bgr888_to_uyvy(void *d, const void *s, int pixels, int x2);
 
 #ifdef __cplusplus
 }

frontend/libpicofe

@@ -4,6 +4,12 @@
 //#include <linux/cdrom.h>
 #endif
 
+#include "../libpcsxcore/psxcommon.h"
+#include "../libpcsxcore/cdrom.h"
+
+//#include "vfs/vfs_implementation.h"
+#include "vfs/vfs_implementation_cdrom.h"
+
 static int cdrom_send_command_dummy(const libretro_vfs_implementation_file *stream,
       CDROM_CMD_Direction dir, void *buf, size_t len, unsigned char *cmd, size_t cmd_len,
       unsigned char *sense, size_t sense_len)
@@ -55,8 +61,7 @@ int cdrom_set_read_speed_x(libretro_vfs_implementation_file *stream, unsigned sp
    return ret;
 }
 
-int cdrom_read_sector(libretro_vfs_implementation_file *stream,
-      unsigned int lba, void *b)
+int rcdrom_readSector(void *stream, unsigned int lba, void *b)
 {
    unsigned char cmd[] = {0xBE, 0, 0, 0, 0, 0, 0, 0, 1, 0xF8, 0, 0};
    cmd[2] = lba >> 24;
@@ -66,4 +71,77 @@ int cdrom_read_sector(libretro_vfs_implementation_file *stream,
    return cdrom_send_command_once(stream, DIRECTION_IN, b, 2352, cmd, sizeof(cmd));
 }
 
+void *rcdrom_open(const char *name, u32 *total_lba, u32 *have_subchannel)
+{
+   void *g_cd_handle = retro_vfs_file_open_impl(name, RETRO_VFS_FILE_ACCESS_READ,
+        RETRO_VFS_FILE_ACCESS_HINT_NONE);
+   if (!g_cd_handle) {
+      SysPrintf("retro_vfs_file_open failed for '%s'\n", name);
+      return NULL;
+   }
+   else {
+      int ret = cdrom_set_read_speed_x(g_cd_handle, 4);
+      if (ret) SysPrintf("CD speed set failed\n");
+      const cdrom_toc_t *toc = retro_vfs_file_get_cdrom_toc();
+      const cdrom_track_t *last = &toc->track[toc->num_tracks - 1];
+      unsigned int lba = MSF2SECT(last->min, last->sec, last->frame);
+      *total_lba = lba + last->track_size;
+      *have_subchannel = 0;
+      //cdrom_get_current_config_random_readable(acdrom.h);
+      //cdrom_get_current_config_multiread(acdrom.h);
+      //cdrom_get_current_config_cdread(acdrom.h);
+      //cdrom_get_current_config_profiles(acdrom.h);
+      return g_cd_handle;
+   }
+}
+
+void rcdrom_close(void *stream)
+{
+   retro_vfs_file_close_impl(stream);
+}
+
+int rcdrom_getTN(void *stream, u8 *tn)
+{
+   const cdrom_toc_t *toc = retro_vfs_file_get_cdrom_toc();
+   if (toc) {
+     tn[0] = 1;
+     tn[1] = toc->num_tracks;
+     return 0;
+   }
+   return -1;
+}
+
+int rcdrom_getTD(void *stream, u32 total_lba, u8 track, u8 *rt)
+{
+   const cdrom_toc_t *toc = retro_vfs_file_get_cdrom_toc();
+   rt[0] = 0, rt[1] = 2, rt[2] = 0;
+   if (track == 0) {
+      lba2msf(total_lba + 150, &rt[0], &rt[1], &rt[2]);
+   }
+   else if (track <= toc->num_tracks) {
+      int i = track - 1;
+      rt[0] = toc->track[i].min;
+      rt[1] = toc->track[i].sec;
+      rt[2] = toc->track[i].frame;
+   }
+   return 0;
+}
+
+int rcdrom_getStatus(void *stream, struct CdrStat *stat)
+{
+   const cdrom_toc_t *toc = retro_vfs_file_get_cdrom_toc();
+   stat->Type = toc->track[0].audio ? 2 : 1;
+   return 0;
+}
+
+int rcdrom_isMediaInserted(void *stream)
+{
+   return cdrom_is_media_inserted(stream);
+}
+
+int rcdrom_readSub(void *stream, unsigned int lba, void *b)
+{
+   return -1;
+}
+
 // vim:sw=3:ts=3:expandtab