Mercurial > mplayer.hg

changeset 26718:051b2632f121

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
consistency cosmetics: Move some parts of file headers around; typo fixes.
author diego
date Mon, 12 May 2008 17:33:35 +0000
parents 2da37a9a0c25
children 3abd1629658b
files vidix/cyberblade_vid.c vidix/dha.c vidix/dha.h vidix/fourcc.h vidix/mach64.h vidix/mach64_vid.c vidix/mga_vid.c vidix/nvidia_vid.c vidix/radeon.h vidix/s3_vid.c vidix/sis_bridge.c vidix/sis_defs.h vidix/sis_regs.h vidix/sis_vid.c vidix/vidix.h vidix/vidixlib.c vidix/vidixlib.h
diffstat 17 files changed, 111 insertions(+), 109 deletions(-) [+]
line wrap: on
line diff
--- a/vidix/cyberblade_vid.c	Mon May 12 15:02:10 2008 +0000
+++ b/vidix/cyberblade_vid.c	Mon May 12 17:33:35 2008 +0000
@@ -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:
--- a/vidix/dha.c	Mon May 12 15:02:10 2008 +0000
+++ b/vidix/dha.c	Mon May 12 17:33:35 2008 +0000
@@ -2,6 +2,20 @@
  * VIDIX Direct Hardware Access (DHA).
  * Copyright (C) 2002 Nick Kurshev
  *
+ * 1996/10/27   - Robin Cutshaw (robin@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@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"
--- a/vidix/dha.h	Mon May 12 15:02:10 2008 +0000
+++ b/vidix/dha.h	Mon May 12 17:33:35 2008 +0000
@@ -2,6 +2,20 @@
  * VIDIX Direct Hardware Access (DHA).
  * Copyright (C) 2002 Nick Kurshev
  *
+ * 1996/10/27   - Robin Cutshaw (robin@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@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
--- a/vidix/fourcc.h	Mon May 12 15:02:10 2008 +0000
+++ b/vidix/fourcc.h	Mon May 12 17:33:35 2008 +0000
@@ -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
--- a/vidix/mach64.h	Mon May 12 15:02:10 2008 +0000
+++ b/vidix/mach64.h	Mon May 12 17:33:35 2008 +0000
@@ -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
--- a/vidix/mach64_vid.c	Mon May 12 15:02:10 2008 +0000
+++ b/vidix/mach64_vid.c	Mon May 12 17:33:35 2008 +0000
@@ -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>
--- a/vidix/mga_vid.c	Mon May 12 15:02:10 2008 +0000
+++ b/vidix/mga_vid.c	Mon May 12 17:33:35 2008 +0000
@@ -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@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@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
--- a/vidix/nvidia_vid.c	Mon May 12 15:02:10 2008 +0000
+++ b/vidix/nvidia_vid.c	Mon May 12 17:33:35 2008 +0000
@@ -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>
--- a/vidix/radeon.h	Mon May 12 15:02:10 2008 +0000
+++ b/vidix/radeon.h	Mon May 12 17:33:35 2008 +0000
@@ -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
--- a/vidix/s3_vid.c	Mon May 12 15:02:10 2008 +0000
+++ b/vidix/s3_vid.c	Mon May 12 17:33:35 2008 +0000
@@ -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>
--- a/vidix/sis_bridge.c	Mon May 12 15:02:10 2008 +0000
+++ b/vidix/sis_bridge.c	Mon May 12 17:33:35 2008 +0000
@@ -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>
--- a/vidix/sis_defs.h	Mon May 12 15:02:10 2008 +0000
+++ b/vidix/sis_defs.h	Mon May 12 17:33:35 2008 +0000
@@ -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.
  *
--- a/vidix/sis_regs.h	Mon May 12 15:02:10 2008 +0000
+++ b/vidix/sis_regs.h	Mon May 12 17:33:35 2008 +0000
@@ -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.
  *
--- a/vidix/sis_vid.c	Mon May 12 15:02:10 2008 +0000
+++ b/vidix/sis_vid.c	Mon May 12 17:33:35 2008 +0000
@@ -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>
--- a/vidix/vidix.h	Mon May 12 15:02:10 2008 +0000
+++ b/vidix/vidix.h	Mon May 12 17:33:35 2008 +0000
@@ -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@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
--- a/vidix/vidixlib.c	Mon May 12 15:02:10 2008 +0000
+++ b/vidix/vidixlib.c	Mon May 12 17:33:35 2008 +0000
@@ -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@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>
--- a/vidix/vidixlib.h	Mon May 12 15:02:10 2008 +0000
+++ b/vidix/vidixlib.h	Mon May 12 17:33:35 2008 +0000
@@ -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@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