[Mplayer-cvslog] CVS: main/vidix/drivers radeon_vid.c,1.12,1.13 genfb_vid.c,1.1,1.2 mga_vid.c,1.3,1.4 nvidia_vid.c,1.2,1.3

[Nick Kurshev]

Update of /cvsroot/mplayer/main/vidix/drivers
In directory mplayer:/var/tmp.root/cvs-serv21493/main/vidix/drivers

Modified Files:
	radeon_vid.c genfb_vid.c mga_vid.c nvidia_vid.c 
Log Message:
+ new features and possibility
  deinterlacing
  oem effects
  ITU color space
  forcing driver
- audio support (develop and introduce AUDIX for that)


Index: radeon_vid.c
===================================================================
RCS file: /cvsroot/mplayer/main/vidix/drivers/radeon_vid.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- radeon_vid.c	13 Jan 2002 10:47:11 -0000	1.12
+++ radeon_vid.c	16 Jan 2002 08:33:17 -0000	1.13
@@ -596,10 +596,7 @@
     "BES driver for radeon cards",
 #endif
     TYPE_OUTPUT | TYPE_FX,
-    0,
-    1,
-    0,
-    0,
+    { 0, 0, 0, 0 },
     1024,
     768,
     4,
@@ -612,7 +609,7 @@
 };
 
 
-int vixProbe( int verbose )
+int vixProbe( int verbose,int force )
 {
   pciinfo_t lst[MAX_PCI_DEVICES];
   unsigned i,num_pci;
@@ -632,15 +629,19 @@
       if(lst[i].vendor == VENDOR_ATI)
       {
         int idx;
+	const char *dname;
 	idx = find_chip(lst[i].device);
-	if(idx == -1) continue;
-	printf(RADEON_MSG" Found chip: %s\n",pci_device_name(VENDOR_ATI,ati_card_ids[idx]));
+	if(idx == -1 && force == PROBE_NORMAL) continue;
+	dname = pci_device_name(VENDOR_ATI,lst[i].device);
+	dname = dname ? dname : "Unknown chip";
+	printf(RADEON_MSG" Found chip: %s\n",dname);
 #ifndef RAGE128	
-	if(ati_card_ids[idx] == DEVICE_ATI_RADEON_QL || 
-	   ati_card_ids[idx] == DEVICE_ATI_RADEON_8500_DV || 
-	   ati_card_ids[idx] == DEVICE_ATI_RADEON_QW) IsR200 = 1;
+	if(idx != -1)
+	    if(ati_card_ids[idx] == DEVICE_ATI_RADEON_QL || 
+		ati_card_ids[idx] == DEVICE_ATI_RADEON_8500_DV || 
+		ati_card_ids[idx] == DEVICE_ATI_RADEON_QW) IsR200 = 1;
 #endif
-	def_cap.device_id = ati_card_ids[idx];
+	def_cap.device_id = lst[i].device;
 	err = 0;
 	memcpy(&pci_info,&lst[i],sizeof(pciinfo_t));
 	probed=1;
@@ -1049,7 +1050,7 @@
     return 0;
 }
 
-vidix_video_eq_t equal = { 0, 0, 0, 0, 0, 0, 0 };
+vidix_video_eq_t equal = { 0, 0, 0, 0, 0, 0, 0, 0 };
 
 int 	vixPlaybackGetEq( vidix_video_eq_t * eq)
 {

Index: genfb_vid.c
===================================================================
RCS file: /cvsroot/mplayer/main/vidix/drivers/genfb_vid.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- genfb_vid.c	13 Jan 2002 00:26:46 -0000	1.1
+++ genfb_vid.c	16 Jan 2002 08:33:17 -0000	1.2
@@ -11,6 +11,8 @@
 #include "../../libdha/libdha.h"
 #include "../../libdha/pci_ids.h"
 
+#define DEMO_DRIVER 1
+
 static int fd;
 
 static void *mmio_base = 0;
@@ -26,10 +28,7 @@
 {
     "General Framebuffer",
     TYPE_OUTPUT,
-    0,
-    1,
-    0,
-    0,
+    { 0, 0, 0, 0 },
     1024,
     768,
     4,
@@ -46,9 +45,12 @@
     return(VIDIX_VERSION);
 }
 
-int vixProbe(int verbose)
+int vixProbe(int verbose,int force)
 {
     int err = 0;
+#ifdef DEMO_DRIVER
+    err = ENOSYS;
+#endif
     
     printf("[genfb] probe\n");
 

Index: mga_vid.c
===================================================================
RCS file: /cvsroot/mplayer/main/vidix/drivers/mga_vid.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mga_vid.c	15 Jan 2002 01:16:14 -0000	1.3
+++ mga_vid.c	16 Jan 2002 08:33:17 -0000	1.4
@@ -219,10 +219,7 @@
 {
     "Matrox MGA G200/G400 YUV Video",
     TYPE_OUTPUT,
-    0,
-    1,
-    0,
-    0,
+    { 0, 0, 0, 0 },
     1024,
     768,
     4,
@@ -1636,7 +1633,7 @@
 	return 0;
 }
 
-int vixProbe(int verbose)
+int vixProbe(int verbose,int force)
 {
 	pciinfo_t lst[MAX_PCI_DEVICES];
 	unsigned int i, num_pci;

Index: nvidia_vid.c
===================================================================
RCS file: /cvsroot/mplayer/main/vidix/drivers/nvidia_vid.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nvidia_vid.c	15 Jan 2002 16:35:17 -0000	1.2
+++ nvidia_vid.c	16 Jan 2002 08:33:17 -0000	1.3
@@ -24,7 +24,7 @@
 struct nv_card_id_s
 {
     const unsigned int id ;
-    const char name[17];
+    const char name[32];
     const int core;
     const int flags;
 };
@@ -33,7 +33,7 @@
 {
     { DEVICE_NVIDIA_RIVA_TNT2_NV5, "nVidia TNT2 (NV5) ", 5, CARD_FLAGS_NOTSUPPORTED},
     { DEVICE_NVIDIA_VANTA_NV6, "nVidia Vanta (NV6.1)", 6, CARD_FLAGS_NOTSUPPORTED},
-    { DEVICE_NVIDIA_VANTA_NV62, "nVidia Vanta (NV6.2)", 6, CARD_FLAGS_NOTSUPPORTED},
+    { DEVICE_NVIDIA_VANTA_NV62, "nVidia Vanta (NV6.2)", 6, CARD_FLAGS_NOTSUPPORTED}
 };
 
 static int find_chip(unsigned int chip_id)
@@ -55,10 +55,7 @@
 {
     "NVIDIA driver for VIDIX",
     TYPE_OUTPUT,
-    0,
-    1,
-    0,
-    0,
+    { 0, 0, 0, 0 },
     1024,
     768,
     4,
@@ -75,7 +72,7 @@
     return(VIDIX_VERSION);
 }
 
-int vixProbe(int verbose)
+int vixProbe(int verbose,int force)
 {
     pciinfo_t lst[MAX_PCI_DEVICES];
     unsigned int i, num_pci;