diff options
-rw-r--r-- | DOCS/man/cs/mplayer.1 | 6 | ||||
-rw-r--r-- | DOCS/man/de/mplayer.1 | 7 | ||||
-rw-r--r-- | DOCS/man/en/mplayer.1 | 7 | ||||
-rw-r--r-- | DOCS/man/es/mplayer.1 | 7 | ||||
-rw-r--r-- | DOCS/man/fr/mplayer.1 | 7 | ||||
-rw-r--r-- | DOCS/man/hu/mplayer.1 | 7 | ||||
-rw-r--r-- | DOCS/man/it/mplayer.1 | 7 | ||||
-rw-r--r-- | DOCS/man/pl/mplayer.1 | 7 | ||||
-rw-r--r-- | DOCS/man/ru/mplayer.1 | 7 | ||||
-rw-r--r-- | DOCS/man/zh/mplayer.1 | 5 | ||||
-rwxr-xr-x | configure | 13 | ||||
-rw-r--r-- | help/help_mp-cs.h | 13 | ||||
-rw-r--r-- | help/help_mp-de.h | 13 | ||||
-rw-r--r-- | help/help_mp-en.h | 13 | ||||
-rw-r--r-- | help/help_mp-es.h | 13 | ||||
-rw-r--r-- | help/help_mp-fr.h | 13 | ||||
-rw-r--r-- | help/help_mp-hu.h | 13 | ||||
-rw-r--r-- | help/help_mp-it.h | 13 | ||||
-rw-r--r-- | help/help_mp-pl.h | 13 | ||||
-rw-r--r-- | help/help_mp-ru.h | 13 | ||||
-rw-r--r-- | help/help_mp-tr.h | 13 | ||||
-rw-r--r-- | help/help_mp-zh_CN.h | 13 | ||||
-rw-r--r-- | help/help_mp-zh_TW.h | 13 | ||||
-rw-r--r-- | libvo/video_out.c | 4 | ||||
-rw-r--r-- | libvo/vo_syncfb.c | 464 |
25 files changed, 0 insertions, 704 deletions
diff --git a/DOCS/man/cs/mplayer.1 b/DOCS/man/cs/mplayer.1 index d29a75e460..279f670628 100644 --- a/DOCS/man/cs/mplayer.1 +++ b/DOCS/man/cs/mplayer.1 @@ -3643,12 +3643,6 @@ Explicitně vybere jméno zařízení pro matrox k použití (výchozí: /dev/\: .PD 1 . .TP -.B "syncfb\ " -Video výstupní rozhraní jaderného modulu SyncFB, který zpřístupňuje speciální -hardwarové vlastnosti karet Matrox Gxxx jako je hardwarové odstranění prokladu, -škálování a synchronizace video výstupu s vertikálním kmitočtem monitoru. -. -.TP .B s3fb (pouze Linux) (viz také \-vf yuv2 a \-dr) Výstupní video rozhraní výslovně určené pro S3 Virge. Toto rozhraní podporuje následující vlastnosti karty: YUV konverze a škálování, diff --git a/DOCS/man/de/mplayer.1 b/DOCS/man/de/mplayer.1 index 9eceacf6cf..243658a1e6 100644 --- a/DOCS/man/de/mplayer.1 +++ b/DOCS/man/de/mplayer.1 @@ -3844,13 +3844,6 @@ Whlt das zu benutzende Matrox-Gert explizit (Standard: /dev/\:mga_vid). .PD 1 . .TP -.B "syncfb\ " -Videoausgabetreiber fr das SyncFB-Kernelmodul, das spezielle -Hardwareeigenschaften von Matrox Gxxx-Karten bereitstellt, wie -Hardware-Deinterlacing, Skalierung und Synchronisation der Videoausgabe fr -das vertikale Retrace auf dem Monitor. -. -.TP .B s3fb (nur bei Linux) (siehe auch \-vf yuv2 und \-dr) S3 Virge-spezifischer Videoausgabetreiber. Dieser Treiber untersttzt die YUV-Konvertierung und -skalierung der Karte, diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index 64833e1778..c711e045e7 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -3660,13 +3660,6 @@ Explicitly choose the Matrox device name to use (default: /dev/\:mga_vid). .PD 1 . .TP -.B "syncfb\ " -Video output driver for the SyncFB kernel module, which provides -special hardware features of Matrox Gxxx cards like hardware -deinterlacing, scaling and synchronizing your video output to -the vertical retrace of your monitor. -. -.TP .B s3fb (Linux only) (see also \-vf yuv2 and \-dr) S3 Virge specific video output driver. This driver supports the card's YUV conversion and scaling, double diff --git a/DOCS/man/es/mplayer.1 b/DOCS/man/es/mplayer.1 index d2c42d2002..538d93a625 100644 --- a/DOCS/man/es/mplayer.1 +++ b/DOCS/man/es/mplayer.1 @@ -3637,13 +3637,6 @@ Especifica el nombre de dispositivo Matrox que se usar (por defecto: .PD 1 . .TP -.B "syncfb\ " -Controlador de salida de vdeo para el mdulo del kernel SyncFB, que provee -caractersticas de hardware especiales para las tarjetas Matrox Gxxx como -desentrelazado por hardware, escalado y sincronizacin de la salida de vdeo -con el refresco vertical de su monitor. -. -.TP .B s3fb (solamente Linux) (vea tambin \-vf yuv2 y \-dr) Controlador de salida de vdeo especfico para S3 Virge. Este controlador soporta las caractersticas de conversin y escalado YUV de diff --git a/DOCS/man/fr/mplayer.1 b/DOCS/man/fr/mplayer.1 index 9e6f753f59..3a561ffc76 100644 --- a/DOCS/man/fr/mplayer.1 +++ b/DOCS/man/fr/mplayer.1 @@ -3904,13 +3904,6 @@ Choisit explicitement le priphrique Matrox utiliser (par defaut\ : .PD 1 . .TP -.B "syncfb\ " -Pilote de sortie vido du module noyau SyncFB, qui permet de grer -les capacits matrielles des cartes Matrox Gxxx comme le dsentrelacement -matriel, ou le redimensionnement et la synchronisation de votre sortie vido -avec la frquence de rafraichissement verticale de votre moniteur. -. -.TP .B s3fb (Linux uniquement) (voir aussi \-vf yuv2 et \-dr) Pilote de sortie vido spcifique aux cartes S3 Virge. Ce pilote supporte les fonctionnalits de conversion YUV, mise l'chelle, diff --git a/DOCS/man/hu/mplayer.1 b/DOCS/man/hu/mplayer.1 index e385706718..8d4e1488bc 100644 --- a/DOCS/man/hu/mplayer.1 +++ b/DOCS/man/hu/mplayer.1 @@ -3693,13 +3693,6 @@ Explicit megadja a hasznland Matrox eszkz nevt (alaprtelmezett: /dev/\:mga_ .PD 1 . .TP -.B "syncfb\ " -Kimeneti vide vezrl a SyncFB kernel modulhoz, ami a Matrox Gxxx -krtyk specilis hardveres kpessgeinek hasznlhatsgt biztostja, -mint pl. hardveres deinterlacing, mretezs s vide kimenet szinkronizlsa -a monitor fggleges visszatrshez. -. -.TP .B s3fb (csak Linux) (lsd mg \-vf yuv2 s \-dr) S3 Virge specifikus vide kimeneti vezrl. Ez a vezrl tmogatja a krtya YUV konverzijt s mretezst, a dupla diff --git a/DOCS/man/it/mplayer.1 b/DOCS/man/it/mplayer.1 index 6d034396cb..ede94e73f8 100644 --- a/DOCS/man/it/mplayer.1 +++ b/DOCS/man/it/mplayer.1 @@ -3821,13 +3821,6 @@ Seleziona esplicitamente il nome del dispositivo Matrox da usare (default: .PD 1 . .TP -.B "syncfb\ " -Driver video di uscita per il modulo del kernel SyncFB, il quale -fornisce speciali caratteristiche delle schede Matrox Gxxx, come -deinterlacciamento, scalatura e sincronizzazione dell'uscita video -con il ritracciamento verticale del tuo monitor. -. -.TP .B s3fb (solo Linux) (vedi anche \-vf yuv2 e \-dr) Driver di uscita video specifico per S3 Virge. Questo driver supporta la conversione e la scalatura YUV della scheda, il doppio diff --git a/DOCS/man/pl/mplayer.1 b/DOCS/man/pl/mplayer.1 index 4b182b307a..73c6f52e7d 100644 --- a/DOCS/man/pl/mplayer.1 +++ b/DOCS/man/pl/mplayer.1 @@ -2941,13 +2941,6 @@ Wybiera urzywane urzdzenie Matrox (domylnie: /dev/\:mga_vid). .PD 1 . .TP -.B "syncfb\ " -Sterownik wyjcia dla moduu jdra SyncFB, ktry umoliwia -korzystanie z takich moliwoci kart Matrox Gxxx jak -sprztowe usuwanie przeplotu, skalowanie i synchronizacja wyjcia -do pionowej czstotliwoci Twojego monitora. -. -.TP .B 3dfx (tylko Linux) Sterownik wyjcia video specyficzny dla 3dfx. Sterownik ten uywa bezporednio sprztu 3dfx na X11. diff --git a/DOCS/man/ru/mplayer.1 b/DOCS/man/ru/mplayer.1 index 1bb7a96dc4..8131994230 100644 --- a/DOCS/man/ru/mplayer.1 +++ b/DOCS/man/ru/mplayer.1 @@ -3650,13 +3650,6 @@ auto - ( PAL/\:NTSC), .PD 1 . .TP -.B "syncfb\ " - SyncFB , - Matrox Gxxx , , - - . -. -.TP .B s3fb ( Linux) (see also \-vf yuv2 and \-dr) S3 Virge. , YUV , diff --git a/DOCS/man/zh/mplayer.1 b/DOCS/man/zh/mplayer.1 index 28259b3b75..8e51149eaf 100644 --- a/DOCS/man/zh/mplayer.1 +++ b/DOCS/man/zh/mplayer.1 @@ -3418,11 +3418,6 @@ mga 视频输出驱动, 运行在 X11 窗口。 .PD 1 . .TP -.B "syncfb\ " -SyncFB 内核模式的视频输出驱动, 提供 Matrox Gxxx 卡特殊的硬件特性, -像硬件去交错, 缩放和同步视频输出到监视器的垂直 retrace。 -. -.TP .B s3fb(仅适用于Linux)(另参见 \-vf yuv2 和 \-dr) S3 Virge专用的视频输出驱动。 此驱动支持显卡的YUV转换与缩放、双重缓冲和直接渲染的功能。 @@ -4134,18 +4134,6 @@ fi echores "$_mga" -# echocheck "syncfb" -# _syncfb=no -# test "$_mga" = yes && _syncfb=yes -# if test "$_syncfb" = yes ; then -# _def_syncfb='#define HAVE_SYNCFB 1' -# _vosrc="$_vosrc vo_syncfb.c" -# else -# _def_syncfb='#undef HAVE_SYNCFB' -# fi -# echores "$_syncfb" - - echocheck "xmga" if test "$_xmga" = auto ; then _xmga=no @@ -8176,7 +8164,6 @@ $_def_zr $_def_bl $_def_mga $_def_xmga -$_def_syncfb $_def_fbdev $_def_dxr2 $_def_dxr3 diff --git a/help/help_mp-cs.h b/help/help_mp-cs.h index b1f516eac0..32a1669bb7 100644 --- a/help/help_mp-cs.h +++ b/help/help_mp-cs.h @@ -1808,19 +1808,6 @@ static char help_text[]= #define MSGTR_LIBVO_SVGA_CenteringImageStartAt "[VO_SVGA] Vystřeďuji obraz. Začínám na (%d,%d)\n" #define MSGTR_LIBVO_SVGA_UsingVidix "[VO_SVGA] Používám VIDIX. w=%i h=%i mw=%i mh=%i\n" -// libvo/vo_syncfb.c - -#define MSGTR_LIBVO_SYNCFB_CouldntOpen "[VO_SYNCFB] Nemohu otevřít /dev/syncfb nebo /dev/mga_vid.\n" -#define MSGTR_LIBVO_SYNCFB_UsingPaletteYuv420p3 "[VO_SYNCFB] Používám paletu YUV420P3.\n" -#define MSGTR_LIBVO_SYNCFB_UsingPaletteYuv420p2 "[VO_SYNCFB] Používám paletu YUV420P2.\n" -#define MSGTR_LIBVO_SYNCFB_UsingPaletteYuv420 "[VO_SYNCFB] Používám paletu YUV420.\n" -#define MSGTR_LIBVO_SYNCFB_NoSupportedPaletteFound "[VO_SYNCFB] Nenalezl jsem žádnou podporovanou paletu.\n" -#define MSGTR_LIBVO_SYNCFB_BesSourcerSize "[VO_SYNCFB] BES sourcer velikost: %d x %d.\n" -#define MSGTR_LIBVO_SYNCFB_FramebufferMemory "[VO_SYNCFB] paměť framebufferu: %ld v %ld bufferech.\n" -#define MSGTR_LIBVO_SYNCFB_RequestingFirstBuffer "[VO_SYNCFB] Požaduji první buffer #%d.\n" -#define MSGTR_LIBVO_SYNCFB_GotFirstBuffer "[VO_SYNCFB] Získal jsem první buffer #%d.\n" -#define MSGTR_LIBVO_SYNCFB_UnknownSubdevice "[VO_SYNCFB] neznámé podzařízení: %s.\n" - // libvo/vo_tdfxfb.c #define MSGTR_LIBVO_TDFXFB_CantOpen "[VO_TDFXFB] Nemohu otevřít %s: %s.\n" diff --git a/help/help_mp-de.h b/help/help_mp-de.h index 179686cf31..fdc7e2707d 100644 --- a/help/help_mp-de.h +++ b/help/help_mp-de.h @@ -1883,19 +1883,6 @@ static char help_text[]= #define MSGTR_LIBVO_SVGA_CenteringImageStartAt "[VO_SVGA] Zentriere Bild. Starte bei (%d,%d)\n" #define MSGTR_LIBVO_SVGA_UsingVidix "[VO_SVGA] Benutze VIDIX. b=%i h=%i mb=%i mh=%i\n" -// libvo/vo_syncfb.c - -#define MSGTR_LIBVO_SYNCFB_CouldntOpen "[VO_SYNCFB] Konnte /dev/syncfb oder /dev/mga_vid nicht öffnen.\n" -#define MSGTR_LIBVO_SYNCFB_UsingPaletteYuv420p3 "[VO_SYNCFB] Benutze Palette YUV420P3.\n" -#define MSGTR_LIBVO_SYNCFB_UsingPaletteYuv420p2 "[VO_SYNCFB] Benutze Palette YUV420P2.\n" -#define MSGTR_LIBVO_SYNCFB_UsingPaletteYuv420 "[VO_SYNCFB] Benutze Palette YUV420.\n" -#define MSGTR_LIBVO_SYNCFB_NoSupportedPaletteFound "[VO_SYNCFB] Keine unterstützte Palette gefunden.\n" -#define MSGTR_LIBVO_SYNCFB_BesSourcerSize "[VO_SYNCFB] Größe des BES sourcer: %d x %d.\n" -#define MSGTR_LIBVO_SYNCFB_FramebufferMemory "[VO_SYNCFB] Framebuffer-Speicher: %ld in %ld Buffern.\n" -#define MSGTR_LIBVO_SYNCFB_RequestingFirstBuffer "[VO_SYNCFB] Fordere ersten Buffer #%d.\n" -#define MSGTR_LIBVO_SYNCFB_GotFirstBuffer "[VO_SYNCFB] Ersten Buffer #%d erhalten.\n" -#define MSGTR_LIBVO_SYNCFB_UnknownSubdevice "[VO_SYNCFB] unbekanntes Subgerät: %s.\n" - // libvo/vo_tdfxfb.c #define MSGTR_LIBVO_TDFXFB_CantOpen "[VO_TDFXFB] Konnte %s nicht öffnen: %s.\n" diff --git a/help/help_mp-en.h b/help/help_mp-en.h index bf828c93f1..93a61a4a38 100644 --- a/help/help_mp-en.h +++ b/help/help_mp-en.h @@ -1833,19 +1833,6 @@ static char help_text[]= #define MSGTR_LIBVO_SVGA_CenteringImageStartAt "[VO_SVGA] Centering image. Starting at (%d,%d)\n" #define MSGTR_LIBVO_SVGA_UsingVidix "[VO_SVGA] Using VIDIX. w=%i h=%i mw=%i mh=%i\n" -// libvo/vo_syncfb.c - -#define MSGTR_LIBVO_SYNCFB_CouldntOpen "[VO_SYNCFB] Couldn't open /dev/syncfb or /dev/mga_vid.\n" -#define MSGTR_LIBVO_SYNCFB_UsingPaletteYuv420p3 "[VO_SYNCFB] Using palette YUV420P3.\n" -#define MSGTR_LIBVO_SYNCFB_UsingPaletteYuv420p2 "[VO_SYNCFB] Using palette YUV420P2.\n" -#define MSGTR_LIBVO_SYNCFB_UsingPaletteYuv420 "[VO_SYNCFB] Using palette YUV420.\n" -#define MSGTR_LIBVO_SYNCFB_NoSupportedPaletteFound "[VO_SYNCFB] No supported palette found.\n" -#define MSGTR_LIBVO_SYNCFB_BesSourcerSize "[VO_SYNCFB] BES sourcer size: %d x %d.\n" -#define MSGTR_LIBVO_SYNCFB_FramebufferMemory "[VO_SYNCFB] framebuffer memory: %ld in %ld buffers.\n" -#define MSGTR_LIBVO_SYNCFB_RequestingFirstBuffer "[VO_SYNCFB] Requesting first buffer #%d.\n" -#define MSGTR_LIBVO_SYNCFB_GotFirstBuffer "[VO_SYNCFB] Got first buffer #%d.\n" -#define MSGTR_LIBVO_SYNCFB_UnknownSubdevice "[VO_SYNCFB] unknown subdevice: %s.\n" - // libvo/vo_tdfxfb.c #define MSGTR_LIBVO_TDFXFB_CantOpen "[VO_TDFXFB] Can't open %s: %s.\n" diff --git a/help/help_mp-es.h b/help/help_mp-es.h index 54b01f9f29..982f0967af 100644 --- a/help/help_mp-es.h +++ b/help/help_mp-es.h @@ -1805,19 +1805,6 @@ static char help_text[]= #define MSGTR_LIBVO_SVGA_CenteringImageStartAt "[VO_SVGA] Centrando imagen, comenzando en (%d,%d)\n" #define MSGTR_LIBVO_SVGA_UsingVidix "[VO_SVGA] Utilizando VIDIX. w=%i h=%i mw=%i mh=%i\n" -// libvo/vo_syncfb.c - -#define MSGTR_LIBVO_SYNCFB_CouldntOpen "[VO_SYNCFB] No pude abrir /dev/syncfb ó /dev/mga_vid.\n" -#define MSGTR_LIBVO_SYNCFB_UsingPaletteYuv420p3 "[VO_SYNCFB] Utilizando paleta yuv420p3.\n" -#define MSGTR_LIBVO_SYNCFB_UsingPaletteYuv420p2 "[VO_SYNCFB] Utilizando paleta yuv420p2.\n" -#define MSGTR_LIBVO_SYNCFB_UsingPaletteYuv420 "[VO_SYNCFB] Utilizando paleta yuv420.\n" -#define MSGTR_LIBVO_SYNCFB_NoSupportedPaletteFound "[VO_SYNCFB] Encontre una paleta no soportada.\n" -#define MSGTR_LIBVO_SYNCFB_BesSourcerSize "[VO_SYNCFB] Tamaño BES Sourcer: %d x %d.\n" -#define MSGTR_LIBVO_SYNCFB_FramebufferMemory "[VO_SYNCFB] Memoria del Framebuffer: %ld en %ld buffers.\n" -#define MSGTR_LIBVO_SYNCFB_RequestingFirstBuffer "[VO_SYNCFB] Solicitando primer buffer #%d.\n" -#define MSGTR_LIBVO_SYNCFB_GotFirstBuffer "[VO_SYNCFB] Obtuve el primer buffer #%d.\n" -#define MSGTR_LIBVO_SYNCFB_UnknownSubdevice "[VO_SYNCFB] Sub-dispositivo desconocido: %s.\n" - // libvo/vo_tdfxfb.c #define MSGTR_LIBVO_TDFXFB_CantOpen "[VO_TDFXFB] No pude abrir %s: %s.\n" diff --git a/help/help_mp-fr.h b/help/help_mp-fr.h index 9af5171bfe..441dd264ca 100644 --- a/help/help_mp-fr.h +++ b/help/help_mp-fr.h @@ -1804,19 +1804,6 @@ static char help_text[]= #define MSGTR_LIBVO_SVGA_CenteringImageStartAt "[VO_SVGA] Centrer image. Commencer à (%d,%d)\n" #define MSGTR_LIBVO_SVGA_UsingVidix "[VO_SVGA] Utilise VIDIX. w=%i h=%i mw=%i mh=%i\n" -// libvo/vo_syncfb.c - -#define MSGTR_LIBVO_SYNCFB_CouldntOpen "[VO_SYNCFB] Ouverture impossible de /dev/syncfb ou /dev/mga_vid.\n" -#define MSGTR_LIBVO_SYNCFB_UsingPaletteYuv420p3 "[VO_SYNCFB] Utilise la palette YUV420P3.\n" -#define MSGTR_LIBVO_SYNCFB_UsingPaletteYuv420p2 "[VO_SYNCFB] Utilise la palette YUV420P2.\n" -#define MSGTR_LIBVO_SYNCFB_UsingPaletteYuv420 "[VO_SYNCFB] Utilise la palette YUV420.\n" -#define MSGTR_LIBVO_SYNCFB_NoSupportedPaletteFound "[VO_SYNCFB] Aucune palette supportée détectée.\n" -#define MSGTR_LIBVO_SYNCFB_BesSourcerSize "[VO_SYNCFB] Taille du sourcer BES : %d x %d.\n" -#define MSGTR_LIBVO_SYNCFB_FramebufferMemory "[VO_SYNCFB] Mémoire tampon : %ld sur %ld tampons.\n" -#define MSGTR_LIBVO_SYNCFB_RequestingFirstBuffer "[VO_SYNCFB] Demande du premier tampon #%d.\n" -#define MSGTR_LIBVO_SYNCFB_GotFirstBuffer "[VO_SYNCFB] Obtention du premier tampon #%d.\n" -#define MSGTR_LIBVO_SYNCFB_UnknownSubdevice "[VO_SYNCFB] Sous-périphérique inconnu : %s.\n" - // libvo/vo_tdfxfb.c #define MSGTR_LIBVO_TDFXFB_CantOpen "[VO_TDFXFB] Ne peux ouvrir %s : %s.\n" diff --git a/help/help_mp-hu.h b/help/help_mp-hu.h index dc7cd1f5d1..c3c09d50c5 100644 --- a/help/help_mp-hu.h +++ b/help/help_mp-hu.h @@ -1832,19 +1832,6 @@ static char help_text[]= #define MSGTR_LIBVO_SVGA_CenteringImageStartAt "[VO_SVGA] Kép középre igazítása. Kezdőpont (%d,%d)\n" #define MSGTR_LIBVO_SVGA_UsingVidix "[VO_SVGA] VIDIX használata. w=%i h=%i mw=%i mh=%i\n" -// libvo/vo_syncfb.c - -#define MSGTR_LIBVO_SYNCFB_CouldntOpen "[VO_SYNCFB] A /dev/syncfb vagy a /dev/mga_vid nem nyitható meg.\n" -#define MSGTR_LIBVO_SYNCFB_UsingPaletteYuv420p3 "[VO_SYNCFB] YUV420P3 paletta használata.\n" -#define MSGTR_LIBVO_SYNCFB_UsingPaletteYuv420p2 "[VO_SYNCFB] YUV420P2 paletta használata.\n" -#define MSGTR_LIBVO_SYNCFB_UsingPaletteYuv420 "[VO_SYNCFB] YUV420 paletta használata.\n" -#define MSGTR_LIBVO_SYNCFB_NoSupportedPaletteFound "[VO_SYNCFB] Nem találtam támogatott palettát.\n" -#define MSGTR_LIBVO_SYNCFB_BesSourcerSize "[VO_SYNCFB] BES sourcer méret: %d x %d.\n" -#define MSGTR_LIBVO_SYNCFB_FramebufferMemory "[VO_SYNCFB] framebuffer memória: %ld, %ld bufferben.\n" -#define MSGTR_LIBVO_SYNCFB_RequestingFirstBuffer "[VO_SYNCFB] #%d. számú első buffer igénylése.\n" -#define MSGTR_LIBVO_SYNCFB_GotFirstBuffer "[VO_SYNCFB] #%d. számú első buffer megvan.\n" -#define MSGTR_LIBVO_SYNCFB_UnknownSubdevice "[VO_SYNCFB] ismeretlen aleszköz: %s.\n" - // libvo/vo_tdfxfb.c #define MSGTR_LIBVO_TDFXFB_CantOpen "[VO_TDFXFB] Nem nyitható meg %s: %s.\n" diff --git a/help/help_mp-it.h b/help/help_mp-it.h index 2cb16eb912..7ac8d71e28 100644 --- a/help/help_mp-it.h +++ b/help/help_mp-it.h @@ -1825,19 +1825,6 @@ static char help_text[]= #define MSGTR_LIBVO_SVGA_CenteringImageStartAt "[VO_SVGA] Centro l'immagine. Partendo da (%d,%d)\n" #define MSGTR_LIBVO_SVGA_UsingVidix "[VO_SVGA] Uso VIDIX. l=%i a=%i lm=%i am=%i\n" -// libvo/vo_syncfb.c - -#define MSGTR_LIBVO_SYNCFB_CouldntOpen "[VO_SYNCFB] Impossibile aprire /dev/syncfb o /dev/mga_vid.\n" -#define MSGTR_LIBVO_SYNCFB_UsingPaletteYuv420p3 "[VO_SYNCFB] Uso la palette YUV420P3.\n" -#define MSGTR_LIBVO_SYNCFB_UsingPaletteYuv420p2 "[VO_SYNCFB] Uso la palette YUV420P2.\n" -#define MSGTR_LIBVO_SYNCFB_UsingPaletteYuv420 "[VO_SYNCFB] Uso la palette YUV420.\n" -#define MSGTR_LIBVO_SYNCFB_NoSupportedPaletteFound "[VO_SYNCFB] Non trovata alcuna palette supportata.\n" -#define MSGTR_LIBVO_SYNCFB_BesSourcerSize "[VO_SYNCFB] Dimensione sorgente BES: %d x %d.\n" -#define MSGTR_LIBVO_SYNCFB_FramebufferMemory "[VO_SYNCFB] Memoria framebuffer: %ld in %ld buffer.\n" -#define MSGTR_LIBVO_SYNCFB_RequestingFirstBuffer "[VO_SYNCFB] Richiedo il primo buffer #%d.\n" -#define MSGTR_LIBVO_SYNCFB_GotFirstBuffer "[VO_SYNCFB] Ottenuto il primo buffer #%d.\n" -#define MSGTR_LIBVO_SYNCFB_UnknownSubdevice "[VO_SYNCFB] Sottodispositivo sconosciuto: %s.\n" - // libvo/vo_tdfxfb.c #define MSGTR_LIBVO_TDFXFB_CantOpen "[VO_TDFXFB] Impossibile aprire %s: %s.\n" diff --git a/help/help_mp-pl.h b/help/help_mp-pl.h index d21c908f11..5dec0f9e0b 100644 --- a/help/help_mp-pl.h +++ b/help/help_mp-pl.h @@ -1710,19 +1710,6 @@ static char help_text[]= #define MSGTR_LIBVO_SVGA_CenteringImageStartAt "[VO_SVGA] Wyśrodkowuję obraz. Zaczynam w (%d,%d)\n" #define MSGTR_LIBVO_SVGA_UsingVidix "[VO_SVGA] Używam VIDIX. w=%i h=%i mw=%i mh=%i\n" -// libvo/vo_syncfb.c - -#define MSGTR_LIBVO_SYNCFB_CouldntOpen "[VO_SYNCFB] Nie mogłem otworzyć /dev/syncfb lub /dev/mga_vid.\n" -#define MSGTR_LIBVO_SYNCFB_UsingPaletteYuv420p3 "[VO_SYNCFB] Używam palety YUV420P3.\n" -#define MSGTR_LIBVO_SYNCFB_UsingPaletteYuv420p2 "[VO_SYNCFB] Używam palety YUV420P2.\n" -#define MSGTR_LIBVO_SYNCFB_UsingPaletteYuv420 "[VO_SYNCFB] Używam palety YUV420.\n" -#define MSGTR_LIBVO_SYNCFB_NoSupportedPaletteFound "[VO_SYNCFB] Nie znalazłem obsługiwanych palet.\n" -#define MSGTR_LIBVO_SYNCFB_BesSourcerSize "[VO_SYNCFB] rozmiar BES sourcer: %d x %d.\n" -#define MSGTR_LIBVO_SYNCFB_FramebufferMemory "[VO_SYNCFB] pamięć bufora klatek: %ld w %ld buforach.\n" -#define MSGTR_LIBVO_SYNCFB_RequestingFirstBuffer "[VO_SYNCFB] Żądam pierwszego bufora #%d.\n" -#define MSGTR_LIBVO_SYNCFB_GotFirstBuffer "[VO_SYNCFB] Dostałem pierwszy bufor #%d.\n" -#define MSGTR_LIBVO_SYNCFB_UnknownSubdevice "[VO_SYNCFB] nieznane podurządzenie: %s.\n" - // libvo/vo_tdfxfb.c #define MSGTR_LIBVO_TDFXFB_CantOpen "[VO_TDFXFB] Nie mogę otworzyć %s: %s.\n" diff --git a/help/help_mp-ru.h b/help/help_mp-ru.h index 7fe12453aa..94ec7a65c9 100644 --- a/help/help_mp-ru.h +++ b/help/help_mp-ru.h @@ -1944,19 +1944,6 @@ static char help_text[]= #define MSGTR_LIBVO_SVGA_CenteringImageStartAt "[VO_SVGA] Центрирую изображение. Начинаю в (%d,%d)\n" #define MSGTR_LIBVO_SVGA_UsingVidix "[VO_SVGA] Использую VIDIX. w=%i h=%i mw=%i mh=%i\n" -// libvo/vo_syncfb.c - -#define MSGTR_LIBVO_SYNCFB_CouldntOpen "[VO_SYNCFB] Не могу открыть /dev/syncfb или /dev/mga_vid.\n" -#define MSGTR_LIBVO_SYNCFB_UsingPaletteYuv420p3 "[VO_SYNCFB] Использую палитру YUV420P3.\n" -#define MSGTR_LIBVO_SYNCFB_UsingPaletteYuv420p2 "[VO_SYNCFB] Использую палитру YUV420P2.\n" -#define MSGTR_LIBVO_SYNCFB_UsingPaletteYuv420 "[VO_SYNCFB] Использую палитру YUV420.\n" -#define MSGTR_LIBVO_SYNCFB_NoSupportedPaletteFound "[VO_SYNCFB] Не найдено поддерживаемых палитр.\n" -#define MSGTR_LIBVO_SYNCFB_BesSourcerSize "[VO_SYNCFB] Размер генератора источников BES: %d x %d.\n" -#define MSGTR_LIBVO_SYNCFB_FramebufferMemory "[VO_SYNCFB] память фреймбуфера: %ld в %ld буфере(ах).\n" -#define MSGTR_LIBVO_SYNCFB_RequestingFirstBuffer "[VO_SYNCFB] Запрашиваю первый буфер #%d.\n" -#define MSGTR_LIBVO_SYNCFB_GotFirstBuffer "[VO_SYNCFB] Получен первый буфер #%d.\n" -#define MSGTR_LIBVO_SYNCFB_UnknownSubdevice "[VO_SYNCFB] неизвестное субустройство: %s.\n" - // libvo/vo_tdfxfb.c #define MSGTR_LIBVO_TDFXFB_CantOpen "[VO_TDFXFB] Не могу открыть %s: %s.\n" diff --git a/help/help_mp-tr.h b/help/help_mp-tr.h index 5ec136897b..76b9f66d0a 100644 --- a/help/help_mp-tr.h +++ b/help/help_mp-tr.h @@ -1697,19 +1697,6 @@ static char help_text[]= #define MSGTR_LIBVO_SVGA_CenteringImageStartAt "[VO_SVGA] Ortalanan görüntü. (%d,%d) ile başlatılıyor.\n" #define MSGTR_LIBVO_SVGA_UsingVidix "[VO_SVGA] VIDIX kullanılıyor. w=%i h=%i mw=%i mh=%i\n" -// libvo/vo_syncfb.c - -#define MSGTR_LIBVO_SYNCFB_CouldntOpen "[VO_SYNCFB] /dev/syncfb veya /dev/mga_vid açılamadı.\n" -#define MSGTR_LIBVO_SYNCFB_UsingPaletteYuv420p3 "[VO_SYNCFB] YUV420P3 paleti kullanılıyor.\n" -#define MSGTR_LIBVO_SYNCFB_UsingPaletteYuv420p2 "[VO_SYNCFB] YUV420P2 paleti kullanılıyor.\n" -#define MSGTR_LIBVO_SYNCFB_UsingPaletteYuv420 "[VO_SYNCFB] YUV420 paleti kullanılıyor.\n" -#define MSGTR_LIBVO_SYNCFB_NoSupportedPaletteFound "[VO_SYNCFB] Desteklenen palet bulunamadı.\n" -#define MSGTR_LIBVO_SYNCFB_BesSourcerSize "[VO_SYNCFB] BES kaynaklayıcı boyutu: %d x %d.\n" -#define MSGTR_LIBVO_SYNCFB_FramebufferMemory "[VO_SYNCFB] kare tamponu belleği: %ld in %ld buffers.\n" -#define MSGTR_LIBVO_SYNCFB_RequestingFirstBuffer "[VO_SYNCFB] #%d ilk tampon sorgulanıyor.\n" -#define MSGTR_LIBVO_SYNCFB_GotFirstBuffer "[VO_SYNCFB] #%d ilk tampona ulaşıldı.\n" -#define MSGTR_LIBVO_SYNCFB_UnknownSubdevice "[VO_SYNCFB] bilinmeyen altaygıt: %s.\n" - // libvo/vo_tdfxfb.c #define MSGTR_LIBVO_TDFXFB_CantOpen "[VO_TDFXFB] %s açılamıyor: %s.\n" diff --git a/help/help_mp-zh_CN.h b/help/help_mp-zh_CN.h index 045d711f5b..d52ff719f7 100644 --- a/help/help_mp-zh_CN.h +++ b/help/help_mp-zh_CN.h @@ -1825,19 +1825,6 @@ static char help_text[]= #define MSGTR_LIBVO_SVGA_CenteringImageStartAt "[VO_SVGA] 图像居中。始于 (%d,%d)\n" #define MSGTR_LIBVO_SVGA_UsingVidix "[VO_SVGA] 使用 VIDIX. w=%i h=%i mw=%i mh=%i\n" -// libvo/vo_syncfb.c - -#define MSGTR_LIBVO_SYNCFB_CouldntOpen "[VO_SYNCFB] 打不开 /dev/syncfb 或 /dev/mga_vid。\n" -#define MSGTR_LIBVO_SYNCFB_UsingPaletteYuv420p3 "[VO_SYNCFB] 使用 YUV420P3 调色板。\n" -#define MSGTR_LIBVO_SYNCFB_UsingPaletteYuv420p2 "[VO_SYNCFB] 使用 YUV420P2 调色板。\n" -#define MSGTR_LIBVO_SYNCFB_UsingPaletteYuv420 "[VO_SYNCFB] 使用 YUV420 调色板。\n" -#define MSGTR_LIBVO_SYNCFB_NoSupportedPaletteFound "[VO_SYNCFB] 找不到支持的调色板。\n" -#define MSGTR_LIBVO_SYNCFB_BesSourcerSize "[VO_SYNCFB] BES sourcer 尺寸: %d x %d。\n" -#define MSGTR_LIBVO_SYNCFB_FramebufferMemory "[VO_SYNCFB] 帧缓冲内存: %ld 在 %ld 缓冲。\n" -#define MSGTR_LIBVO_SYNCFB_RequestingFirstBuffer "[VO_SYNCFB] 申请第一个缓冲 #%d。\n" -#define MSGTR_LIBVO_SYNCFB_GotFirstBuffer "[VO_SYNCFB] 获得第一个缓冲 #%d。\n" -#define MSGTR_LIBVO_SYNCFB_UnknownSubdevice "[VO_SYNCFB] 未知子设备: %s。\n" - // libvo/vo_tdfxfb.c #define MSGTR_LIBVO_TDFXFB_CantOpen "[VO_TDFXFB] 打不开 %s: %s。\n" diff --git a/help/help_mp-zh_TW.h b/help/help_mp-zh_TW.h index 3d5d30b3ab..f738d35127 100644 --- a/help/help_mp-zh_TW.h +++ b/help/help_mp-zh_TW.h @@ -1809,19 +1809,6 @@ static char help_text[]= #define MSGTR_LIBVO_SVGA_CenteringImageStartAt "[VO_SVGA] 圖像居中。始于 (%d,%d)\n" #define MSGTR_LIBVO_SVGA_UsingVidix "[VO_SVGA] 使用 VIDIX. w=%i h=%i mw=%i mh=%i\n" -// libvo/vo_syncfb.c - -#define MSGTR_LIBVO_SYNCFB_CouldntOpen "[VO_SYNCFB] 打不開 /dev/syncfb 或 /dev/mga_vid。\n" -#define MSGTR_LIBVO_SYNCFB_UsingPaletteYuv420p3 "[VO_SYNCFB] 使用 YUV420P3 調色板。\n" -#define MSGTR_LIBVO_SYNCFB_UsingPaletteYuv420p2 "[VO_SYNCFB] 使用 YUV420P2 調色板。\n" -#define MSGTR_LIBVO_SYNCFB_UsingPaletteYuv420 "[VO_SYNCFB] 使用 YUV420 調色板。\n" -#define MSGTR_LIBVO_SYNCFB_NoSupportedPaletteFound "[VO_SYNCFB] 找不到支持的調色板。\n" -#define MSGTR_LIBVO_SYNCFB_BesSourcerSize "[VO_SYNCFB] BES sourcer 尺寸: %d x %d。\n" -#define MSGTR_LIBVO_SYNCFB_FramebufferMemory "[VO_SYNCFB] 幀緩衝内存: %ld 在 %ld 緩衝。\n" -#define MSGTR_LIBVO_SYNCFB_RequestingFirstBuffer "[VO_SYNCFB] 申請第一個緩衝 #%d。\n" -#define MSGTR_LIBVO_SYNCFB_GotFirstBuffer "[VO_SYNCFB] 獲得第一個緩衝 #%d。\n" -#define MSGTR_LIBVO_SYNCFB_UnknownSubdevice "[VO_SYNCFB] 未知子設備: %s。\n" - // libvo/vo_tdfxfb.c #define MSGTR_LIBVO_TDFXFB_CantOpen "[VO_TDFXFB] 打不開 %s: %s。\n" diff --git a/libvo/video_out.c b/libvo/video_out.c index 588a132678..4b85b99a46 100644 --- a/libvo/video_out.c +++ b/libvo/video_out.c @@ -84,7 +84,6 @@ extern vo_functions_t video_out_null; extern vo_functions_t video_out_zr; extern vo_functions_t video_out_zr2; extern vo_functions_t video_out_bl; -extern vo_functions_t video_out_syncfb; extern vo_functions_t video_out_fbdev; extern vo_functions_t video_out_fbdev2; extern vo_functions_t video_out_svga; @@ -163,9 +162,6 @@ vo_functions_t* video_out_drivers[] = #ifdef HAVE_MGA &video_out_mga, #endif -#ifdef HAVE_SYNCFB - &video_out_syncfb, -#endif #ifdef HAVE_TDFXFB &video_out_tdfxfb, #endif diff --git a/libvo/vo_syncfb.c b/libvo/vo_syncfb.c deleted file mode 100644 index 472f89c617..0000000000 --- a/libvo/vo_syncfb.c +++ /dev/null @@ -1,464 +0,0 @@ - -// How many MegaBytes of RAM is on your G200/G400 card? -#define RAM_SIZE 16 - -/* - * video_out_syncfb.c - * - * Copyright (C) Aaron Holtzman - Aug 1999 - * - * This file is part of mpeg2dec, a free MPEG-2 video stream decoder. - * - * mpeg2dec 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, or (at your option) - * any later version. - * - * mpeg2dec 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 mpeg2dec; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <errno.h> - -#include "config.h" -#include "mp_msg.h" -#include "help_mp.h" -#include "video_out.h" -#include "video_out_internal.h" - -#include <sys/ioctl.h> -#include <unistd.h> -#include <fcntl.h> -#include <sys/mman.h> -#include <linux/videodev.h> - -#include "drivers/syncfb/syncfb.h" - -#include "fastmemcpy.h" - -static vo_info_t info = -{ - "Matrox G200/G400 Synchronous framebuffer (/dev/syncfb)", - "syncfb", - "Matthias Oelmann <mao@well.com>", - "" -}; - -LIBVO_EXTERN(syncfb) - -/* deinterlacing on? looks only good in 50 Hz(PAL) or 60 Hz(NTSC) modes */ -static int vo_conf_deinterlace = 0; - -/* 72/75 Hz Monitor frequency for progressive output */ -static int vo_conf_cinemode = 0; - - -static syncfb_config_t _config; -static syncfb_capability_t sfb_caps; - -static syncfb_buffer_info_t bufinfo; - -static uint_8 *vid_data; -static uint_8 *frame_mem; - -static int debug_skip_first = 250; -static int dbg_singleframe = 0; - -static int conf_palette; - -static int f; - - - -/* - it seems that mpeg2dec never calls - draw_frame, so i could not test it.... -*/ - -static void -write_frame_YUV422(uint_8 *y,uint_8 *cr, uint_8 *cb) -{ - uint_8 *crp, *cbp; - uint_32 *dest32; - uint_32 bespitch,h,w; - - - bespitch = _config.src_pitch; - dest32 = (uint_32 *)vid_data; - - for(h=0; h < _config.src_height/2; h++) - { - cbp = cb; - crp = cr; - for(w=0; w < _config.src_width/2; w++) - { - *dest32++ = (*y) + ((*cr)<<8) + ((*(y+1))<<16) + ((*cb)<<24); - y++; y++; cb++; cr++; - } - dest32 += (bespitch - _config.src_width) / 2; - - for(w=0; w < _config.src_width/2; w++) - { - *dest32++ = (*y) + ((*crp)<<8) + ((*(y+1))<<16) + ((*cbp)<<24); - y++; y++; cbp++; crp++; - } - dest32 += (bespitch - _config.src_width) / 2; - } -} - - -static void -write_frame_YUV420P2(uint_8 *y,uint_8 *cr, uint_8 *cb) -{ - uint_8 *dest, *tmp; - uint_32 bespitch,h,w; - - bespitch = _config.src_pitch; - dest = frame_mem + bufinfo.offset; - - for(h=0; h < _config.src_height; h++) - { - fast_memcpy(dest, y, _config.src_width); - y += _config.src_width; - dest += bespitch; - } - - dest = frame_mem + bufinfo.offset_p2; - for(h=0; h < _config.src_height/2; h++) - { - tmp = dest; - for(w=0; w < _config.src_width/2; w++) - { - *tmp++ = *cr++; - *tmp++ = *cb++; - } - dest += bespitch; - } -} - -static void -write_frame_YUV420P3(uint_8 *y,uint_8 *cr, uint_8 *cb) -{ -} - -static void -write_slice_YUV420P2(uint_8 *y,uint_8 *cr, uint_8 *cb,uint_32 slice_num) -{ - uint_8 *dest, *tmp; - uint_32 bespitch,h,w; - - bespitch = _config.src_pitch; - dest = frame_mem + bufinfo.offset + (bespitch * 16 * slice_num); - - for(h=0; h < 16; h++) - { - fast_memcpy(dest, y, _config.src_width); - y += _config.src_width; - dest += bespitch; - } - - dest = frame_mem + bufinfo.offset_p2 + (bespitch * 16 * slice_num) /2; - for(h=0; h < 8; h++) - { - tmp = dest; - for(w=0; w < _config.src_width/2; w++) - { |