[MPlayer-cvslog] r27407 - in trunk: Changelog DOCS/man/en/mplayer.1 DOCS/man/fr/mplayer.1 DOCS/tech/MAINTAINERS configure libvo/video_out.c libvo/vo_wii.c
ben
subversion at mplayerhq.hu
Sun Aug 3 22:04:03 CEST 2008
Author: ben
Date: Sun Aug 3 22:04:03 2008
New Revision: 27407
Log:
Add video driver for Nintendo Wii/GameCube.
Original patch by Jing Liu <fatersh-1 at yahoo.com>,
based on vo_fbdev.c and adapted to Nintendo's specific GPU.
This driver handles dedicated ATI GPU, which can be found in:
- Nintendo GameCube (ATI LSI Flipper @ 162 MHz)
- Nintendo Wii (ATI Hollywood @ 243 MHz)
Flipper and Hollywood chipsets are pretty similar, except from clock speed:
- Embedded framebuffer is 2MB.
- Texture cache is 1MB.
- Vertex cache is 0.1 MB.
- Framebuffer is YUY2, not RGB.
- Best resolution is 480p (854x480)
Added:
trunk/libvo/vo_wii.c
Modified:
trunk/Changelog
trunk/DOCS/tech/MAINTAINERS
trunk/configure
trunk/libvo/video_out.c
Changes in other areas also in this revision:
Modified:
trunk/DOCS/man/en/mplayer.1
trunk/DOCS/man/fr/mplayer.1
Modified: trunk/Changelog
==============================================================================
--- trunk/Changelog (original)
+++ trunk/Changelog Sun Aug 3 22:04:03 2008
@@ -54,6 +54,7 @@ MPlayer (1.0)
Drivers:
* replace PolypAudio by PulseAudio (-ao pulse)
* add force-pbo suboption for faster output in vo_gl
+ * add Nintendo Wii/GameCube video driver (-vo wii)
MEncoder:
* Ogg muxing using -of lavf -o done.ogg
Modified: trunk/DOCS/tech/MAINTAINERS
==============================================================================
--- trunk/DOCS/tech/MAINTAINERS (original)
+++ trunk/DOCS/tech/MAINTAINERS Sun Aug 3 22:04:03 2008
@@ -187,6 +187,7 @@ libvo drivers:
* vo_tdfxfb.c - Alban Bedel
* vo_tga.c - Daniele Forghieri
* vo_vesa.c - Aurelien Jacobs
+ * vo_wii.c - Benjamin Zores
* vo_winvidix.c - Sascha Sommer
* vo_x11.c - Alexander Strasser
* vo_xmga.c - Attila Kinali
Modified: trunk/configure
==============================================================================
--- trunk/configure (original)
+++ trunk/configure Sun Aug 3 22:04:03 2008
@@ -382,6 +382,7 @@ Video output:
--enable-3dfx enable obsolete /dev/3dfx video output [disable]
--enable-tdfxfb enable tdfxfb video output [disable]
--enable-s3fb enable s3fb (S3 ViRGE) video output [disable]
+ --enable-wii enable Nintendo Wii/GameCube video output [disable]
--enable-directfb enable DirectFB video output [autodetect]
--enable-zr enable ZR360[56]7/ZR36060 video output [autodetect]
--enable-bl enable Blinkenlights video output [disable]
@@ -649,6 +650,7 @@ _termcap=auto
_termios=auto
_3dfx=no
_s3fb=no
+_wii=no
_tdfxfb=no
_tdfxvid=no
_xvr100=auto
@@ -1108,6 +1110,8 @@ for ac_option do
--disable-3dfx) _3dfx=no ;;
--enable-s3fb) _s3fb=yes ;;
--disable-s3fb) _s3fb=no ;;
+ --enable-wii) _wii=yes ;;
+ --disable-wii) _wii=no ;;
--enable-tdfxfb) _tdfxfb=yes ;;
--disable-tdfxfb) _tdfxfb=no ;;
--disable-tdfxvid) _tdfxvid=no ;;
@@ -3762,6 +3766,17 @@ else
fi
echores "$_s3fb"
+echocheck "wii"
+if test "$_wii" = yes ; then
+ _def_wii='#define CONFIG_WII 1'
+ _vosrc="$_vosrc vo_wii.c"
+ _vomodules="wii $_vomodules"
+else
+ _def_wii='#undef CONFIG_WII'
+ _novomodules="wii $_novomodules"
+fi
+echores "$_wii"
+
echocheck "tdfxvid"
if test "$_tdfxvid" = yes ; then
_def_tdfxvid='#define CONFIG_TDFX_VID 1'
@@ -8659,6 +8674,7 @@ $_def_ggi
$_def_ggiwmh
$_def_3dfx
$_def_s3fb
+$_def_wii
$_def_tdfxfb
$_def_tdfxvid
$_def_xvr100
Modified: trunk/libvo/video_out.c
==============================================================================
--- trunk/libvo/video_out.c (original)
+++ trunk/libvo/video_out.c Sun Aug 3 22:04:03 2008
@@ -79,6 +79,7 @@ extern vo_functions_t video_out_sdl;
extern vo_functions_t video_out_3dfx;
extern vo_functions_t video_out_tdfxfb;
extern vo_functions_t video_out_s3fb;
+extern vo_functions_t video_out_wii;
extern vo_functions_t video_out_null;
extern vo_functions_t video_out_zr;
extern vo_functions_t video_out_zr2;
@@ -142,6 +143,9 @@ const vo_functions_t* const video_out_dr
#ifdef CONFIG_S3FB
&video_out_s3fb,
#endif
+#ifdef CONFIG_WII
+ &video_out_wii,
+#endif
#ifdef CONFIG_3DFX
&video_out_3dfx,
#endif
Added: trunk/libvo/vo_wii.c
==============================================================================
--- (empty file)
+++ trunk/libvo/vo_wii.c Sun Aug 3 22:04:03 2008
@@ -0,0 +1,419 @@
+/*
+ * Video driver for Nintendo Wii/GameCube Framebuffer device
+ *
+ * Copyright (C) 2008 Jing Liu <fatersh-1 at yahoo.com>
+ *
+ * Maintainer: Benjamin Zores <ben at geexbox.org>
+ *
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/*
+ * This driver handles dedicated ATI GPU, which can be found in:
+ * - Nintendo GameCube (ATI LSI Flipper @ 162 MHz)
+ * - Nintendo Wii (ATI Hollywood @ 243 MHz)
+ *
+ * Flipper and Hollywood chipsets are pretty similar, except from clock speed:
+ * - Embedded framebuffer is 2MB.
+ * - Texture cache is 1MB.
+ * - Vertex cache is 0.1 MB.
+ * - Framebuffer is YUY2, not RGB.
+ * - Best resolution is 480p (854x480)
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <errno.h>
+#include <ctype.h>
+
+#include <sys/mman.h>
+#include <sys/ioctl.h>
+#include <sys/kd.h>
+#include <linux/fb.h>
+
+#include "config.h"
+#include "video_out.h"
+#include "video_out_internal.h"
+#include "sub.h"
+#include "mp_msg.h"
+
+#define WII_DEV_NAME "/dev/fb0"
+#define TTY_DEV_NAME "/dev/tty"
+#define FB_PIXEL_SIZE 2
+
+static const vo_info_t info = {
+ "Nintendo Wii/GameCube Framebuffer Device",
+ "wii",
+ "Jing Liu <fartersh-1 at yahoo.com>",
+ ""
+};
+
+LIBVO_EXTERN(wii)
+
+static signed int pre_init_err = -2;
+
+static FILE *vt_fp = NULL;
+static int vt_doit = 1;
+static int fb_dev_fd = -1;
+static int fb_tty_fd = -1;
+
+static uint8_t *frame_buffer;
+static uint8_t *center;
+
+static struct fb_var_screeninfo fb_orig_vinfo;
+static struct fb_var_screeninfo fb_vinfo;
+static int fb_line_len;
+static size_t fb_size;
+
+static int in_width, out_width;
+static int in_height, out_height;
+static int fs;
+
+static int
+fb_preinit (int reset)
+{
+ static int fb_preinit_done = 0;
+ static int fb_works = 0;
+
+ if (reset)
+ {
+ fb_preinit_done = 0;
+ return 0;
+ }
+
+ if (fb_preinit_done)
+ return fb_works;
+
+ if ((fb_dev_fd = open (WII_DEV_NAME, O_RDWR)) == -1)
+ {
+ mp_msg (MSGT_VO, MSGL_ERR,
+ "Can't open %s: %s\n", WII_DEV_NAME, strerror (errno));
+ goto err_out;
+ }
+
+ if (ioctl (fb_dev_fd, FBIOGET_VSCREENINFO, &fb_vinfo))
+ {
+ mp_msg (MSGT_VO, MSGL_ERR,
+ "Can't get VSCREENINFO: %s\n", strerror (errno));
+ goto err_out_fd;
+ }
+
+ fb_orig_vinfo = fb_vinfo;
+
+ if ((fb_tty_fd = open (TTY_DEV_NAME, O_RDWR)) < 0)
+ {
+ mp_msg (MSGT_VO, MSGL_ERR,
+ "Notice: Can't open %s: %s\n", TTY_DEV_NAME, strerror (errno));
+ goto err_out_fd;
+ }
+
+ fb_preinit_done = 1;
+ fb_works = 1;
+ return 1;
+
+ err_out_fd:
+ close (fb_dev_fd);
+ fb_dev_fd = -1;
+ err_out:
+ fb_preinit_done = 1;
+ fb_works = 0;
+
+ return 0;
+}
+
+static void
+vt_set_textarea (int u, int l)
+{
+ /* how can I determine the font height?
+ * just use 16 for now
+ */
+ int urow = ((u + 15) / 16) + 1;
+ int lrow = l / 16;
+
+ mp_msg (MSGT_VO, MSGL_DBG2,
+ "vt_set_textarea (%d, %d): %d,%d\n", u, l, urow, lrow);
+
+ if (vt_fp)
+ {
+ fprintf (vt_fp, "\33[%d;%dr\33[%d;%dH", urow, lrow, lrow, 0);
+ fflush (vt_fp);
+ }
+}
+
+static int
+config (uint32_t width, uint32_t height, uint32_t d_width,
+ uint32_t d_height, uint32_t flags, char *title, uint32_t format)
+{
+ struct fb_fix_screeninfo fb_finfo;
+ uint32_t black = 0x00800080;
+ long temp;
+ int vt_fd;
+
+ fs = flags & VOFLAG_FULLSCREEN;
+
+ if (pre_init_err == -2)
+ {
+ mp_msg (MSGT_VO, MSGL_ERR,
+ "Internal fatal error: config() was called before preinit()\n");
+ return -1;
+ }
+
+ if (pre_init_err)
+ return 1;
+
+ in_width = width;
+ in_height = height;
+
+ out_width = (d_width && fs) ? d_width : width;
+ out_height = (d_width && fs) ? d_height : height;
+
+ fb_vinfo.xres_virtual = fb_vinfo.xres;
+ fb_vinfo.yres_virtual = fb_vinfo.yres;
+
+ if (fb_tty_fd >= 0 && ioctl (fb_tty_fd, KDSETMODE, KD_GRAPHICS) < 0)
+ {
+ mp_msg (MSGT_VO, MSGL_V,
+ "Can't set graphics mode: %s\n", strerror (errno));
+ close (fb_tty_fd);
+ fb_tty_fd = -1;
+ }
+
+ if (ioctl (fb_dev_fd, FBIOPUT_VSCREENINFO, &fb_vinfo))
+ {
+ mp_msg (MSGT_VO, MSGL_ERR,
+ "Can't put VSCREENINFO: %s\n", strerror (errno));
+ if (fb_tty_fd >= 0 && ioctl (fb_tty_fd, KDSETMODE, KD_TEXT) < 0)
+ {
+ mp_msg (MSGT_VO, MSGL_ERR,
+ "Can't restore text mode: %s\n", strerror (errno));
+ }
+ return 1;
+ }
+
+ if (fs)
+ {
+ out_width = fb_vinfo.xres;
+ out_height = fb_vinfo.yres;
+ }
+
+ if (out_width < in_width || out_height < in_height)
+ {
+ mp_msg (MSGT_VO, MSGL_ERR, "Screensize is smaller than video size\n");
+ return 1;
+ }
+
+ if (ioctl (fb_dev_fd, FBIOGET_FSCREENINFO, &fb_finfo))
+ {
+ mp_msg (MSGT_VO, MSGL_ERR,
+ "Can't get FSCREENINFO: %s\n", strerror (errno));
+ return 1;
+ }
+
+ if (fb_finfo.type != FB_TYPE_PACKED_PIXELS)
+ {
+ mp_msg (MSGT_VO, MSGL_ERR, "Type %d not supported\n", fb_finfo.type);
+ return 1;
+ }
+
+ fb_line_len = fb_finfo.line_length;
+ fb_size = fb_finfo.smem_len;
+ frame_buffer = NULL;
+
+ frame_buffer = (uint8_t *) mmap (0, fb_size, PROT_READ | PROT_WRITE,
+ MAP_SHARED, fb_dev_fd, 0);
+ if (frame_buffer == (uint8_t *) -1)
+ {
+ mp_msg (MSGT_VO, MSGL_ERR,
+ "Can't mmap %s: %s\n", WII_DEV_NAME, strerror (errno));
+ return 1;
+ }
+
+ center = frame_buffer +
+ ((out_width - in_width) / 2) * FB_PIXEL_SIZE +
+ ((out_height - in_height) / 2) * fb_line_len;
+
+ mp_msg (MSGT_VO, MSGL_DBG2, "Frame_buffer @ %p\n", frame_buffer);
+ mp_msg (MSGT_VO, MSGL_DBG2, "Center @ %p\n", center);
+ mp_msg (MSGT_VO, MSGL_V,
+ "Pixel per line: %d\n", fb_line_len / FB_PIXEL_SIZE);
+
+ /* blanking screen */
+ for (temp = 0; temp < fb_size; temp += 4)
+ memcpy (frame_buffer + temp, (void *) &black, 4);
+
+ vt_fd = open (TTY_DEV_NAME, O_WRONLY);
+ if (vt_doit && vt_fd == -1)
+ {
+ mp_msg (MSGT_VO, MSGL_ERR,
+ "Can't open %s: %s\n", TTY_DEV_NAME, strerror (errno));
+ vt_doit = 0;
+ }
+
+ vt_fp = fdopen (vt_fd, "w");
+ if (vt_doit && !vt_fp)
+ {
+ mp_msg (MSGT_VO, MSGL_ERR,
+ "Can't fdopen %s: %s\n", TTY_DEV_NAME, strerror (errno));
+ vt_doit = 0;
+ }
+
+ if (vt_doit)
+ vt_set_textarea ((out_height + in_height) / 2, fb_vinfo.yres);
+
+ return 0;
+}
+
+static int
+query_format (uint32_t format)
+{
+ if (!fb_preinit (0))
+ return 0;
+
+ if (format != IMGFMT_YUY2)
+ return 0;
+
+ return VFCAP_ACCEPT_STRIDE | VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW;
+}
+
+static void
+draw_alpha (int x0, int y0, int w, int h,
+ unsigned char *src, unsigned char *srca, int stride)
+{
+ unsigned char *dst;
+
+ dst = center + fb_line_len * y0 + FB_PIXEL_SIZE * x0;
+ vo_draw_alpha_yuy2 (w, h, src, srca, stride, dst, fb_line_len);
+}
+
+static int
+draw_frame (uint8_t *src[])
+{
+ return 1;
+}
+
+static int
+draw_slice (uint8_t *src[], int stride[], int w, int h, int x, int y)
+{
+ uint8_t *d, *s;
+
+ d = center + fb_line_len * y + FB_PIXEL_SIZE * x;
+ s = src[0];
+
+ while (h)
+ {
+ memcpy (d, s, w * FB_PIXEL_SIZE);
+ d += fb_line_len;
+ s += stride[0];
+ h--;
+ }
+
+ return 0;
+}
+
+static void
+check_events(void)
+{
+ /* unused */
+}
+
+static void
+flip_page (void)
+{
+ /* unused */
+}
+
+static void
+draw_osd (void)
+{
+ vo_draw_text (in_width, in_height, draw_alpha);
+}
+
+static void
+uninit (void)
+{
+ if (ioctl (fb_dev_fd, FBIOGET_VSCREENINFO, &fb_vinfo))
+ mp_msg (MSGT_VO, MSGL_WARN,
+ "ioctl FBIOGET_VSCREENINFO: %s\n", strerror (errno));
+
+ fb_orig_vinfo.xoffset = fb_vinfo.xoffset;
+ fb_orig_vinfo.yoffset = fb_vinfo.yoffset;
+
+ if (ioctl (fb_dev_fd, FBIOPUT_VSCREENINFO, &fb_orig_vinfo))
+ mp_msg (MSGT_VO, MSGL_WARN,
+ "Can't reset original fb_var_screeninfo: %s\n", strerror (errno));
+
+ if (fb_tty_fd >= 0)
+ {
+ if (ioctl (fb_tty_fd, KDSETMODE, KD_TEXT) < 0)
+ mp_msg (MSGT_VO, MSGL_WARN,
+ "Can't restore text mode: %s\n", strerror (errno));
+ }
+
+ if (vt_doit)
+ vt_set_textarea (0, fb_orig_vinfo.yres);
+
+ close (fb_tty_fd);
+ close (fb_dev_fd);
+
+ if (frame_buffer)
+ munmap (frame_buffer, fb_size);
+
+ frame_buffer = NULL;
+ fb_preinit (1);
+}
+
+static int
+preinit (const char *vo_subdevice)
+{
+ pre_init_err = 0;
+
+ if (!pre_init_err)
+ return pre_init_err = (fb_preinit (0) ? 0 : -1);
+
+ return -1;
+}
+
+static uint32_t
+get_image(mp_image_t *mpi)
+{
+ if (((mpi->type != MP_IMGTYPE_STATIC) && (mpi->type != MP_IMGTYPE_TEMP)) ||
+ (mpi->flags & MP_IMGFLAG_PLANAR) ||
+ (mpi->flags & MP_IMGFLAG_YUV) ||
+ (mpi->width != in_width) ||
+ (mpi->height != in_height))
+ return VO_FALSE;
+
+ mpi->planes[0] = center;
+ mpi->stride[0] = fb_line_len;
+ mpi->flags |= MP_IMGFLAG_DIRECT;
+
+ return VO_TRUE;
+}
+
+static int
+control (uint32_t request, void *data, ...)
+{
+ if (request == VOCTRL_GET_IMAGE)
+ return get_image (data);
+ else if (request == VOCTRL_QUERY_FORMAT)
+ return query_format (*((uint32_t*) data));
+
+ return VO_NOTIMPL;
+}
More information about the MPlayer-cvslog
mailing list