[MPlayer-cvslog] r26750 - in trunk/vidix: cyberblade_vid.c dha.c dha.h fourcc.h mach64.h mach64_vid.c mga_vid.c nvidia_vid.c radeon.h s3_vid.c sis_bridge.c sis_defs.h sis_regs.h sis_vid.c vidix.h vidixlib.c vidixlib.h
diego
subversion at mplayerhq.hu
Mon May 12 19:33:35 CEST 2008
Author: diego
Date: Mon May 12 19:33:35 2008
New Revision: 26750
Log:
consistency cosmetics: Move some parts of file headers around; typo fixes.
Modified:
trunk/vidix/cyberblade_vid.c
trunk/vidix/dha.c
trunk/vidix/dha.h
trunk/vidix/fourcc.h
trunk/vidix/mach64.h
trunk/vidix/mach64_vid.c
trunk/vidix/mga_vid.c
trunk/vidix/nvidia_vid.c
trunk/vidix/radeon.h
trunk/vidix/s3_vid.c
trunk/vidix/sis_bridge.c
trunk/vidix/sis_defs.h
trunk/vidix/sis_regs.h
trunk/vidix/sis_vid.c
trunk/vidix/vidix.h
trunk/vidix/vidixlib.c
trunk/vidix/vidixlib.h
Modified: trunk/vidix/cyberblade_vid.c
==============================================================================
--- trunk/vidix/cyberblade_vid.c (original)
+++ trunk/vidix/cyberblade_vid.c Mon May 12 19:33:35 2008
@@ -5,6 +5,8 @@
*
* Copyright (C) 2002 Alastair M. Robinson
* http://www.blackfiveservices.co.uk/EPIAVidix.shtml
+ * based on Permedia 3 driver by Måns Rullgård
+ * thanks to Gilles Frattini for bugfixes
*
* This file is part of MPlayer.
*
@@ -21,9 +23,6 @@
* 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
- *
- * Based on Permedia 3 driver by Måns Rullgård
- * Thanks to Gilles Frattini for bugfixes.
*/
/* To Do:
Modified: trunk/vidix/dha.c
==============================================================================
--- trunk/vidix/dha.c (original)
+++ trunk/vidix/dha.c Mon May 12 19:33:35 2008
@@ -2,6 +2,20 @@
* VIDIX Direct Hardware Access (DHA).
* Copyright (C) 2002 Nick Kurshev
*
+ * 1996/10/27 - Robin Cutshaw (robin at xfree86.org)
+ * XFree86 3.3.3 implementation
+ * 1999 - Øyvind Aabling.
+ * Modified for GATOS/win/gfxdump.
+ *
+ * 2002 - library implementation by Nick Kurshev
+ * - dhahelper and some changes by Alex Beregszaszi
+ *
+ * supported OSes: SVR4, UnixWare, SCO, Solaris,
+ * FreeBSD, NetBSD, 386BSD, BSDI BSD/386,
+ * Linux, Mach/386, ISC
+ * DOS (WATCOM 9.5 compiler), Win9x (with mapdev.vxd)
+ * original location: www.linuxvideo.org/gatos
+ *
* This file is part of MPlayer.
*
* MPlayer is free software; you can redistribute it and/or modify
@@ -17,20 +31,6 @@
* 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
- *
- * 1996/10/27 - Robin Cutshaw (robin at xfree86.org)
- * XFree86 3.3.3 implementation
- * 1999 - Øyvind Aabling.
- * Modified for GATOS/win/gfxdump.
- *
- * 2002 - library implementation by Nick Kurshev
- * - dhahelper and some changes by Alex Beregszaszi
- *
- * Supported O/S's: SVR4, UnixWare, SCO, Solaris,
- * FreeBSD, NetBSD, 386BSD, BSDI BSD/386,
- * Linux, Mach/386, ISC
- * DOS (WATCOM 9.5 compiler), Win9x (with mapdev.vxd)
- * Original location: www.linuxvideo.org/gatos
*/
#include "config.h"
Modified: trunk/vidix/dha.h
==============================================================================
--- trunk/vidix/dha.h (original)
+++ trunk/vidix/dha.h Mon May 12 19:33:35 2008
@@ -2,6 +2,20 @@
* VIDIX Direct Hardware Access (DHA).
* Copyright (C) 2002 Nick Kurshev
*
+ * 1996/10/27 - Robin Cutshaw (robin at xfree86.org)
+ * XFree86 3.3.3 implementation
+ * 1999 - Øyvind Aabling.
+ * Modified for GATOS/win/gfxdump.
+ *
+ * 2002 - library implementation by Nick Kurshev
+ * - dhahelper and some changes by Alex Beregszaszi
+ *
+ * supported OSes: SVR4, UnixWare, SCO, Solaris,
+ * FreeBSD, NetBSD, 386BSD, BSDI BSD/386,
+ * Linux, Mach/386, ISC
+ * DOS (WATCOM 9.5 compiler), Win9x (with mapdev.vxd)
+ * original location: www.linuxvideo.org/gatos
+ *
* This file is part of MPlayer.
*
* MPlayer is free software; you can redistribute it and/or modify
@@ -17,20 +31,6 @@
* 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
- *
- * 1996/10/27 - Robin Cutshaw (robin at xfree86.org)
- * XFree86 3.3.3 implementation
- * 1999 - Øyvind Aabling.
- * Modified for GATOS/win/gfxdump.
- *
- * 2002 - library implementation by Nick Kurshev
- * - dhahelper and some changes by Alex Beregszaszi
- *
- * Supported O/S's: SVR4, UnixWare, SCO, Solaris,
- * FreeBSD, NetBSD, 386BSD, BSDI BSD/386,
- * Linux, Mach/386, ISC
- * DOS (WATCOM 9.5 compiler), Win9x (with mapdev.vxd)
- * Original location: www.linuxvideo.org/gatos
*/
#ifndef MPLAYER_DHA_H
Modified: trunk/vidix/fourcc.h
==============================================================================
--- trunk/vidix/fourcc.h (original)
+++ trunk/vidix/fourcc.h Mon May 12 19:33:35 2008
@@ -1,5 +1,9 @@
/*
* VIDIX FourCC.
+ *
+ * This interface is based on v4l2, fbvid.h, mga_vid.h projects
+ * and personally my ideas.
+ *
* Copyright (C) 2002 Nick Kurshev
*
* This file is part of MPlayer.
@@ -17,9 +21,6 @@
* 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 interface is based on v4l2, fbvid.h, mga_vid.h projects
- * and personally my ideas.
*/
#ifndef MPLAYER_FOURCC_H
Modified: trunk/vidix/mach64.h
==============================================================================
--- trunk/vidix/mach64.h (original)
+++ trunk/vidix/mach64.h Mon May 12 19:33:35 2008
@@ -1,6 +1,9 @@
/*
* VIDIX driver for ATI Mach64 and 3DRage chipsets.
+ *
* Copyright (C) 2002 Nick Kurshev
+ * This file is based on sources from
+ * radeonfb, GATOS (gatos.sf.net) and X11 (www.xfree86.org)
*
* This file is part of MPlayer.
*
@@ -17,9 +20,6 @@
* 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 file is based on sources from
- * radeonfb, GATOS (gatos.sf.net) and X11 (www.xfree86.org)
*/
#ifndef MPLAYER_MACH64_H
Modified: trunk/vidix/mach64_vid.c
==============================================================================
--- trunk/vidix/mach64_vid.c (original)
+++ trunk/vidix/mach64_vid.c Mon May 12 19:33:35 2008
@@ -1,6 +1,9 @@
/*
* VIDIX driver for ATI Mach64 and 3DRage chipsets.
+ *
* Copyright (C) 2002 Nick Kurshev
+ * This file is based on sources from
+ * GATOS (gatos.sf.net) and X11 (www.xfree86.org)
*
* This file is part of MPlayer.
*
@@ -17,9 +20,6 @@
* 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 file is based on sources from
- * GATOS (gatos.sf.net) and X11 (www.xfree86.org)
*/
#include <errno.h>
Modified: trunk/vidix/mga_vid.c
==============================================================================
--- trunk/vidix/mga_vid.c (original)
+++ trunk/vidix/mga_vid.c Mon May 12 19:33:35 2008
@@ -1,6 +1,12 @@
/*
* VIDIX driver for Matrox chipsets.
+ *
* Copyright (C) 2002 Alex Beregszaszi
+ * Original sources from Aaron Holtzman (C) 1999.
+ * module skeleton based on gutted agpgart module by Jeff Hartmann
+ * <slicer at ionet.net>
+ * YUY2 support and double buffering added by A'rpi/ESP-team
+ * brightness/contrast support by Nick Kurshev/Dariush Pietrzak (eyck)
*
* This file is part of MPlayer.
*
@@ -17,15 +23,9 @@
* 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
- *
- * Original sources from Aaron Holtzman (C) 1999.
- * Module skeleton based on gutted agpgart module by Jeff Hartmann
- * <slicer at ionet.net>
- * YUY2 support added by A'rpi/ESP-team
- double buffering added by A'rpi/ESP-team
- * Brightness/contrast support by Nick Kurshev/Dariush Pietrzak (eyck)
- *
- * TODO:
+ */
+
+/* TODO:
* - fix memory size detection (current reading pci userconfig isn't
* working as requested - returns the max avail. ram on arch?)
* - translate all non-english comments to english
Modified: trunk/vidix/nvidia_vid.c
==============================================================================
--- trunk/vidix/nvidia_vid.c (original)
+++ trunk/vidix/nvidia_vid.c Mon May 12 19:33:35 2008
@@ -1,6 +1,9 @@
/*
* VIDIX driver for nVidia chipsets.
+ *
* Copyright (C) 2003-2004 Sascha Sommer
+ * This file is based on sources from RIVATV (rivatv.sf.net)
+ * Multi buffer support and TNT2 fixes by Dmitry Baryshkov.
*
* This file is part of MPlayer.
*
@@ -17,9 +20,6 @@
* 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 file is based on sources from RIVATV (rivatv.sf.net)
- * Multi buffer support and TNT2 fixes by Dmitry Baryshkov.
*/
#include <errno.h>
Modified: trunk/vidix/radeon.h
==============================================================================
--- trunk/vidix/radeon.h (original)
+++ trunk/vidix/radeon.h Mon May 12 19:33:35 2008
@@ -1,5 +1,9 @@
/*
* VIDIX driver for ATI Rage128 and Radeon chipsets.
+ *
+ * This file is based on radeonfb, X11, GATOS sources
+ * and partly compatible with Rage128 set (in OV0, CAP0, CAP1 parts)
+ *
* Copyright (C) 2002 Nick Kurshev
*
* This file is part of MPlayer.
@@ -17,9 +21,6 @@
* 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 file is based on radeonfb, X11, GATOS sources
- * and partly compatible with Rage128 set (in OV0, CAP0, CAP1 parts)
*/
#ifndef MPLAYER_RADEON_H
Modified: trunk/vidix/s3_vid.c
==============================================================================
--- trunk/vidix/s3_vid.c (original)
+++ trunk/vidix/s3_vid.c Mon May 12 19:33:35 2008
@@ -1,6 +1,9 @@
/*
* VIDIX driver for S3 chipsets.
+ *
* Copyright (C) 2004 Reza Jelveh
+ * Thanks to Alex Deucher for Support
+ * Trio/Virge support by Michael Kostylev
*
* This file is part of MPlayer.
*
@@ -17,11 +20,6 @@
* 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
- *
- * Thanks to Alex Deucher for Support
- *
- * Trio/Virge support by Michael Kostylev
- *
*/
#include <errno.h>
Modified: trunk/vidix/sis_bridge.c
==============================================================================
--- trunk/vidix/sis_bridge.c (original)
+++ trunk/vidix/sis_bridge.c Mon May 12 19:33:35 2008
@@ -1,7 +1,10 @@
/*
* VIDIX driver for SiS chipsets.
* Video bridge detection for SiS 300 and 310/325 series.
+ *
* Copyright (C) 2003 Jake Page, Sugar Media.
+ * Based on SiS Xv driver
+ * Copyright 2002-2003 by Thomas Winischhofer, Vienna, Austria.
*
* This file is part of MPlayer.
*
@@ -18,9 +21,6 @@
* 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
- *
- * Based on SiS Xv driver
- * Copyright 2002-2003 by Thomas Winischhofer, Vienna, Austria.
*/
#include <stdio.h>
Modified: trunk/vidix/sis_defs.h
==============================================================================
--- trunk/vidix/sis_defs.h (original)
+++ trunk/vidix/sis_defs.h Mon May 12 19:33:35 2008
@@ -1,8 +1,8 @@
/*
- * SiS graphics misc definitions
+ * SiS graphics misc definitions
*
- * Taken from SiS Xv driver:
- * Copyright (C) 2002-2003 by Thomas Winischhofer, Vienna, Austria
+ * Taken from SiS Xv driver:
+ * Copyright (C) 2002-2003 by Thomas Winischhofer, Vienna, Austria
*
* This file is part of MPlayer.
*
Modified: trunk/vidix/sis_regs.h
==============================================================================
--- trunk/vidix/sis_regs.h (original)
+++ trunk/vidix/sis_regs.h Mon May 12 19:33:35 2008
@@ -1,8 +1,8 @@
/*
- * SiS register definitions and access macros
- * From SiS X11 driver
+ * SiS register definitions and access macros
+ * From SiS X11 driver
*
- * Copyright (C) 2001-2003 by Thomas Winischhofer, Vienna, Austria
+ * Copyright (C) 2001-2003 by Thomas Winischhofer, Vienna, Austria
*
* This file is part of MPlayer.
*
Modified: trunk/vidix/sis_vid.c
==============================================================================
--- trunk/vidix/sis_vid.c (original)
+++ trunk/vidix/sis_vid.c Mon May 12 19:33:35 2008
@@ -1,6 +1,10 @@
/*
* VIDIX driver for SiS chipsets.
+ * Based on SiS Xv driver
+ *
* Copyright (C) 2003 Jake Page, Sugar Media.
+ * Copyright 2002-2003 by Thomas Winischhofer, Vienna, Austria.
+ * 2003/10/08 integrated into mplayer/vidix architecture -- Alex Beregszaszi
*
* This file is part of MPlayer.
*
@@ -17,10 +21,6 @@
* 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
- *
- * Based on SiS Xv driver
- * Copyright 2002-2003 by Thomas Winischhofer, Vienna, Austria.
- * 2003/10/08 integrated into mplayer/vidix architecture -- Alex Beregszaszi
*/
#include <errno.h>
Modified: trunk/vidix/vidix.h
==============================================================================
--- trunk/vidix/vidix.h (original)
+++ trunk/vidix/vidix.h Mon May 12 19:33:35 2008
@@ -1,5 +1,18 @@
/*
* VIDIX - VIDeo Interface for *niX.
+ *
+ * This interface is introduced as universal one to MPEG decoder,
+ * Back End Scaler (BES) and YUV2RGB hw accelerators.
+ *
+ * In the future it may be expanded up to capturing and audio things.
+ * Main goal of this this interface imlpementation is providing DGA
+ * everywhere where it's possible (unlike X11 and other).
+ *
+ * This interface is based on v4l2, fbvid.h, mga_vid.h projects
+ * and my personal ideas.
+ *
+ * NOTE: This interface is introduced as driver interface.
+ *
* Copyright (C) 2002 Nick Kurshev
* Copyright (C) 2007 Benjamin Zores <ben at geexbox.org>
*
@@ -18,18 +31,6 @@
* 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 interface is introduced as universal one to MPEG decoder,
- * Back End Scaler (BES) and YUV2RGB hw accelerators.
- *
- * In the future it may be expanded up to capturing and audio things.
- * Main goal of this this interface imlpementation is providing DGA
- * everywhere where it's possible (unlike X11 and other).
- *
- * This interface is based on v4l2, fbvid.h, mga_vid.h projects
- * and personally my ideas.
- *
- * NOTE: This interface is introduces as driver interface.
*/
#ifndef MPLAYER_VIDIX_H
Modified: trunk/vidix/vidixlib.c
==============================================================================
--- trunk/vidix/vidixlib.c (original)
+++ trunk/vidix/vidixlib.c Mon May 12 19:33:35 2008
@@ -1,5 +1,18 @@
/*
* VIDIX - VIDeo Interface for *niX.
+ *
+ * This interface is introduced as universal one to MPEG decoder,
+ * Back End Scaler (BES) and YUV2RGB hw accelerators.
+ *
+ * In the future it may be expanded up to capturing and audio things.
+ * Main goal of this this interface imlpementation is providing DGA
+ * everywhere where it's possible (unlike X11 and other).
+ *
+ * This interface is based on v4l2, fbvid.h, mga_vid.h projects
+ * and personally my ideas.
+ *
+ * NOTE: This interface is introduced as driver interface.
+ *
* Copyright (C) 2002 Nick Kurshev
* Copyright (C) 2007 Benjamin Zores <ben at geexbox.org>
*
@@ -18,18 +31,6 @@
* 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 interface is introduced as universal one to MPEG decoder,
- * Back End Scaler (BES) and YUV2RGB hw accelerators.
- *
- * In the future it may be expanded up to capturing and audio things.
- * Main goal of this this interface imlpementation is providing DGA
- * everywhere where it's possible (unlike X11 and other).
- *
- * This interface is based on v4l2, fbvid.h, mga_vid.h projects
- * and personally my ideas.
- *
- * NOTE: This interface is introduces as driver interface.
*/
#include <stdlib.h>
Modified: trunk/vidix/vidixlib.h
==============================================================================
--- trunk/vidix/vidixlib.h (original)
+++ trunk/vidix/vidixlib.h Mon May 12 19:33:35 2008
@@ -1,5 +1,18 @@
/*
* VIDIX - VIDeo Interface for *niX.
+ *
+ * This interface is introduced as universal one to MPEG decoder,
+ * Back End Scaler (BES) and YUV2RGB hw accelerators.
+ *
+ * In the future it may be expanded up to capturing and audio things.
+ * Main goal of this this interface imlpementation is providing DGA
+ * everywhere where it's possible (unlike X11 and other).
+ *
+ * This interface is based on v4l2, fbvid.h, mga_vid.h projects
+ * and personally my ideas.
+ *
+ * NOTE: This interface is introduced as driver interface.
+ *
* Copyright (C) 2002 Nick Kurshev
* Copyright (C) 2007 Benjamin Zores <ben at geexbox.org>
*
@@ -18,18 +31,6 @@
* 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 interface is introduced as universal one to MPEG decoder,
- * Back End Scaler (BES) and YUV2RGB hw accelerators.
- *
- * In the future it may be expanded up to capturing and audio things.
- * Main goal of this this interface imlpementation is providing DGA
- * everywhere where it's possible (unlike X11 and other).
- *
- * This interface is based on v4l2, fbvid.h, mga_vid.h projects
- * and personally my ideas.
- *
- * NOTE: This interface is introduces as driver interface.
*/
#ifndef MPLAYER_VIDIXLIB_H
More information about the MPlayer-cvslog
mailing list