[MPlayer-cvslog] r23293 - in trunk: configure vidix/Makefile vidix/drivers.c vidix/ivtv_vid.c
ben
subversion at mplayerhq.hu
Thu May 10 20:47:27 CEST 2007
Author: ben
Date: Thu May 10 20:47:27 2007
New Revision: 23293
Log:
new VIDIX driver for IVTV cards, original patch by Lutz Koschorreck
Added:
trunk/vidix/ivtv_vid.c
Modified:
trunk/configure
trunk/vidix/Makefile
trunk/vidix/drivers.c
Modified: trunk/configure
==============================================================================
--- trunk/configure (original)
+++ trunk/configure Thu May 10 20:47:27 2007
@@ -334,7 +334,7 @@ Video output:
--disable-vidix-internal disable internal VIDIX [for x86 *nix]
--disable-vidix-external disable external VIDIX [for x86 *nix]
--with-vidix-drivers[=*] list of VIDIX drivers to be compiled in
- Available: all,cyberblade,mach64,mga,mga_crtc2,
+ Available: all,cyberblade,ivtv,mach64,mga,mga_crtc2,
nvidia,pm2,pm3,radeon,rage128,savage,sis,unichrome
--enable-gl enable OpenGL video output [autodetect]
--enable-dga[=n] enable DGA [n in {1, 2} ] support [autodetect]
@@ -7239,6 +7239,26 @@ if test "$_vidix" = yes ; then
_def_vidix_drv_cyberblade='#undef CONFIG_VIDIX_DRV_CYBERBLADE'
_vidix_drv_cyberblade=no
fi
+ if test "$_vidix_drivers" = all || test `echo "$_vidix_drivers" | grep -e ivtv`; then
+ cat > $TMPC << EOF
+#include <linux/types.h>
+#include <linux/ivtv.h>
+int main(void) { return 0; }
+EOF
+ _vidix_ivtv=no
+ cc_check && _vidix_ivtv=yes
+
+ if test "$_vidix_ivtv" = yes; then
+ _def_vidix_drv_ivtv='#define CONFIG_VIDIX_DRV_IVTV 1'
+ _vidix_drv_ivtv=yes
+ else
+ _def_vidix_drv_ivtv='#undef CONFIG_VIDIX_DRV_IVTV'
+ _vidix_drv_ivtv=no
+ fi
+ else
+ _def_vidix_drv_ivtv='#undef CONFIG_VIDIX_DRV_IVTV'
+ _vidix_drv_ivtv=no
+ fi
if test "$_vidix_drivers" = all || test `echo "$_vidix_drivers" | grep -e mach64`; then
_def_vidix_drv_mach64='#define CONFIG_VIDIX_DRV_MACH64 1'
_vidix_drv_mach64=yes
@@ -7693,6 +7713,7 @@ CONFIG_MUXERS=$_mencoder
RADIO=$_radio
RADIO_CAPTURE=$_radio_capture
VIDIX_CYBERBLADE=$_vidix_drv_cyberblade
+VIDIX_IVTV=$_vidix_drv_ivtv
VIDIX_MACH64=$_vidix_drv_mach64
VIDIX_MGA=$_vidix_drv_mga
VIDIX_MGA_CRTC2=$_vidix_drv_mga_crtc2
@@ -8381,6 +8402,7 @@ $_def_cddb
/* enables / disables VIDIX usage */
$_def_vidix
$_def_vidix_drv_cyberblade
+$_def_vidix_drv_ivtv
$_def_vidix_drv_mach64
$_def_vidix_drv_mga
$_def_vidix_drv_mga_crtc2
Modified: trunk/vidix/Makefile
==============================================================================
--- trunk/vidix/Makefile (original)
+++ trunk/vidix/Makefile Thu May 10 20:47:27 2007
@@ -11,6 +11,7 @@ SRCS_MPLAYER = vidixlib.c \
pci_dev_ids.c\
SRCS_MPLAYER-$(VIDIX_CYBERBLADE) += cyberblade_vid.c
+SRCS_MPLAYER-$(VIDIX_IVTV) += ivtv_vid.c
SRCS_MPLAYER-$(VIDIX_MACH64) += mach64_vid.c
SRCS_MPLAYER-$(VIDIX_MGA) += mga_vid.c
SRCS_MPLAYER-$(VIDIX_NVIDIA) += nvidia_vid.c
Modified: trunk/vidix/drivers.c
==============================================================================
--- trunk/vidix/drivers.c (original)
+++ trunk/vidix/drivers.c Thu May 10 20:47:27 2007
@@ -33,6 +33,7 @@
VDXDriver *first_driver = NULL;
extern VDXDriver cyberblade_drv;
+extern VDXDriver ivtv_drv;
extern VDXDriver mach64_drv;
extern VDXDriver mga_drv;
extern VDXDriver mga_crtc2_drv;
@@ -61,6 +62,9 @@ void vidix_register_all_drivers (void)
#ifdef CONFIG_VIDIX_DRV_CYBERBLADE
vidix_register_driver (&cyberblade_drv);
#endif
+#ifdef CONFIG_VIDIX_DRV_IVTV
+ vidix_register_driver (&ivtv_drv);
+#endif
#ifdef CONFIG_VIDIX_DRV_MACH64
vidix_register_driver (&mach64_drv);
#endif
Added: trunk/vidix/ivtv_vid.c
==============================================================================
--- (empty file)
+++ trunk/vidix/ivtv_vid.c Thu May 10 20:47:27 2007
@@ -0,0 +1,507 @@
+/**
+ VIDIX driver for Hauppauge PVR 350.
+
+ Copyright 2007 Lutz Koschorreck.
+
+ Based on genfb_vid.c and ivtv_xv.c
+
+ This program 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.
+
+ This program 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 this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+ 09.05.2007 Lutz Koschorreck
+ First version: Tested with ivtv-0.10.1, xine-ui-0.99.5, xine-lib-1.1.6
+
+**/
+
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <math.h>
+#include <inttypes.h>
+#include <fcntl.h>
+#include <sys/ioctl.h>
+#include <linux/types.h>
+#include <linux/ivtv.h>
+
+#include "vidix.h"
+#include "vidixlib.h"
+#include "fourcc.h"
+#include "dha.h"
+#include "pci_ids.h"
+#include "pci_names.h"
+
+#define VIDIX_STATIC ivtv_
+
+#define IVTV_MSG "[ivtv-vid] "
+#define MAXLINE 128
+#define IVTVMAXWIDTH 720
+#define IVTVMAXHEIGHT 576
+
+static int yuvdev = 0;
+static void *memBase = 0;
+static int frameSize = 0;
+static int probed = 0;
+static int ivtv_verbose;
+static vidix_rect_t destVideo;
+static vidix_rect_t srcVideo;
+static unsigned char *outbuf = NULL;
+
+/* VIDIX exports */
+
+static vidix_capability_t ivtv_cap =
+{
+ "Hauppauge PVR 350 YUV Video",
+ "Lutz Koschorreck",
+ TYPE_OUTPUT,
+ { 0, 0, 0, 0 },
+ IVTVMAXHEIGHT,
+ IVTVMAXWIDTH,
+ 4,
+ 4,
+ -1,
+ FLAG_UPSCALER|FLAG_DOWNSCALER,
+ -1,
+ -1,
+ { 0, 0, 0, 0 }
+};
+
+static void de_macro_y (unsigned char *src, unsigned char *dst,
+ unsigned int w, unsigned int h,
+ int src_x, int src_y,
+ int height __attribute__ ((unused)), int width)
+{
+ unsigned int x, y, i;
+ unsigned char *dst_2;
+ unsigned int h_tail, w_tail;
+ unsigned int h_size, w_size;
+
+ // Always round the origin, but compensate by increasing the size
+ if (src_x & 15)
+ {
+ w += src_x & 15;
+ src_x &= ~15;
+ }
+
+ if (src_y & 15)
+ {
+ h += src_y & 15;
+ src_y &= ~15;
+ }
+
+ // The right / bottom edge might not be a multiple of 16
+ h_tail = h & 15;
+ w_tail = w & 15;
+
+ // One block is 16 pixels high
+ h_size = 16;
+
+ // descramble Y plane
+ for (y = 0; y < h; y += 16)
+ {
+ // Clip if we've reached the bottom & the size isn't a multiple of 16
+ if (y + 16 > h) h_size = h_tail;
+
+ for (x = 0; x < w; x += 16)
+ {
+ if (x + 16 > w)
+ w_size = w_tail;
+ else
+ w_size = 16;
+
+ dst_2 = dst + (720 * y) + (720 * src_y) + (256 * (src_x>>4)) + (x * 16);
+
+ for (i = 0; i < h_size; i++)
+ {
+ memcpy (dst_2, src + src_x + x + (y + i) * width + (src_y * width),
+ w_size);
+ dst_2 += 16;
+ }
+ }
+ }
+}
+
+static void de_macro_uv (unsigned char *srcu, unsigned char *srcv,
+ unsigned char *dst, unsigned int w, unsigned int h,
+ int src_x, int src_y, int height, int width)
+{
+ unsigned int x, y, i, f;
+ unsigned char *dst_2;
+ unsigned int h_tail, w_tail;
+ unsigned int h_size;
+
+ /* The uv plane is half the size of the y plane,
+ so 'correct' all dimensions. */
+ w /= 2;
+ h /= 2;
+ src_x /= 2;
+ src_y /= 2;
+ height /= 2;
+ width /= 2;
+
+ // Always round the origin, but compensate by increasing the size
+ if (src_x & 7)
+ {
+ w += src_x & 7;
+ src_x &= ~7;
+ }
+
+ if (src_y & 15)
+ {
+ h += src_y & 15;
+ src_y &= ~15;
+ }
+
+ // The right / bottom edge may not be a multiple of 16
+ h_tail = h & 15;
+ w_tail = w & 7;
+
+ h_size = 16;
+
+ // descramble U/V plane
+ for (y = 0; y < h; y += 16)
+ {
+ if (y + 16 > h)
+ h_size = h_tail;
+
+ for (x = 0; x < w; x += 8)
+ {
+ dst_2 = dst + (720 * y) + (720 * src_y) + (256 * (src_x>>3)) + (x * 32);
+ if (x + 8 <= w)
+ {
+ for (i = 0; i < h_size; i++)
+ {
+ int idx = src_x + x + ((y + i) * width) + (src_y * width);
+ dst_2[0] = srcu[idx + 0];
+ dst_2[1] = srcv[idx + 0];
+ dst_2[2] = srcu[idx + 1];
+ dst_2[3] = srcv[idx + 1];
+ dst_2[4] = srcu[idx + 2];
+ dst_2[5] = srcv[idx + 2];
+ dst_2[6] = srcu[idx + 3];
+ dst_2[7] = srcv[idx + 3];
+ dst_2[8] = srcu[idx + 4];
+ dst_2[9] = srcv[idx + 4];
+ dst_2[10] = srcu[idx + 5];
+ dst_2[11] = srcv[idx + 5];
+ dst_2[12] = srcu[idx + 6];
+ dst_2[13] = srcv[idx + 6];
+ dst_2[14] = srcu[idx + 7];
+ dst_2[15] = srcv[idx + 7];
+ dst_2 += 16;
+ }
+ }
+ else
+ {
+ for (i = 0; i < h_size; i ++)
+ {
+ int idx = src_x + x + ((y + i) * width) + (src_y * width);
+ for (f = 0; f < w_tail; f++)
+ {
+ dst_2[0] = srcu[idx + f];
+ dst_2[1] = srcv[idx + f];
+ dst_2 += 2;
+ }
+
+ dst_2 += 16 - (w_tail << 1);
+ }
+ }
+ }
+ }
+}
+
+static int ivtv_probe (int verbose, int force __attribute__ ((unused)))
+{
+ pciinfo_t lst[MAX_PCI_DEVICES];
+ unsigned int i, num_pci;
+ int err;
+ FILE *procFb;
+ unsigned char fb_number = 0;
+ unsigned char yuv_device_number, yuv_device;
+ char yuv_device_name[] = "/dev/videoXXX\0";
+
+ if (verbose)
+ printf (IVTV_MSG"probe\n");
+
+ ivtv_verbose = verbose;
+
+ err = pci_scan (lst, &num_pci);
+ if (err)
+ {
+ printf (IVTV_MSG"Error occured during pci scan: %s\n", strerror (err));
+ return err;
+ }
+
+ if (ivtv_verbose)
+ printf (IVTV_MSG"Found %d pci devices\n", num_pci);
+
+ for (i = 0; i < num_pci; i++)
+ {
+ if (ivtv_verbose == 2)
+ printf (IVTV_MSG"Found chip [%04X:%04X] '%s' '%s'\n",
+ lst[i].vendor, lst[i].device, pci_vendor_name (lst[i].vendor),
+ pci_device_name(lst[i].vendor,lst[i].device));
+
+ if (VENDOR_INTERNEXT == lst[i].vendor)
+ {
+ switch (lst[i].device)
+ {
+ case DEVICE_INTERNEXT_ITVC15_MPEG_2_ENCODER:
+ if (ivtv_verbose)
+ printf (IVTV_MSG"Found PVR 350\n");
+ goto card_found;
+ }
+ }
+ }
+
+ if (ivtv_verbose)
+ printf (IVTV_MSG"Can't find chip\n");
+
+ return (ENXIO);
+
+ card_found:
+
+ /* Try to find framebuffer device */
+ procFb = fopen ("/proc/fb", "r");
+ if (procFb)
+ {
+ char procEntry[MAXLINE] = {0};
+ while (NULL != fgets(procEntry, MAXLINE, procFb))
+ {
+ char *pos = NULL;
+ if (ivtv_verbose)
+ printf (IVTV_MSG" %s", procEntry);
+
+ if (NULL != (pos = strstr(procEntry, " cx23415 TV out")))
+ {
+ *pos = '\0';
+ fb_number = atoi (procEntry);
+ if (ivtv_verbose)
+ printf (IVTV_MSG"Framebuffer found #%u\n", fb_number);
+ goto fb_found;
+ }
+ }
+ }
+ else
+ {
+ if (ivtv_verbose)
+ printf (IVTV_MSG"Framebuffer device not found\n");
+ return (ENXIO);
+ }
+
+ fb_found:
+ fclose (procFb);
+
+ /* Try to find YUV device */
+ yuv_device_number = 48;
+ yuv_device = 48 + fb_number;
+
+ do {
+ sprintf (yuv_device_name, "/dev/video%u", yuv_device);
+ yuvdev = open (yuv_device_name, O_RDWR);
+ if (-1 != yuvdev)
+ {
+ if (ivtv_verbose)
+ printf (IVTV_MSG"YUV device found /dev/video%u\n", yuv_device);
+ goto yuv_found;
+ }
+ else
+ {
+ if (ivtv_verbose)
+ printf (IVTV_MSG"YUV device not found: /dev/video%u\n", yuv_device);
+ }
+ } while (yuv_device-- > yuv_device_number);
+
+ return (ENXIO);
+
+ yuv_found:
+ probed = 1;
+ return 0;
+}
+
+static int ivtv_init (void)
+{
+ if (ivtv_verbose)
+ printf (IVTV_MSG"init\n");
+
+ if (!probed)
+ {
+ if (ivtv_verbose)
+ printf (IVTV_MSG"Driver was not probed but is being initialized\n");
+
+ return (EINTR);
+ }
+
+ outbuf = malloc ((IVTVMAXHEIGHT * IVTVMAXWIDTH)
+ + (IVTVMAXHEIGHT * IVTVMAXWIDTH / 2));
+
+ if (!outbuf)
+ {
+ if (ivtv_verbose)
+ printf (IVTV_MSG"Not enough memory availabe!\n");
+ return (EINTR);
+ }
+
+ return 0;
+}
+
+static void ivtv_destroy (void)
+{
+ if (ivtv_verbose)
+ printf (IVTV_MSG"destory\n");
+ close (yuvdev);
+ free (outbuf);
+}
+
+static int ivtv_get_caps (vidix_capability_t *to)
+{
+ if (ivtv_verbose)
+ printf (IVTV_MSG"GetCap\n");
+ memcpy (to, &ivtv_cap, sizeof (vidix_capability_t));
+
+ return 0;
+}
+
+static int ivtv_query_fourcc (vidix_fourcc_t *to)
+{
+ int supports = 0;
+
+ if (ivtv_verbose)
+ printf (IVTV_MSG"query fourcc (%x)\n", to->fourcc);
+
+ switch (to->fourcc)
+ {
+ case IMGFMT_YV12:
+ supports = 1;
+ break;
+ default:
+ supports = 0;
+ }
+
+ if (!supports)
+ {
+ to->depth = to->flags = 0;
+ return (ENOTSUP);
+ }
+
+ to->depth = VID_DEPTH_12BPP |
+ VID_DEPTH_15BPP | VID_DEPTH_16BPP |
+ VID_DEPTH_24BPP | VID_DEPTH_32BPP;
+ to->flags = 0;
+
+ return 0;
+}
+
+static int ivtv_config_playback (vidix_playback_t *info)
+{
+ if (ivtv_verbose)
+ printf (IVTV_MSG"config playback\n");
+
+ if (2 == ivtv_verbose)
+ {
+ printf (IVTV_MSG"src : x:%d y:%d w:%d h:%d\n",
+ info->src.x, info->src.y, info->src.w, info->src.h);
+ printf (IVTV_MSG"dest: x:%d y:%d w:%d h:%d\n",
+ info->dest.x, info->dest.y, info->dest.w, info->dest.h);
+ }
+
+ memcpy (&destVideo, &info->dest, sizeof (vidix_rect_t));
+ memcpy (&srcVideo, &info->src, sizeof (vidix_rect_t));
+
+ info->num_frames = 2;
+ info->frame_size = frameSize =
+ info->src.w*info->src.h+(info->src.w*info->src.h)/2;
+ info->dest.pitch.y = 16;
+ info->dest.pitch.u = info->dest.pitch.v = 16;
+ info->offsets[0] = 0;
+ info->offsets[1] = info->frame_size;
+ info->offset.y = 0;
+ info->offset.u = IVTVMAXWIDTH * IVTVMAXHEIGHT;
+ info->offset.v = IVTVMAXWIDTH * IVTVMAXHEIGHT
+ + (IVTVMAXWIDTH / 2) * (IVTVMAXHEIGHT / 2);
+
+ info->dga_addr = memBase = malloc (info->num_frames*info->frame_size);
+
+ if (ivtv_verbose)
+ printf (IVTV_MSG"frame_size: %d, dga_addr: %p\n",
+ info->frame_size, info->dga_addr);
+
+ return 0;
+}
+
+static int ivtv_playback_on (void)
+{
+ if (ivtv_verbose)
+ printf (IVTV_MSG"playback on\n");
+
+ return 0;
+}
+
+static int ivtv_playback_off (void)
+{
+ if (ivtv_verbose)
+ printf (IVTV_MSG"playback off\n");
+
+ return 0;
+}
+
+static int ivtv_frame_sel (unsigned int frame)
+{
+ struct ivtvyuv_ioctl_dma_host_to_ivtv_args args;
+
+ de_macro_y ((memBase + (frame * frameSize)),
+ outbuf, srcVideo.w, srcVideo.h,
+ srcVideo.x, srcVideo.y, destVideo.h, destVideo.w);
+
+ de_macro_uv ((memBase + (frame * frameSize))
+ + (srcVideo.w * srcVideo.h) + srcVideo.w * srcVideo.h / 4,
+ (memBase + (frame * frameSize)) + (srcVideo.w * srcVideo.h),
+ outbuf + IVTVMAXWIDTH * IVTVMAXHEIGHT,
+ srcVideo.w, srcVideo.h, srcVideo.x, srcVideo.y,
+ destVideo.h, destVideo.w);
+
+ args.y_source = outbuf;
+ args.uv_source = outbuf + (IVTVMAXWIDTH * IVTVMAXHEIGHT);
+ args.src_x = srcVideo.x;
+ args.src_y = srcVideo.y;
+ args.dst_x = destVideo.x;
+ args.dst_y = destVideo.y;
+ args.src_w = srcVideo.w;
+ args.dst_w = destVideo.w;
+ args.srcBuf_width = srcVideo.w;
+ args.src_h = srcVideo.h;
+ args.dst_h = destVideo.h;
+ args.srcBuf_height = srcVideo.h;
+ args.yuv_type = 0;
+
+ if(ioctl(yuvdev, IVTV_IOC_PREP_FRAME_YUV, &args) == -1)
+ printf ("Ioctl IVTV_IOC_PREP_FRAME_YUV returned failed Error\n");
+
+ return 0;
+}
+
+VDXDriver ivtv_drv = {
+ "ivtv",
+ NULL,
+ .probe = ivtv_probe,
+ .get_caps = ivtv_get_caps,
+ .query_fourcc = ivtv_query_fourcc,
+ .init = ivtv_init,
+ .destroy = ivtv_destroy,
+ .config_playback = ivtv_config_playback,
+ .playback_on = ivtv_playback_on,
+ .playback_off = ivtv_playback_off,
+ .frame_sel = ivtv_frame_sel,
+};
More information about the MPlayer-cvslog
mailing list