mplayer_0.0+1.0rc1.bb : add start of the pxafb overlay driver from Tim Chick

This is a good start to fully working overlay video.

5 files changed, 577 insertions, 2 deletions

diff --git a/packages/mplayer/files/pxa-video_out.patch b/packages/mplayer/files/pxa-video_out.patch
new file mode 100644
index 0000000000..0c4c4feb8c
--- /dev/null
+++ b/packages/mplayer/files/pxa-video_out.patch
@@ -0,0 +1,22 @@
+Index: MPlayer-1.0rc1/libvo/video_out.c
+===================================================================
+--- MPlayer-1.0rc1.orig/libvo/video_out.c
++++ MPlayer-1.0rc1/libvo/video_out.c
+@@ -87,6 +87,7 @@ extern vo_functions_t video_out_fbdev;
+ extern vo_functions_t video_out_fbdev2;
+ extern vo_functions_t video_out_w100;
+ extern vo_functions_t video_out_imageon;
++extern vo_functions_t video_out_pxa;
+ extern vo_functions_t video_out_svga;
+ extern vo_functions_t video_out_png;
+ extern vo_functions_t video_out_ggi;
+@@ -206,6 +207,9 @@ vo_functions_t* video_out_drivers[] =
+ #ifdef HAVE_IMAGEON
+ 	&video_out_imageon,
+ #endif
++#ifdef HAVE_PXA
++    &video_out_pxa,
++#endif
+ #ifdef HAVE_SVGALIB
+ 	&video_out_svga,
+ #endif
diff --git a/packages/mplayer/files/pxa_configure.patch b/packages/mplayer/files/pxa_configure.patch
new file mode 100644
index 0000000000..85530b77c5
--- /dev/null
+++ b/packages/mplayer/files/pxa_configure.patch
@@ -0,0 +1,47 @@
+Index: MPlayer-1.0rc1/configure
+===================================================================
+--- MPlayer-1.0rc1.orig/configure
++++ MPlayer-1.0rc1/configure
+@@ -1600,6 +1600,7 @@ _vesa=auto
+ _fbdev=auto
+ _w100=no
+ _imageon=no
++_pxa=no
+ _dvb=auto
+ _dvbhead=auto
+ _dxr2=auto
+@@ -1803,6 +1804,8 @@ for ac_option do
+   --disable-w100)       _w100=no        ;;
+   --enable-imageon)     _imageon=yes    ;;
+   --disable-imageon)    _imageon=no     ;;
++  --enable-pxa)         _pxa=yes        ;;
++  --disable-pxa)        _pxa=no         ;;
+   --enable-dvb)		_dvb=yes	;;
+   --disable-dvb)        _dvb=no		;;
+   --enable-dvbhead)	_dvbhead=yes	;;
+@@ -4296,6 +4299,17 @@ else
+ fi
+ echores "$_imageon"
+ 
++echocheck "PXA27x Overlay Support"
++if test "$_pxa" = yes ; then
++  _def_imageon='#define HAVE_PXA 1'
++  _vosrc="$_vosrc vo_pxa.c"
++  _vomodules="pxa $_vomodules"
++else
++  _def_imageon='#undef HAVE_IMAGEON'
++  _novomodules="pxa $_novomodules"
++fi
++echores "$_pxa"
++
+ 
+ echocheck "DVB"
+ if test "$_dvb" = auto ; then
+@@ -8398,6 +8412,7 @@ $_def_syncfb
+ $_def_fbdev
+ $_def_w100
+ $_def_imageon
++$_def_pxa
+ $_def_dxr2
+ $_def_dxr3
+ $_def_ivtv
diff --git a/packages/mplayer/files/vo_pxa.c b/packages/mplayer/files/vo_pxa.c
new file mode 100644
index 0000000000..2e9bb57b9c
--- /dev/null
+++ b/packages/mplayer/files/vo_pxa.c
@@ -0,0 +1,468 @@
+/*
+ * Video driver for PXA 27x Overlay 2, in conjunction with kernel driver
+ * by Tim Chick <tim (DOT) chick (AT) csr (DOT) com>
+ * (C) 2007
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "config.h"
+#include "video_out.h"
+#include "video_out_internal.h"
+#include "sub.h"
+#include "aspect.h"
+#include "mp_msg.h"
+#include "subopt-helper.h"
+
+#include "vo_pxa.h"
+
+static vo_info_t info = {
+	"PXA 27x Framebuffer",
+	"pxa",
+	"Tim Chick <tim (DOT) chick (AT) csr (DOT) com>",
+	"For Sharp Zaurus SL-C1000 etc"
+};
+
+LIBVO_EXTERN(pxa);
+
+static pxa_priv_t st_pxa_priv;
+
+/*****************************************************************************
+ * preinit
+ *
+ * Preinitializes driver
+ *   arg - currently it's vo_subdevice
+ *   returns: zero on successful initialization, non-zero on error.
+ *
+ ****************************************************************************/
+static int preinit(const char *vo_subdevice)
+{
+    pxa_priv_t *priv = &st_pxa_priv;
+    int rc;
+    
+    mp_msg(MSGT_VO, MSGL_V, "vo_pxa: preinit() was called\n");
+
+    /* fill pxa_priv_t information */
+    memset(priv, 0, sizeof(*priv));
+    priv->fd = -1;
+    
+    /* We need to open the base framebuffer device, to change and restore modes */
+    priv->base_fd = open( "/dev/fb0", O_RDWR );
+    
+    if( priv->base_fd < 0 )
+    {
+        mp_msg( MSGT_VO, MSGL_ERR, "vo_pxa: Could not open base framebuffer device\n");
+        return -1;
+    }
+    
+    /* Get the base fb var data, so we can restore if we change video modes */
+    rc = ioctl( priv->base_fd, FBIOGET_VSCREENINFO, &(priv->base_orig_fb_var) );
+    
+    if( rc == -1 )
+    {
+        mp_msg( MSGT_VO, MSGL_ERR, "vo_pxa: FBIOGET_VSCREENINFO line %d failed\n", __LINE__ );
+        
+        /* If this failed, close down the FD so we don't try to set this again */
+        close( priv->base_fd );
+        priv->base_fd = -1;
+        
+        return -1;
+    }
+    
+    return 0;
+}
+
+
+/*****************************************************************************
+ * config
+ *
+ * Config the display driver.
+ * params:
+ *   src_width,srcheight: image source size
+ *   dst_width,dst_height: size of the requested window size, just a hint
+ *   fullscreen: flag, 0=windowd 1=fullscreen, just a hint
+ *   title: window title, if available
+ *   format: fourcc of pixel format
+ * returns : zero on successful initialization, non-zero on error.
+ *
+ ****************************************************************************/
+static int config(uint32_t src_width, uint32_t src_height,
+                  uint32_t dst_width, uint32_t dst_height, uint32_t flags,
+                  char *title, uint32_t format)
+{
+    pxa_priv_t *priv = &st_pxa_priv;
+    int rc;
+    
+    mp_msg(MSGT_VO, MSGL_V, "vo_pxa: config() was called\n");
+    mp_msg(MSGT_VO, MSGL_V, "vo_pxa: src_width:%d, src_height:%d, dst_width:%d, dst_height:%d\n",
+	   src_width, src_height, dst_width, dst_height);
+
+    /* Check format */
+    if( !vo_pxa_query_format(format) )
+    {
+        mp_msg( MSGT_VO, MSGL_ERR, "vo_pxa: unsupported fourcc for this driver: %x (%s)\n",
+                format, vo_format_name(format) );
+        goto err_out;
+    }
+    priv->format = format;
+    
+    /* Change resolution? */
+    priv->vm = flags & VOFLAG_MODESWITCHING;
+    if( priv->vm )
+    {
+        priv->my_fb_var = priv->base_orig_fb_var;
+        
+        /* Hard coded values suck, never mind */
+        priv->my_fb_var.xres = 240;
+        priv->my_fb_var.yres = 320;
+        priv->my_fb_var.pixclock = 134617;
+        priv->my_fb_var.left_margin = 20;
+        priv->my_fb_var.right_margin = 46;
+        priv->my_fb_var.upper_margin = 1;
+        priv->my_fb_var.lower_margin = 0;
+        priv->my_fb_var.hsync_len = 20;
+        priv->my_fb_var.vsync_len = 2;
+    
+        rc = ioctl( priv->base_fd, FBIOPUT_VSCREENINFO, &(priv->my_fb_var) );
+        
+        if( rc == -1 )
+        {
+            mp_msg( MSGT_VO, MSGL_ERR, "vo_pxa: Set of base fb failed\n");
+            priv->vm = 0;
+            goto err_out;
+        }
+    }
+ 
+    /* We need these sleeps, to make the change in resolution actually happen, before we open the overlay */
+    sleep(2);
+   
+    /* Open up the overlay fbdev */
+    priv->fd = open( "/dev/fb2", O_RDWR );
+
+    if( priv->fd < 0 )
+    {
+        mp_msg( MSGT_VO, MSGL_ERR, "vo_pxa: Could not open framebuffer device\n");
+        goto err_out;
+    }
+    
+    /* Read in fb var data */
+    rc = ioctl( priv->fd, FBIOGET_VSCREENINFO, &(priv->my_fb_var) );
+    
+    if( rc == -1 )
+    {
+        mp_msg( MSGT_VO, MSGL_ERR, "vo_pxa: FBIOGET_VSCREENINFO line %d failed\n", __LINE__ );
+        goto err_out;
+    }
+    
+    /* Set up the buffer */
+    priv->my_fb_var.xres = src_width;
+    priv->my_fb_var.yres = src_height;
+    priv->my_fb_var.nonstd = ( 4 << 20)  /* Format YV12 */
+                           | ( 0 <<  0)  /* x position */
+                           | ( 0 << 10); /* y position */ 
+    /* We have to set the bits per pixel to a valid value, even though it is
+     * incorrect for YV12
+     */
+    priv->my_fb_var.bits_per_pixel = 16;
+    
+    rc = ioctl( priv->fd, FBIOPUT_VSCREENINFO, &(priv->my_fb_var) );
+    
+    if( rc == -1 )
+    {
+        mp_msg( MSGT_VO, MSGL_ERR, "vo_pxa: FBIOPUT_VSCREENINFO line %d failed\n", __LINE__ );
+        goto err_out;
+    }
+        
+    /* Next get the fixed fbvars, so we can mmap the data for all 3 planes */
+    rc = ioctl( priv->fd, FBIOGET_FSCREENINFO, &(priv->my_fb_fix) );
+    
+    if( rc == -1 )
+    {
+        mp_msg( MSGT_VO, MSGL_ERR, "vo_pxa: FBIOGET_FSCREENINFO line %d failed\n", __LINE__ );
+        goto err_out;
+    }
+    
+    priv->fb_mem_base = mmap( NULL, priv->my_fb_fix.smem_len, (PROT_READ | PROT_WRITE ),
+                        MAP_SHARED,
+                        priv->fd,
+                        0 );
+
+    if( priv->fb_mem_base == MAP_FAILED )
+    {
+        mp_msg( MSGT_VO, MSGL_ERR, "vo_pxa: mmap buffer failed\n" );
+        goto err_out;
+    }
+
+    /* Finally, find the offsets of each plane by getting the var data again */
+    rc = ioctl( priv->fd, FBIOGET_VSCREENINFO, &(priv->my_fb_var) );
+    
+    if( rc == -1 )
+    {
+        mp_msg( MSGT_VO, MSGL_ERR, "vo_pxa: FBIOGET_VSCREENINFO line %d failed\n", __LINE__ );
+        goto err_out;
+    }
+    
+    /* We are good to go! */
+    mp_msg( MSGT_VO, MSGL_V, "vo_pxa: FOpened screen %d x %d fourcc %s\n",
+            priv->my_fb_var.xres,
+            priv->my_fb_var.yres,
+            vo_format_name(format) );
+    
+    return 0;
+    
+    err_out:
+    
+    if( priv->fb_mem_base != MAP_FAILED )
+    {
+        munmap( priv->fb_mem_base, priv->my_fb_fix.smem_len );
+        priv->fb_mem_base = MAP_FAILED;
+    }
+            
+    if( priv->fd >= 0 )
+    {
+        close( priv->fd );
+        priv->fd = -1;
+    }
+    return -1;
+}
+
+
+/*****************************************************************************
+ *
+ * control
+ *
+ * Control display
+ *
+ ****************************************************************************/
+static int control(uint32_t request, void *data, ...)
+{
+    switch( request )
+    {
+        case VOCTRL_QUERY_FORMAT:
+            return( vo_pxa_query_format( *(uint32_t *)data ) );
+            break;
+    }
+    
+    return VO_NOTIMPL;
+}
+
+
+/*****************************************************************************
+ *
+ * draw_frame
+ *
+ * Display a new RGB/BGR frame of the video to the screen.
+ * params:
+ *   src[0] - pointer to the image
+ *
+ ****************************************************************************/
+int draw_frame(uint8_t *src[])
+{
+    /* This is not implimented */
+    mp_msg(MSGT_VO, MSGL_V, "vo_pxa: dummy draw_frame() was called\n");
+    return -1;
+}
+
+
+/*****************************************************************************
+ *
+ * draw_slice
+ *
+ * Draw a planar YUV slice to the buffer:
+ * params:
+ *   src[3] = source image planes (Y,U,V)
+ *   stride[3] = source image planes line widths (in bytes)
+ *   w,h = width*height of area to be copied (in Y pixels)
+ *   x,y = position at the destination image (in Y pixels)
+ *
+ ****************************************************************************/
+int draw_slice(uint8_t *src[], int stride[], int w,int h, int x,int y)
+{
+    pxa_priv_t *priv = &st_pxa_priv;
+    uint8_t *my_src;
+    uint8_t *dest;
+    size_t length;
+    int i;
+    
+    /* This routine is only display routine actually implimented */
+    mp_msg(MSGT_VO, MSGL_V, "vo_pxa: draw_slice() was called\n");
+    
+    /* It would be faster to check if source and dest have same geometry and copy
+     * whole block
+     * For the moment we just copy a line at a time
+     */
+
+    /* Limit area written to */
+    if( x >= priv->my_fb_fix.line_length )
+    {
+        return 0;
+    }
+    
+    if( w + x > priv->my_fb_fix.line_length )
+    {
+        w = priv->my_fb_fix.line_length - x;
+    }
+    
+    if( y>= priv->my_fb_var.yres )
+    {
+        return 0;
+    }
+    
+    if( h + y > priv->my_fb_var.yres )
+    {
+        h = priv->my_fb_var.yres - y;
+    }
+    
+    /* First Y */
+    for( i = 0; i<h; i++ )
+    {
+        dest = priv->fb_mem_base + 
+            priv->my_fb_var.red.offset + 
+            ( (y+i) * priv->my_fb_fix.line_length ) +
+            x;
+        my_src = src[0] + stride[0] * i;
+        memcpy( dest, my_src, w );
+    }
+
+    /* Now U */
+    for( i = 0; i<(h/2); i++ )
+    {
+        dest = priv->fb_mem_base + 
+            priv->my_fb_var.green.offset + 
+            ( ((y/2)+i) * (priv->my_fb_fix.line_length/2) ) +
+            x;
+        my_src = src[1] + stride[1] * i;
+        memcpy( dest, my_src, w/2 );
+    }
+    
+    /* Finaly V */
+    for( i = 0; i<(h/2); i++ )
+    {
+        dest = priv->fb_mem_base + 
+            priv->my_fb_var.blue.offset + 
+            ( ((y/2)+i) * (priv->my_fb_fix.line_length/2) ) +
+            x;
+        my_src = src[2] + stride[2] * i;
+        memcpy( dest, my_src, w/2 );
+    }
+    
+    return 0;
+}
+
+static void draw_osd(void)
+{
+    mp_msg(MSGT_VO, MSGL_V, "vo_pxa: draw_osd() was called\n");
+}
+
+/*****************************************************************************
+ *
+ * flip_page
+ *
+ * Blit/Flip buffer to the screen. Must be called after each frame!
+ *
+ *
+ ****************************************************************************/
+static void flip_page(void)
+{
+    mp_msg(MSGT_VO, MSGL_V, "vo_pxa: flip_page() was called\n");
+}
+
+/*****************************************************************************
+ *
+ * check_events
+ *
+ *
+ ****************************************************************************/
+static void check_events(void)
+{
+}
+
+/*****************************************************************************
+ *
+ * uninit
+ *
+ *
+ ****************************************************************************/
+static void uninit(void)
+{
+    pxa_priv_t *priv = &st_pxa_priv;
+    int rc;
+
+    if( priv->fb_mem_base != MAP_FAILED )
+    {
+        munmap( priv->fb_mem_base, priv->my_fb_fix.smem_len );
+        priv->fb_mem_base = MAP_FAILED;
+    }
+            
+    if( priv->fd >= 0 )
+    {
+        close( priv->fd );
+        priv->fd = -1;
+    }
+
+    /* We need these sleeps, to make the change in resolution actually happen */
+    sleep(1);
+ 
+    if( priv->vm )
+    {
+        /* Restore original resolution */
+        if( priv->base_fd >= 0 )
+        {
+            mp_msg( MSGT_VO, MSGL_ERR, "vo_pxa: Try to restore original video mode\n", __LINE__ );
+
+            rc = ioctl( priv->base_fd, FBIOPUT_VSCREENINFO, &(priv->base_orig_fb_var) );
+    
+            if( rc == -1 )
+            {
+                mp_msg( MSGT_VO, MSGL_ERR, "vo_pxa: FBIOPUT_VSCREENINFO line %d failed\n", __LINE__ );
+            }
+        }
+        
+    }
+    
+    /* We need these sleeps, to make the change in resolution actually happen */
+    /* For some reason, if we change the reolution the overlay buffer never gets deleted? */
+    sleep(1);
+
+    if( priv->base_fd >= 0 )
+    {
+        close( priv->base_fd );
+        priv->base_fd = -1;
+    }
+}
+
+/*****************************************************************************
+ *
+ * Internal functions, not part of mplayer API
+ *
+ ****************************************************************************/
+
+static int vo_pxa_query_format( uint32_t format )
+{
+    mp_msg(MSGT_VO, MSGL_V, "vo_pxa: vo_pxa_query_format was called: %x (%s)\n",
+	   format, vo_format_name(format));
+
+    if( IMGFMT_IS_RGB(format) )
+    {
+	/* RGB/BGR Formats not supported yet */
+	return 0;
+    } 
+    else 
+    {
+	/* Planar YUV Formats */
+	switch (format) {
+            /* Warning! dropthrough */
+            case IMGFMT_YV12:
+            case IMGFMT_IYUV:
+            case IMGFMT_I420:
+                return( VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW
+                        | VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN | VFCAP_OSD
+                        | VFCAP_ACCEPT_STRIDE );
+                break;
+	}
+    }
+
+    return 0;
+}
diff --git a/packages/mplayer/files/vo_pxa.h b/packages/mplayer/files/vo_pxa.h
new file mode 100644
index 0000000000..ee7825b76e
--- /dev/null
+++ b/packages/mplayer/files/vo_pxa.h
@@ -0,0 +1,31 @@
+/*
+ * Video driver for PXA 27x Overlay 2, in conjunction with kernel driver
+ * by Tim Chick <tim (DOT) chick (AT) csr (DOT) com>
+ * (C) 2007
+ */
+
+#include <linux/fb.h>
+
+#include <sys/ioctl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/mman.h>
+#include <fcntl.h>
+
+typedef struct pxa_priv_s {
+    uint8_t *fb_mem_base;
+    int fd;
+    int base_fd;
+    struct fb_var_screeninfo my_fb_var;
+    struct fb_fix_screeninfo my_fb_fix;
+    struct fb_var_screeninfo base_orig_fb_var;
+    int vm;
+    uint32_t format;
+    int src_width;
+    int src_height;
+} pxa_priv_t;
+
+#define UNUSED(v) ((void)(v))
+
+/* Internal API */
+static int vo_pxa_query_format( uint32_t format );
diff --git a/packages/mplayer/mplayer_0.0+1.0rc1.bb b/packages/mplayer/mplayer_0.0+1.0rc1.bb
index 9d8e8b283d..5ade18bfeb 100644
--- a/packages/mplayer/mplayer_0.0+1.0rc1.bb
+++ b/packages/mplayer/mplayer_0.0+1.0rc1.bb
@@ -9,6 +9,8 @@ SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-1.0rc1.tar.bz2 \
            file://vo_w100.c \
            file://vo_w100_api.h \
            file://vo_w100_fb.h \
