diff options
author | nick <nick@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-01-16 08:33:17 +0000 |
---|---|---|
committer | nick <nick@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-01-16 08:33:17 +0000 |
commit | 95c92270391e5cbcaccf126e81fadf1cb248e854 (patch) | |
tree | 46e6dca3577387414764a831dce9cc002fc374d8 /vidix/drivers | |
parent | b8bbbc2fba4359733f49f8fb910a28b74d4c0edf (diff) |
+ new features and possibility
deinterlacing
oem effects
ITU color space
forcing driver
- audio support (develop and introduce AUDIX for that)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4192 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'vidix/drivers')
-rw-r--r-- | vidix/drivers/genfb_vid.c | 12 | ||||
-rw-r--r-- | vidix/drivers/mga_vid.c | 7 | ||||
-rw-r--r-- | vidix/drivers/nvidia_vid.c | 11 | ||||
-rw-r--r-- | vidix/drivers/radeon_vid.c | 25 |
4 files changed, 26 insertions, 29 deletions
diff --git a/vidix/drivers/genfb_vid.c b/vidix/drivers/genfb_vid.c index aa26e8be52..9612021238 100644 --- a/vidix/drivers/genfb_vid.c +++ b/vidix/drivers/genfb_vid.c @@ -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 @@ static vidix_capability_t genfb_cap = { "General Framebuffer", TYPE_OUTPUT, - 0, - 1, - 0, - 0, + { 0, 0, 0, 0 }, 1024, 768, 4, @@ -46,9 +45,12 @@ unsigned int vixGetVersion(void) 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"); diff --git a/vidix/drivers/mga_vid.c b/vidix/drivers/mga_vid.c index f071647bdd..f4e02f43b4 100644 --- a/vidix/drivers/mga_vid.c +++ b/vidix/drivers/mga_vid.c @@ -219,10 +219,7 @@ static vidix_capability_t mga_cap = { "Matrox MGA G200/G400 YUV Video", TYPE_OUTPUT, - 0, - 1, - 0, - 0, + { 0, 0, 0, 0 }, 1024, 768, 4, @@ -1636,7 +1633,7 @@ static int mga_vid_release(/*struct inode *inode, struct file *file*/) return 0; } -int vixProbe(int verbose) +int vixProbe(int verbose,int force) { pciinfo_t lst[MAX_PCI_DEVICES]; unsigned int i, num_pci; diff --git a/vidix/drivers/nvidia_vid.c b/vidix/drivers/nvidia_vid.c index 76382fe162..9e4b9d8231 100644 --- a/vidix/drivers/nvidia_vid.c +++ b/vidix/drivers/nvidia_vid.c @@ -24,7 +24,7 @@ static uint32_t ram_size = 0; 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 @@ static const struct nv_card_id_s nv_card_ids[]= { { 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 @@ static vidix_capability_t nvidia_cap = { "NVIDIA driver for VIDIX", TYPE_OUTPUT, - 0, - 1, - 0, - 0, + { 0, 0, 0, 0 }, 1024, 768, 4, @@ -75,7 +72,7 @@ unsigned int vixGetVersion(void) return(VIDIX_VERSION); } -int vixProbe(int verbose) +int vixProbe(int verbose,int force) { pciinfo_t lst[MAX_PCI_DEVICES]; unsigned int i, num_pci; diff --git a/vidix/drivers/radeon_vid.c b/vidix/drivers/radeon_vid.c index d7b1394c9e..d5332c59d1 100644 --- a/vidix/drivers/radeon_vid.c +++ b/vidix/drivers/radeon_vid.c @@ -596,10 +596,7 @@ vidix_capability_t def_cap = "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 @@ vidix_capability_t def_cap = }; -int vixProbe( int verbose ) +int vixProbe( int verbose,int force ) { pciinfo_t lst[MAX_PCI_DEVICES]; unsigned i,num_pci; @@ -632,15 +629,19 @@ int vixProbe( int verbose ) 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 @@ int vixPlaybackFrameSelect(unsigned frame) 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) { |