From e6e9626fa7f1cf4c5d4f01c62c4a0294e079e636 Mon Sep 17 00:00:00 2001 From: Vasily Khoruzhick Date: Wed, 2 Feb 2011 20:59:39 +0200 Subject: [PATCH] libvo: add support for pxa overlay Signed-off-by: Vasily Khoruzhick --- configure | 15 +++- libvo/video_out.c | 4 + libvo/vo_pxa.c | 304 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 322 insertions(+), 1 deletions(-) create mode 100644 libvo/vo_pxa.c diff --git a/configure b/configure index 2046f74..240acf5 100755 --- a/configure +++ b/configure @@ -544,6 +544,7 @@ _caca=auto _svga=auto _vesa=auto _fbdev=auto +_pxa=no _dvb=auto _dvbhead=auto _dxr2=auto @@ -857,6 +858,8 @@ for ac_option do --disable-vesa) _vesa=no ;; --enable-fbdev) _fbdev=yes ;; --disable-fbdev) _fbdev=no ;; + --enable-pxa) _pxa=yes ;; + --disable-pxa) _pxa=no ;; --enable-dvb) _dvb=yes ;; --disable-dvb) _dvb=no ;; --enable-dvbhead) _dvbhead=yes ;; @@ -4442,7 +4445,16 @@ else fi echores "$_fbdev" - +echocheck "PXA27x Overlay Support" +if test "$_pxa" = yes ; then + _def_pxa='#define HAVE_PXA 1' + _vosrc="$_vosrc vo_pxa.c" + _vomodules="pxa $_vomodules" +else + _def_pxa='#undef HAVE_PXA' + _novomodules="pxa $_novomodules" +fi +echores "$_pxa" echocheck "DVB" if test "$_dvb" = auto ; then @@ -8449,6 +8461,7 @@ $_def_bl $_def_mga $_def_xmga $_def_fbdev +$_def_pxa $_def_dxr2 $_def_dxr3 $_def_ivtv diff --git a/libvo/video_out.c b/libvo/video_out.c index 53aeb3e..010969a 100644 --- a/libvo/video_out.c +++ b/libvo/video_out.c @@ -85,6 +85,7 @@ extern vo_functions_t video_out_zr2; extern vo_functions_t video_out_bl; extern vo_functions_t video_out_fbdev; extern vo_functions_t video_out_fbdev2; +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; @@ -203,6 +204,9 @@ vo_functions_t* video_out_drivers[] = &video_out_fbdev, &video_out_fbdev2, #endif +#ifdef HAVE_PXA + &video_out_pxa, +#endif #ifdef HAVE_SVGALIB &video_out_svga, #endif diff --git a/libvo/vo_pxa.c b/libvo/vo_pxa.c new file mode 100644 index 0000000..13f18c3 --- /dev/null +++ b/libvo/vo_pxa.c @@ -0,0 +1,304 @@ +/* + * Video driver for PXA27x/3xx Overlay 2 + * by Vasily Khoruzhick + * (C) 2007 + */ + +#include +#include +#include +#include +#include + +#include + +#include +#include +#include +#include + +#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" + +static vo_info_t info = { + "PXA27x/3xx overlay", + "pxa", + "Vasily Khoruzhick ", + "" +}; + +LIBVO_EXTERN(pxa); + +/* VO driver state */ + +static int overlay_width, overlay_height, overlay_x, overlay_y; +static int overlay_fd = -1; +static void *overlay_mem; +static size_t overlay_mem_size; +static uint8_t *y_plane; +static uint8_t *u_plane; +static uint8_t *v_plane; + +static int vo_pxa_check_format(uint32_t format) +{ + switch (format) + { + /* Planar YUV Formats */ + case IMGFMT_YV12: + case IMGFMT_IYUV: + case IMGFMT_I420: + return( VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW + | VFCAP_ACCEPT_STRIDE ); + break; + + } + + mp_msg(MSGT_VO, MSGL_ERR, "vo_pxa: format %s is not supported\n", + vo_format_name(format)); + + return 0; +} + +/***************************************************************************** + * 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) +{ + int r, fb = -1; + struct fb_var_screeninfo fbvar; + + fb = open("/dev/fb0", O_RDWR); + r = ioctl(fb, FBIOGET_VSCREENINFO, &fbvar); + if (r) { + mp_msg(MSGT_VO, MSGL_V, "vo_pxa: get_vscreeninfo ioctl failed"); + return -1; + } + + overlay_width = fbvar.xres; + overlay_height = fbvar.yres; + + mp_msg(MSGT_VO, MSGL_V, "vo_pxa: main plane res is %dx%d\n", + overlay_width, overlay_height); + + close(fb); + + 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) +{ + int r; + struct fb_var_screeninfo fbvar; + struct fb_fix_screeninfo fbfix; + int i; + + mp_msg(MSGT_VO, MSGL_V, "vo_pxa: config() 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_check_format(format)) + goto error; + + /* Check src image */ + if (src_width > overlay_width || src_height > overlay_height) { + mp_msg(MSGT_VO, MSGL_ERR, "vo_pxa: src image is too big, scaling not supported.\n"); + goto error; + } + + if (dst_width > overlay_width || dst_height > overlay_height) { + mp_msg(MSGT_VO, MSGL_ERR, "vo_pxa: dst is too big, scaling not supported.\n"); + goto error; + } + + if (src_width != dst_width || src_height != dst_height) { + mp_msg(MSGT_VO, MSGL_ERR, "vo_pxa: src != dst, scaling not supported.\n"); + goto error; + } + + overlay_x = (overlay_width - dst_width) / 2; + overlay_y = (overlay_height - dst_height) / 2; + + overlay_fd = open("/dev/fb2", O_RDWR); + r = ioctl(overlay_fd, FBIOGET_VSCREENINFO, &fbvar); + if (r) { + mp_msg(MSGT_VO, MSGL_ERR, "vo_pxa: get_vscreeninfo ioctl failed\n"); + goto error; + } + + fbvar.xres_virtual = fbvar.xres = overlay_width; + fbvar.yres_virtual = fbvar.yres = overlay_height; + fbvar.bits_per_pixel = 16; + fbvar.activate = FB_ACTIVATE_NOW; + + fbvar.nonstd = (4 << 20) | (0 << 10) | (0); /* YUV420P, X=0, Y=0 */ + + r = ioctl(overlay_fd, FBIOPUT_VSCREENINFO, &fbvar); + if (r) { + mp_msg(MSGT_VO, MSGL_ERR, "vo_pxa: put_vscreeninfo ioctl failed\n"); + goto error; + } + r = ioctl(overlay_fd, FBIOGET_FSCREENINFO, &fbfix); + if (r) { + mp_msg(MSGT_VO, MSGL_ERR, "vo_pxa: get_fscreeninfo ioctl failed\n"); + goto error; + } + + overlay_mem_size = fbfix.smem_len; + overlay_mem = mmap(NULL, overlay_mem_size, (PROT_READ | PROT_WRITE), + MAP_SHARED, overlay_fd, 0); + + if (overlay_mem == MAP_FAILED) { + mp_msg(MSGT_VO, MSGL_ERR, "vo_pxa: failed to mmap overlay"); + goto error; + } + + y_plane = overlay_mem; + u_plane = y_plane + overlay_width * overlay_height; + v_plane = u_plane + overlay_width * overlay_height / 4; + + /* Fill the overlay with black */ + memset(y_plane, 16, + overlay_width * overlay_height); + memset(u_plane, 128, + overlay_width * overlay_height / 4); + memset(v_plane, 128, + overlay_width * overlay_height / 4); + + mp_msg(MSGT_VO, MSGL_V, "vo_pxa: configured and opened 2nd overlay"); + + return 0; + +error: + if (overlay_mem) + munmap(overlay_mem, overlay_mem_size); + if (overlay_fd != -1) + close(overlay_fd); + + overlay_mem = NULL; + overlay_fd = -1; + + return -1; +} + +static int control(uint32_t request, void *data, ...) +{ + mp_msg(MSGT_VO, MSGL_V, "vo_pxa: control %08x\n", request ); + + switch( request ) + { + case VOCTRL_QUERY_FORMAT: + return( vo_pxa_check_format( *(uint32_t *)data ) ); + break; + } + + return VO_NOTIMPL; +} + + +int draw_frame(uint8_t *src[]) +{ + 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) +{ + int i; + + x += overlay_x; + y += overlay_y; + + uint8_t *dst_y = y_plane + y * overlay_width + x; + uint8_t *dst_u = u_plane + y * overlay_width / 4 + x / 2; + uint8_t *dst_v = v_plane + y * overlay_width / 4 + x / 2; + uint8_t *src_y = src[0]; + uint8_t *src_u = src[1]; + uint8_t *src_v = src[2]; + + mp_msg(MSGT_VO, MSGL_V, "vo_pxa: draw_slice() w %d h %d x %d y %d stride %d %d %d\n", + w, h, x, y, stride[0], stride[1], stride[2] ); + + if (w + x > overlay_width || h + y > overlay_height) { + mp_msg(MSGT_VO, MSGL_ERR, "vo_pxa: too big image\n"); + return 0; + } + + for (i = 0; i < h; i++) { + fast_memcpy(dst_y, src_y, w); + src_y += stride[0]; + dst_y += overlay_width; + } + for (i = 0; i < h / 2; i++) { + fast_memcpy(dst_u, src_u, w / 2); + fast_memcpy(dst_v, src_v, w / 2); + src_u += stride[1]; + src_v += stride[2]; + dst_u += overlay_width / 2; + dst_v += overlay_width / 2; + } + + return 0; +} + +static void draw_osd(void) +{ + /* FIXME */ + /* vo_draw_text(in_width, in_height, draw_alpha); */ +} + +static void flip_page(void) +{ +} + +static void check_events(void) +{ +} + +static void uninit(void) +{ + if (overlay_mem) + munmap(overlay_mem, overlay_mem_size); + if (overlay_fd != -1) + close(overlay_fd); + + overlay_mem = NULL; + overlay_fd = -1; +} -- 1.7.4.rc1