+           file://vo_pxa.c \
+           file://vo_pxa.h \
            file://Makefile.patch;patch=1 \
            file://w100-configure.patch;patch=1 \
            file://w100-Makefile.patch;patch=1 \
@@ -17,7 +19,9 @@ SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-1.0rc1.tar.bz2 \
            file://pld-onlyarm5.patch;patch=1 \
            file://makefile-nostrip.patch;patch=1 \
            ${SOURCEFORGE_MIRROR}/libw100/mplayer-imageon.patch;patch=1 \
-           file://imageon-video_out.patch;patch=1"
+           file://imageon-video_out.patch;patch=1 \
+           file://pxa_configure.patch;patch=1 \
+           file://pxa-video_out.patch;patch=1 "
 
 # This is required for the collie machine only as all stacks in that
 # machine seem to be set to executable by the toolchain. If someone
@@ -29,7 +33,7 @@ PACKAGE_ARCH_mencoder_collie = "collie"
 
 RCONFLICTS_${PN} = "mplayer-atty"
 RREPLACES_${PN} = "mplayer-atty"
-PR = "r7"
+PR = "r8"
 
 PARALLEL_MAKE = ""
 
@@ -172,11 +176,14 @@ EXTRA_OECONF = " \
 EXTRA_OECONF_append_c7x0 = " --enable-w100 --enable-imageon "
 EXTRA_OECONF_append_hx4700 = " --enable-imageon "
 EXTRA_OECONF_append_progear = " --disable-sse --disable-3dnow --disable-mmxext --disable-sse2"
+EXTRA_OECONF_append_spitz = " --enable-pxa "
 
 do_configure() {
 	cp ${WORKDIR}/vo_w100.c ${S}/libvo
 	cp ${WORKDIR}/vo_w100_api.h ${S}/libvo
 	cp ${WORKDIR}/vo_w100_fb.h ${S}/libvo
+    cp ${WORKDIR}/vo_pxa.c ${S}/libvo
+    cp ${WORKDIR}/vo_pxa.h ${S}/libvo
 
 	sed -i 's|/usr/include|${STAGING_INCDIR}|g' ${S}/configure
 	sed -i 's|/usr/lib|${STAGING_LIBDIR}|g' ${S}/configure