diff options
57 files changed, 997 insertions, 206 deletions
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index 86a3b4c225..ab946c2fd4 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -4219,6 +4219,10 @@ Each file takes the frame number padded with leading zeros as name. .IPs z=<0\-9> Specifies the compression level. 0 is no compression, 9 is maximum compression. +.IPs alpha (default: noalpha) +Create PNG files with an alpha channel. +Note that MPlayer in general does not support alpha, so this will only +be useful in some rare cases. .RE .PD 1 . diff --git a/DOCS/man/fr/mplayer.1 b/DOCS/man/fr/mplayer.1 index 93494f6cbe..21e3624540 100644 --- a/DOCS/man/fr/mplayer.1 +++ b/DOCS/man/fr/mplayer.1 @@ -1,4 +1,4 @@ -.\" synced with r28096 +.\" synced with r28126 .\" Encoding: iso-8859-1 .\" MPlayer (C) 2000-2008 MPlayer Team .\" The English man page was/is done by Gabucino, Diego Biurrun, Jonas Jermann @@ -4459,6 +4459,10 @@ Ne gre que les formats RGB et BGR 24 bits/pixel. .IPs z=<0\-9> Dfinit le taux de compression. 0 quivaut pas de compression et 9 la compression maximale. +.IPs alpha (par dfaut\ : noalpha) +Cre un fichier PNG avec un canal alpha. +Notez que MPlayer ne gre en gnral pas les canaux alpha, donc cette +option sera probablement rarement utile. .RE .PD 1 . diff --git a/DOCS/xml/en/install.xml b/DOCS/xml/en/install.xml index 25440e429c..fae3bd8618 100644 --- a/DOCS/xml/en/install.xml +++ b/DOCS/xml/en/install.xml @@ -442,7 +442,7 @@ FAAD2 binaries are not available from audiocoding.com, but you can (apt-)get Debian packages from <ulink url="http://www.debian-multimedia.org/">Christian Marillat</ulink>, Mandrake/Mandriva RPMs from the <ulink url="http://plf.zarb.org">P.L.F</ulink> -and Fedora RPMs from <ulink url="http://rpm.livna.org/">Livna</ulink>. +and Fedora/CentOS/RHEL RPMs from <ulink url="http://rpmfusion.org/">RPMFusion</ulink>. </para> <para> If you choose to build from source, you do not need all of FAAD2 to decode diff --git a/DOCS/xml/en/ports.xml b/DOCS/xml/en/ports.xml index b752941c1e..29ed6bd422 100644 --- a/DOCS/xml/en/ports.xml +++ b/DOCS/xml/en/ports.xml @@ -61,8 +61,8 @@ our binary codec packages for a while, you can (apt-)get them from <para> Dominik Mierzejewski maintains the official RPM packages of -<application>MPlayer</application> for Fedora Core. They are available -from <ulink url="http://rpm.livna.org/">Livna repository</ulink>. +<application>MPlayer</application> for Fedora and CentOS/RHEL. They are available +from <ulink url="http://rpmfusion.org/">RPMFusion repository</ulink>. </para> <para> @@ -3642,7 +3642,7 @@ EOF _vomodules="quartz $_vomodules" _def_quicktime='#define CONFIG_QUICKTIME 1' else - _quartz=yes + _quartz=no _def_quartz='#undef CONFIG_QUARTZ' _novomodules="quartz $_novomodules" _def_quicktime='#undef CONFIG_QUICKTIME' @@ -5486,7 +5486,7 @@ fi echocheck "VCD support" -if linux || freebsd || netbsd || dragonfly || bsdos || darwin || sunos || mingw32; then +if linux || freebsd || netbsd || openbsd || dragonfly || bsdos || darwin || sunos || mingw32; then _inputmodules="vcd $_inputmodules" _def_vcd='#define CONFIG_VCD 1' _vcd="yes" @@ -6077,15 +6077,25 @@ int main(void) { return 0; } EOF - for _ld_theora in "`$_pkg_config --silence-errors --libs --cflags theora`" "-ltheora -logg"; do - cc_check $_ld_theora && _ld_extra="$_ld_extra $_ld_theora" \ - && _theora=yes && break - done + _ld_theora=$($_pkg_config --silence-errors --libs theora) + _inc_theora=$($_pkg_config --silence-errors --cflags theora) + cc_check $_inc_theora $_ld_theora && _ld_extra="$_ld_extra $_ld_theora" && + _inc_extra="$_inc_extra $_inc_theora" && _theora=yes + if test _theora = no; then + _ld_theora="-ltheora -logg" + cc_check $_ld_theora && _ld_extra="$_ld_extra $_ld_theora" && _theora=yes + fi if test "$_theora" = no && test "$_tremor_internal" = yes; then - for _ld_theora in "`$_pkg_config --silence-errors --libs --cflags theora`" "-ltheora -logg"; do - cc_check tremor/bitwise.c $_ld_theora \ - && _ld_extra="$_ld_extra $_ld_theora" && theora=yes && break - done + _ld_theora=$($_pkg_config --silence-errors --libs theora) + _inc_theora=$($_pkg_config --silence-errors --cflags theora) + cc_check tremor/bitwise.c $_inc_theora $_ld_theora && + _ld_extra="$_ld_extra $_ld_theora" && + _inc_extra="$_inc_extra $_inc_theora" && _theora=yes + if test _theora = no; then + _ld_theora="-ltheora -logg" + cc_check tremor/bitwise.c $_ld_theora && + _ld_extra="$_ld_extra $_ld_theora" && _theora=yes + fi fi fi if test "$_theora" = yes ; then @@ -6388,7 +6398,7 @@ if test "$_real" = auto ; then _real=no _res_comment="dynamic loader support needed" if test "$_dl" = yes || test "$_win32dll" = yes && - (linux || freebsd || netbsd || dragonfly || darwin || win32) ; then + (linux || freebsd || netbsd || openbsd || dragonfly || darwin || win32) ; then _real=yes fi fi @@ -6455,7 +6465,7 @@ int main(void) { return 0; } EOF _live=no - for I in $_inc_extra "-I$_libdir/live" "-I/usr/lib/live" "-I/usr/local/live" "-I/usr/local/lib/live" ; do + for I in $_inc_extra "-I$_libdir/live" "-I/usr/lib/live" "-I/usr/lib64/live" "-I/usr/local/live" "-I/usr/local/lib/live" ; do cxx_check $I/liveMedia/include $I/UsageEnvironment/include \ $I/groupsock/include && _livelibdir=`echo $I| sed s/-I//` && \ _ld_extra="$_livelibdir/liveMedia/libliveMedia.a \ @@ -7672,8 +7682,7 @@ fi _ld_extra="$_ld_extra $_ld_pthread $_ld_dl $_ld_dl_dynamic" bsdos && _ld_extra="$_ld_extra -ldvd" -netbsd && x86_32 && _ld_extra="$_ld_extra -li386" -openbsd && x86_32 && _ld_extra="$_ld_extra -li386" +(netbsd || openbsd) && x86_32 && _ld_extra="$_ld_extra -li386" _def_debug='#undef MP_DEBUG' test "$_debug" != "" && _def_debug='#define MP_DEBUG 1' diff --git a/cputable.h b/cputable.h index ef3496e1fb..2f5ce20182 100644 --- a/cputable.h +++ b/cputable.h @@ -1,7 +1,24 @@ -/* cputable.h - Maps CPUID to real CPU name. - * Copyleft 2001 by Felix Buenemann <atmosfear at users dot sourceforge dot net> - * This file comes under the GNU GPL, see www.fsf.org for more info! +/* + * Map CPUID to real CPU name. * Family F codenames owe much thanks to Neil Phillips, author of x86test. + * + * Copyright (C) 2001 Felix Buenemann <atmosfear at users.sourceforge.net> + * + * This file is part of MPlayer. + * + * MPlayer 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 of the License, or + * (at your option) any later version. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #ifndef MPLAYER_CPUTABLE_H diff --git a/etc/codecs.conf b/etc/codecs.conf index 5322147928..bb9a7a2329 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -145,6 +145,7 @@ videocodec ffmpeg2 fourcc VCR2 fourcc mp2v,mpgv fourcc PIM2 + fourcc LMP2 ; Lead mpeg2 in avi driver ffmpeg dll "mpeg2video" out YV12,I420,IYUV @@ -181,6 +182,7 @@ videocodec ffmpeg12 fourcc mx3n,mx3p fourcc AVmp fourcc mp2v,mpgv + fourcc LMP2 ; Lead mpeg2 in avi driver ffmpeg dll "mpegvideo" out YV12,I420,IYUV @@ -218,6 +220,7 @@ videocodec mpeg12 fourcc mx3n,mx3p fourcc AVmp fourcc mp2v,mpgv + fourcc LMP2 ; Lead mpeg2 in avi driver libmpeg2 ; dll "libmpeg2" out YV12,I420,IYUV @@ -253,6 +256,7 @@ videocodec ffmpeg12mc fourcc mx3n,mx3p fourcc AVmp fourcc mp2v,mpgv + fourcc LMP2 ; Lead mpeg2 in avi driver ffmpeg dll "mpegvideo_xvmc" out IDCT_MPEG2 @@ -800,7 +804,7 @@ videocodec ffodivx fourcc FVFW,fvfw fourcc FFDS fourcc DCOD,MVXM,EM4A,PM4V - fourcc M4T3,DMK2 + fourcc M4T3,DMK2,DIGI driver ffmpeg dll mpeg4 ;opendivx out YV12,I420,IYUV @@ -850,7 +854,7 @@ videocodec xvid fourcc VIDM ; vidm 4.01 codec fourcc FFDS fourcc DCOD,MVXM,EM4A,PM4V - fourcc M4T3,DMK2 + fourcc M4T3,DMK2,DIGI format 0x10000004 ; mpeg 4 es driver xvid out YV12 @@ -1063,6 +1067,7 @@ videocodec ffmjpeg fourcc dmb1 ; MJPEG by Matrox Rainbow Runner fourcc MJLS ; JPEG-LS custom FOURCC for avi - encoder fourcc MMJP + fourcc ACDV ; ACDSee jpeg driver ffmpeg dll mjpeg out 444P @@ -2032,6 +2037,15 @@ videocodec vdom dll "vdowave.drv" ; Need also VDODEC32.dll and DECVW_32.DLL out BGR24 flip +videocodec vdowave3 + info "VDOWave 3 advanced codec" + status working + fourcc VDO3 + fourcc VDOM,VDOW + driver vfw + dll "vdo32_30.drv" ; Need also decvdo.dll + out BGR24 flip + videocodec lsv info "Vianet Lsvx Video Decoder" status working @@ -3183,6 +3197,7 @@ audiocodec faad fourcc "AACP" ; Used in NSV for AACPlus format 0xff format 0x706D + format 0x4143 ; aac in asf driver faad dll libfaad2 @@ -3196,6 +3211,7 @@ audiocodec ffaac fourcc raac,racp format 0xff format 0x706D + format 0x4143 ; aac in asf driver ffmpeg dll aac @@ -3466,6 +3482,7 @@ audiocodec a52 info "AC3-liba52" status working format 0x2000 + ; format 0x332D6361 ; ac-3 in mp4 -- not working fourcc dnet driver liba52 dll "liba52" @@ -3474,6 +3491,7 @@ audiocodec ffac3 info "FFmpeg AC-3" status working format 0x2000 + format 0x332D6361 ; ac-3 in mp4 fourcc dnet driver ffmpeg dll ac3 @@ -3543,6 +3561,15 @@ audiocodec ffadcpmswf driver ffmpeg dll "adpcm_swf" +audiocodec voxvoice + info "VoxWare MetaVoice" + status working + comment "windows users need msms001.vwp and mvoice.vwp in windows\\system32 folder" + format 0x74 + driver dshow + dll "voxmvdec.ax" ; need also msms001.vwp and mvoice.vwp + guid 0x46e32b01, 0xa465, 0x11d1, 0xb5, 0x50, 0x00, 0x60, 0x97, 0x24, 0x2d, 0x8d + audiocodec voxware info "VoxWare" status working @@ -3607,6 +3634,7 @@ audiocodec hwac3 info "AC3 through S/PDIF" status working format 0x2000 + format 0x332D6361 ; ac-3 in mp4 fourcc dnet driver hwac3 @@ -3768,3 +3796,11 @@ audiocodec msnsiren format 0x28E driver acm dll "sirenacm.dll" + +audiocodec uleaddva + info "Ulead DV ACM" + status working + format 0x215 + format 0x216 + driver acm + dll "dvacm.acm"
\ No newline at end of file diff --git a/help/help_mp-cs.h b/help/help_mp-cs.h index dc1c4e7f26..1e168dd417 100644 --- a/help/help_mp-cs.h +++ b/help/help_mp-cs.h @@ -1688,7 +1688,7 @@ static char help_text[]= #define MSGTR_LIBVO_MGA_InvalidOutputFormat "[MGA] Neplatný formát výstupu %0X\n" #define MSGTR_LIBVO_MGA_IncompatibleDriverVersion "[MGA] Verze vašeho mga_vid ovladače není kompatibilní s touto verzí MPlayeru!\n" #define MSGTR_LIBVO_MGA_CouldntOpen "[MGA] Nemohu otevřít: %s\n" -#define MGSTR_LIBVO_MGA_ResolutionTooHigh "[MGA] Vstupní rozlišení minimálně v jednom rozměru větší než 1023x1023. Přeškálujte prosím softwarově, nebo použijte -lavdopts lowres=1\n" +#define MSGTR_LIBVO_MGA_ResolutionTooHigh "[MGA] Vstupní rozlišení minimálně v jednom rozměru větší než 1023x1023. Přeškálujte prosím softwarově, nebo použijte -lavdopts lowres=1\n" // libvo/vesa_lvo.c diff --git a/help/help_mp-de.h b/help/help_mp-de.h index 5d37b13415..8cb6ac4805 100644 --- a/help/help_mp-de.h +++ b/help/help_mp-de.h @@ -1724,8 +1724,8 @@ static char help_text[]= #define MSGTR_LIBVO_MGA_InvalidOutputFormat "[MGA] ungültiges Ausgabeformat %0X\n" #define MSGTR_LIBVO_MGA_IncompatibleDriverVersion "[MGA] Die Treiberversion von mga_vid ist mit dieser MPlayer-Version nicht kompatibel!\n" #define MSGTR_LIBVO_MGA_CouldntOpen "[MGA] Konnte %s nicht öffnen\n" -#define MGSTR_LIBVO_MGA_ResolutionTooHigh "[MGA] Auflösung der Quelle ist in mindestens einer Dimension größer als 1023x1023.\n[MGA] Bitte skaliere in Software oder verwende -lavdopts lowres=1.\n" -#define MGSTR_LIBVO_MGA_mgavidVersionMismatch "[MGA] Unterschiedliche Versionen des mga_vid-Treibers des Kernels (%u) und MPlayer (%u).\n" +#define MSGTR_LIBVO_MGA_ResolutionTooHigh "[MGA] Auflösung der Quelle ist in mindestens einer Dimension größer als 1023x1023.\n[MGA] Bitte skaliere in Software oder verwende -lavdopts lowres=1.\n" +#define MSGTR_LIBVO_MGA_mgavidVersionMismatch "[MGA] Unterschiedliche Versionen des mga_vid-Treibers des Kernels (%u) und MPlayer (%u).\n" // libvo/vesa_lvo.c diff --git a/help/help_mp-en.h b/help/help_mp-en.h index f291818920..246731ad2c 100644 --- a/help/help_mp-en.h +++ b/help/help_mp-en.h @@ -955,8 +955,8 @@ static char help_text[]= #define MSGTR_LIBVO_MGA_InvalidOutputFormat "[MGA] invalid output format %0X\n" #define MSGTR_LIBVO_MGA_IncompatibleDriverVersion "[MGA] Your mga_vid driver version is incompatible with this MPlayer version!\n" #define MSGTR_LIBVO_MGA_CouldntOpen "[MGA] Couldn't open: %s\n" -#define MGSTR_LIBVO_MGA_ResolutionTooHigh "[MGA] Source resolution exceeds 1023x1023 in at least one dimension.\n[MGA] Rescale in software or use -lavdopts lowres=1.\n" -#define MGSTR_LIBVO_MGA_mgavidVersionMismatch "[MGA] mismatch between kernel (%u) and MPlayer (%u) mga_vid driver versions\n" +#define MSGTR_LIBVO_MGA_ResolutionTooHigh "[MGA] Source resolution exceeds 1023x1023 in at least one dimension.\n[MGA] Rescale in software or use -lavdopts lowres=1.\n" +#define MSGTR_LIBVO_MGA_mgavidVersionMismatch "[MGA] mismatch between kernel (%u) and MPlayer (%u) mga_vid driver versions\n" // vo_null.c #define MSGTR_LIBVO_NULL_UnknownSubdevice "[VO_NULL] Unknown subdevice: %s.\n" diff --git a/help/help_mp-es.h b/help/help_mp-es.h index 076c17f5c3..76a5321a69 100644 --- a/help/help_mp-es.h +++ b/help/help_mp-es.h @@ -961,8 +961,8 @@ static char help_text[]= #define MSGTR_LIBVO_MGA_InvalidOutputFormat "[MGA] Formáto de salida inválido %0X\n" #define MSGTR_LIBVO_MGA_IncompatibleDriverVersion "[MGA] La versión de tu driver mga_vid no es compatible con esta versión de MPlayer!\n" #define MSGTR_LIBVO_MGA_CouldntOpen "[MGA] No pude abrir: %s\n" -#define MGSTR_LIBVO_MGA_ResolutionTooHigh "[MGA] La resolución de la fuente es en por lo menos una dimensión mas grande que 1023x1023. Por favor escale en software o use -lavdopts lowres=1\n" -#define MGSTR_LIBVO_MGA_mgavidVersionMismatch "[MGA] Las versiones del controlador mga_vid del kernel (%u) y MPlayer (%u) no coinciden\n" +#define MSGTR_LIBVO_MGA_ResolutionTooHigh "[MGA] La resolución de la fuente es en por lo menos una dimensión mas grande que 1023x1023. Por favor escale en software o use -lavdopts lowres=1\n" +#define MSGTR_LIBVO_MGA_mgavidVersionMismatch "[MGA] Las versiones del controlador mga_vid del kernel (%u) y MPlayer (%u) no coinciden\n" // vo_null.c #define MSGTR_LIBVO_NULL_UnknownSubdevice "[VO_NULL] Sub-dispositivo desconocido: %s.\n" diff --git a/help/help_mp-fr.h b/help/help_mp-fr.h index a83950b8ca..339674d352 100644 --- a/help/help_mp-fr.h +++ b/help/help_mp-fr.h @@ -1695,8 +1695,8 @@ static char help_text[]= #define MSGTR_LIBVO_MGA_InvalidOutputFormat "[MGA] Format de sortie invalide %0X\n" #define MSGTR_LIBVO_MGA_IncompatibleDriverVersion "[MGA] La version de votre pilote mga_vid est incompatible avec cette version de MPlayer !\n" #define MSGTR_LIBVO_MGA_CouldntOpen "[MGA] Impossible d'ouvrir : %s\n" -#define MGSTR_LIBVO_MGA_ResolutionTooHigh "[MGA] La resolution à sa source est au moins dans une dimension plus large que 1023x1023. Veuillez remettre à l'échelle dans le logiciel ou utiliser -lavdopts lowres=1\n" -#define MGSTR_LIBVO_MGA_mgavidVersionMismatch "[MGA] La version du driver mga_vid (%u) ne correspond pas à celle utilisée lors de la compilation de MPlayer (%u)\n" +#define MSGTR_LIBVO_MGA_ResolutionTooHigh "[MGA] La resolution à sa source est au moins dans une dimension plus large que 1023x1023. Veuillez remettre à l'échelle dans le logiciel ou utiliser -lavdopts lowres=1\n" +#define MSGTR_LIBVO_MGA_mgavidVersionMismatch "[MGA] La version du driver mga_vid (%u) ne correspond pas à celle utilisée lors de la compilation de MPlayer (%u)\n" // libvo/vesa_lvo.c diff --git a/help/help_mp-hu.h b/help/help_mp-hu.h index 5fb458e785..6b33d9e93c 100644 --- a/help/help_mp-hu.h +++ b/help/help_mp-hu.h @@ -954,8 +954,8 @@ static char help_text[]= #define MSGTR_LIBVO_MGA_InvalidOutputFormat "[MGA] Hibás kimeneti formátum %0X\n" #define MSGTR_LIBVO_MGA_IncompatibleDriverVersion "[MGA] Az mga_vid vezérlőd verziója nem kompatibilis ezzel az MPlayer verzióval!\n" #define MSGTR_LIBVO_MGA_CouldntOpen "[MGA] Nem nyitható meg: %s\n" -#define MGSTR_LIBVO_MGA_ResolutionTooHigh "[MGA] A forrás felbontása legalább egy dimenzióban nagyobb, mint 1023x1023. Méretezd át szoftveresen vagy használd a -lavdopts lowres=1-t\n" -#define MGSTR_LIBVO_MGA_mgavidVersionMismatch "[MGA] különbség a kernel (%u) és az MPlayer (%u) mga_vid verziói között\n" +#define MSGTR_LIBVO_MGA_ResolutionTooHigh "[MGA] A forrás felbontása legalább egy dimenzióban nagyobb, mint 1023x1023. Méretezd át szoftveresen vagy használd a -lavdopts lowres=1-t\n" +#define MSGTR_LIBVO_MGA_mgavidVersionMismatch "[MGA] különbség a kernel (%u) és az MPlayer (%u) mga_vid verziói között\n" // vo_null.c #define MSGTR_LIBVO_NULL_UnknownSubdevice "[VO_NULL] Ismeretlen aleszköz: %s.\n" diff --git a/help/help_mp-it.h b/help/help_mp-it.h index 55bf3c071f..5e7459d2bf 100644 --- a/help/help_mp-it.h +++ b/help/help_mp-it.h @@ -1676,8 +1676,8 @@ static char help_text[]= #define MSGTR_LIBVO_MGA_InvalidOutputFormat "[MGA] formato di uscita %0X invalido\n" #define MSGTR_LIBVO_MGA_IncompatibleDriverVersion "[MGA] La versione del tuo driver mga_vid è incompatibile con questo MPlayer!\n" #define MSGTR_LIBVO_MGA_CouldntOpen "[MGA] Impossibile aprire: %s\n" -#define MGSTR_LIBVO_MGA_ResolutionTooHigh "[MGA] La risoluzione del sorgente ha almeno una delle due dimensioni maggiore di 1023x1023. Per favore ridimensiona via software o usa -lavdopts lowres=1\n" -#define MGSTR_LIBVO_MGA_mgavidVersionMismatch "[MGA] incongruenza tra le versioni del driver mga_vid del kernel (%u) e di MPlayer (%u)\n" +#define MSGTR_LIBVO_MGA_ResolutionTooHigh "[MGA] La risoluzione del sorgente ha almeno una delle due dimensioni maggiore di 1023x1023. Per favore ridimensiona via software o usa -lavdopts lowres=1\n" +#define MSGTR_LIBVO_MGA_mgavidVersionMismatch "[MGA] incongruenza tra le versioni del driver mga_vid del kernel (%u) e di MPlayer (%u)\n" // libvo/vesa_lvo.c #define MSGTR_LIBVO_VESA_ThisBranchIsNoLongerSupported "[VESA_LVO] Questo branch non è più supportato.\n[VESA_LVO] Per favore usa al suo posto -vo vesa:vidix.\n" diff --git a/help/help_mp-pl.h b/help/help_mp-pl.h index 7bd652881e..7d09950edb 100644 --- a/help/help_mp-pl.h +++ b/help/help_mp-pl.h @@ -1575,7 +1575,7 @@ static char help_text[]= #define MSGTR_LIBVO_MGA_InvalidOutputFormat "[MGA] niepoprawny format wyjściowy %0X\n" #define MSGTR_LIBVO_MGA_IncompatibleDriverVersion "[MGA] Wersja Twojego sterownika mga_vid jest niekompatybilna z tą wersją MPlayera!\n" #define MSGTR_LIBVO_MGA_CouldntOpen "[MGA] Nie mogłem otworzyć: %s\n" -#define MGSTR_LIBVO_MGA_ResolutionTooHigh "[MGA] Żródłowa rozdzielczość jest co najmniej o wymiar większa niż 1023x1023. Proszę przeskaluj programowo lub użyj -lavdopts lowres=1\n" +#define MSGTR_LIBVO_MGA_ResolutionTooHigh "[MGA] Żródłowa rozdzielczość jest co najmniej o wymiar większa niż 1023x1023. Proszę przeskaluj programowo lub użyj -lavdopts lowres=1\n" // libvo/vesa_lvo.c diff --git a/help/help_mp-ru.h b/help/help_mp-ru.h index 7297944824..268f53f3eb 100644 --- a/help/help_mp-ru.h +++ b/help/help_mp-ru.h @@ -950,8 +950,8 @@ static char help_text[]= #define MSGTR_LIBVO_MGA_InvalidOutputFormat "[MGA] неверный выходной формат %0X\n" #define MSGTR_LIBVO_MGA_IncompatibleDriverVersion "[MGA] Версия вашего драйвера mga_vid несовместима с этой версией MPlayer!\n" #define MSGTR_LIBVO_MGA_CouldntOpen "[MGA] Не могу открыть: %s\n" -#define MGSTR_LIBVO_MGA_ResolutionTooHigh "[MGA] Разрешение источника, по крайней мере в одном измерении, больше чем\n1023x1023. Перемасштабируйте программно или используйте -lavdopts lowres=1\n" -#define MGSTR_LIBVO_MGA_mgavidVersionMismatch "[MGA] несоответствие версий драйвера mga_vid ядра (%u) и MPlayer (%u)\n" +#define MSGTR_LIBVO_MGA_ResolutionTooHigh "[MGA] Разрешение источника, по крайней мере в одном измерении, больше чем\n1023x1023. Перемасштабируйте программно или используйте -lavdopts lowres=1\n" +#define MSGTR_LIBVO_MGA_mgavidVersionMismatch "[MGA] несоответствие версий драйвера mga_vid ядра (%u) и MPlayer (%u)\n" // libvo/vo_null.c #define MSGTR_LIBVO_NULL_UnknownSubdevice "[VO_NULL] Неизвестное подустройство: %s.\n" diff --git a/help/help_mp-tr.h b/help/help_mp-tr.h index 22488319fd..8e8d105a87 100644 --- a/help/help_mp-tr.h +++ b/help/help_mp-tr.h @@ -1703,7 +1703,7 @@ static char help_text[]= #define MSGTR_LIBVO_MGA_InvalidOutputFormat "[MGA] Geçersiz çıkış biçimi %0X\n" #define MSGTR_LIBVO_MGA_IncompatibleDriverVersion "[MGA] mga_video sürücünüzün sürümü bu MPlayer sürümüyle bağdaşmıyor!\n" #define MSGTR_LIBVO_MGA_CouldntOpen "[MGA] Açılamadı: %s\n" -#define MGSTR_LIBVO_MGA_ResolutionTooHigh "[MGA] kaynak çözünürlüğün en azιndan bir boyutu 1023x1023'ten daha büyükütür. Yazılımla düzteliniz ya da -lavdopts lowres=1 kulanınız\n" +#define MSGTR_LIBVO_MGA_ResolutionTooHigh "[MGA] kaynak çözünürlüğün en azιndan bir boyutu 1023x1023'ten daha büyükütür. Yazılımla düzteliniz ya da -lavdopts lowres=1 kulanınız\n" // libvo/vesa_lvo.c diff --git a/help/help_mp-zh_CN.h b/help/help_mp-zh_CN.h index f7305fef7a..9bca228cb0 100644 --- a/help/help_mp-zh_CN.h +++ b/help/help_mp-zh_CN.h @@ -948,8 +948,8 @@ static char help_text[]= #define MSGTR_LIBVO_MGA_InvalidOutputFormat "[MGA] 无效的输出格式 %0X\n" #define MSGTR_LIBVO_MGA_IncompatibleDriverVersion "[MGA] 你的 mga_vid 驱动版本与 MPlayer 的版本不兼容!\n" #define MSGTR_LIBVO_MGA_CouldntOpen "[MGA] 打不开: %s\n" -#define MGSTR_LIBVO_MGA_ResolutionTooHigh "[MGA] 原分辨率至少有一维超过了 1023x1023。用软件或用 -lavdopts lowres=1 重新缩放\n" -#define MGSTR_LIBVO_MGA_mgavidVersionMismatch "[MGA] 内核（%u）与 MPlayer（%u）mga_vid 驱动版本号不符。\n" +#define MSGTR_LIBVO_MGA_ResolutionTooHigh "[MGA] 原分辨率至少有一维超过了 1023x1023。用软件或用 -lavdopts lowres=1 重新缩放\n" +#define MSGTR_LIBVO_MGA_mgavidVersionMismatch "[MGA] 内核（%u）与 MPlayer（%u）mga_vid 驱动版本号不符。\n" // vo_null.c #define MSGTR_LIBVO_NULL_UnknownSubdevice "[VO_NULL] 未知子设备: %s。\n" diff --git a/help/help_mp-zh_TW.h b/help/help_mp-zh_TW.h index d89c1701b9..0d8770eaac 100644 --- a/help/help_mp-zh_TW.h +++ b/help/help_mp-zh_TW.h @@ -1669,7 +1669,7 @@ static char help_text[]= #define MSGTR_LIBVO_MGA_InvalidOutputFormat "[MGA] 無效的輸出格式 %0X\n" #define MSGTR_LIBVO_MGA_IncompatibleDriverVersion "[MGA] 你的 mga_vid 驅動版本與 MPlayer 的版本不兼容!\n" #define MSGTR_LIBVO_MGA_CouldntOpen "[MGA] 打不開: %s\n" -#define MGSTR_LIBVO_MGA_ResolutionTooHigh "[MGA] 原分辨率至少有一維大于 1023x1023。請用軟件或用 -lavdopts lowres=1 重新縮放\n" +#define MSGTR_LIBVO_MGA_ResolutionTooHigh "[MGA] 原分辨率至少有一維大于 1023x1023。請用軟件或用 -lavdopts lowres=1 重新縮放\n" // libvo/vesa_lvo.c diff --git a/input/input.c b/input/input.c index 3e917afa49..1f1d4a6ebf 100644 --- a/input/input.c +++ b/input/input.c @@ -1,3 +1,21 @@ +/* + * This file is part of MPlayer. + * + * MPlayer 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 of the License, or + * (at your option) any later version. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + #include "config.h" #include <stdlib.h> diff --git a/input/input.h b/input/input.h index f033c31f0c..47f2560348 100644 --- a/input/input.h +++ b/input/input.h @@ -1,3 +1,21 @@ +/* + * This file is part of MPlayer. + * + * MPlayer 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 of the License, or + * (at your option) any later version. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + #ifndef MPLAYER_INPUT_H #define MPLAYER_INPUT_H diff --git a/input/joystick.c b/input/joystick.c index d50b8678a2..b49214c95c 100644 --- a/input/joystick.c +++ b/input/joystick.c @@ -1,3 +1,20 @@ +/* + * This file is part of MPlayer. + * + * MPlayer 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 of the License, or + * (at your option) any later version. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ #include "config.h" diff --git a/input/joystick.h b/input/joystick.h index b318e9ec14..996f0fed21 100644 --- a/input/joystick.h +++ b/input/joystick.h @@ -1,3 +1,21 @@ +/* + * This file is part of MPlayer. + * + * MPlayer 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 of the License, or + * (at your option) any later version. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + #ifndef MPLAYER_JOYSTICK_H #define MPLAYER_JOYSTICK_H diff --git a/input/lirc.c b/input/lirc.c index e76ee85b9a..fec56f4828 100644 --- a/input/lirc.c +++ b/input/lirc.c @@ -1,3 +1,20 @@ +/* + * This file is part of MPlayer. + * + * MPlayer 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 of the License, or + * (at your option) any later version. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ #include "config.h" diff --git a/input/lirc.h b/input/lirc.h index cd1513dc53..22ba92cc6c 100644 --- a/input/lirc.h +++ b/input/lirc.h @@ -1,3 +1,21 @@ +/* + * This file is part of MPlayer. + * + * MPlayer 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 of the License, or + * (at your option) any later version. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + #ifndef MPLAYER_LIRC_H #define MPLAYER_LIRC_H diff --git a/input/mouse.h b/input/mouse.h index e2e6f53fe8..789cac96c3 100644 --- a/input/mouse.h +++ b/input/mouse.h @@ -1,3 +1,21 @@ +/* + * This file is part of MPlayer. + * + * MPlayer 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 of the License, or + * (at your option) any later version. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + #ifndef MPLAYER_MOUSE_H #define MPLAYER_MOUSE_H diff --git a/libmenu/menu.c b/libmenu/menu.c index ae69de4160..9fd9a40729 100644 --- a/libmenu/menu.c +++ b/libmenu/menu.c @@ -1,3 +1,20 @@ +/* + * This file is part of MPlayer. + * + * MPlayer 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 of the License, or + * (at your option) any later version. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ #include "config.h" #include "mp_msg.h" diff --git a/libmenu/menu.h b/libmenu/menu.h index 3a3f8fd6c3..58a3df4c46 100644 --- a/libmenu/menu.h +++ b/libmenu/menu.h @@ -1,3 +1,21 @@ +/* + * This file is part of MPlayer. + * + * MPlayer 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 of the License, or + * (at your option) any later version. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + #ifndef MPLAYER_MENU_H #define MPLAYER_MENU_H diff --git a/libmenu/menu_cmdlist.c b/libmenu/menu_cmdlist.c index 5b450ef6f1..b2faa0b583 100644 --- a/libmenu/menu_cmdlist.c +++ b/libmenu/menu_cmdlist.c @@ -1,3 +1,20 @@ +/* + * This file is part of MPlayer. + * + * MPlayer 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 of the License, or + * (at your option) any later version. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ #include "config.h" #include "mp_msg.h" diff --git a/libmenu/menu_console.c b/libmenu/menu_console.c index 4b99412e1e..bba777cc4d 100644 --- a/libmenu/menu_console.c +++ b/libmenu/menu_console.c @@ -1,3 +1,20 @@ +/* + * This file is part of MPlayer. + * + * MPlayer 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 of the License, or + * (at your option) any later version. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ #include "config.h" #include "mp_msg.h" diff --git a/libmenu/menu_dvbin.c b/libmenu/menu_dvbin.c index 5b007afadd..769eacf721 100644 --- a/libmenu/menu_dvbin.c +++ b/libmenu/menu_dvbin.c @@ -1,3 +1,20 @@ +/* + * This file is part of MPlayer. + * + * MPlayer 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 of the License, or + * (at your option) any later version. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ #include <stdlib.h> #include <stdio.h> diff --git a/libmenu/menu_filesel.c b/libmenu/menu_filesel.c index 187413832d..346937dc87 100644 --- a/libmenu/menu_filesel.c +++ b/libmenu/menu_filesel.c @@ -1,3 +1,20 @@ +/* + * This file is part of MPlayer. + * + * MPlayer 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 of the License, or + * (at your option) any later version. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ #include <stdlib.h> #include <stdio.h> diff --git a/libmenu/menu_list.c b/libmenu/menu_list.c index c49bbd6e4d..c896ac0afa 100644 --- a/libmenu/menu_list.c +++ b/libmenu/menu_list.c @@ -1,3 +1,20 @@ +/* + * This file is part of MPlayer. + * + * MPlayer 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 of the License, or + * (at your option) any later version. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ #include <stdlib.h> #include <stdio.h> diff --git a/libmenu/menu_list.h b/libmenu/menu_list.h index af5a9747da..44e5ed8e14 100644 --- a/libmenu/menu_list.h +++ b/libmenu/menu_list.h @@ -1,3 +1,21 @@ +/* + * This file is part of MPlayer. + * + * MPlayer 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 of the License, or + * (at your option) any later version. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + #ifndef MPLAYER_MENU_LIST_H #define MPLAYER_MENU_LIST_H diff --git a/libmenu/menu_param.c b/libmenu/menu_param.c index 8afd084b64..1ab7a59592 100644 --- a/libmenu/menu_param.c +++ b/libmenu/menu_param.c @@ -1,3 +1,20 @@ +/* + * This file is part of MPlayer. + * + * MPlayer 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 of the License, or + * (at your option) any later version. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ #include "config.h" diff --git a/libmenu/menu_pt.c b/libmenu/menu_pt.c index 8540410a70..5c408361c7 100644 --- a/libmenu/menu_pt.c +++ b/libmenu/menu_pt.c @@ -1,3 +1,20 @@ +/* + * This file is part of MPlayer. + * + * MPlayer 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 of the License, or + * (at your option) any later version. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ #include <stdlib.h> #include <stdio.h> diff --git a/libmenu/menu_txt.c b/libmenu/menu_txt.c index c2e03068b3..74648ff7c7 100644 --- a/libmenu/menu_txt.c +++ b/libmenu/menu_txt.c @@ -1,3 +1,20 @@ +/* + * This file is part of MPlayer. + * + * MPlayer 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 of the License, or + * (at your option) any later version. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ #include "config.h" #include "mp_msg.h" diff --git a/libmenu/vf_menu.c b/libmenu/vf_menu.c index c2c7f127a5..f5ae5ea70d 100644 --- a/libmenu/vf_menu.c +++ b/libmenu/vf_menu.c @@ -1,3 +1,20 @@ +/* + * This file is part of MPlayer. + * + * MPlayer 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 of the License, or + * (at your option) any later version. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ #include "config.h" #include "mp_msg.h" diff --git a/libmpcodecs/ad_faad.c b/libmpcodecs/ad_faad.c index 4da0bebc0f..a7b9fbf84e 100644 --- a/libmpcodecs/ad_faad.c +++ b/libmpcodecs/ad_faad.c @@ -1,7 +1,23 @@ -/* ad_faad.c - MPlayer AAC decoder using libfaad2 - * This file is part of MPlayer, see http://mplayerhq.hu/ for info. - * (c)2002 by Felix Buenemann <atmosfear at users.sourceforge.net> - * File licensed under the GPL, see http://www.fsf.org/ for more info. +/* + * MPlayer AAC decoder using libfaad2 + * + * Copyright (C) 2002 Felix Buenemann <atmosfear at users.sourceforge.net> + * + * This file is part of MPlayer. + * + * MPlayer 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 of the License, or + * (at your option) any later version. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include <stdio.h> diff --git a/libmpcodecs/ve_qtvideo.c b/libmpcodecs/ve_qtvideo.c index fc9e1ff531..9e890a348b 100644 --- a/libmpcodecs/ve_qtvideo.c +++ b/libmpcodecs/ve_qtvideo.c @@ -1,6 +1,24 @@ -/*qt video encoder using win32 libs - released under gnu gpl - (C)Sascha Sommer */ +/* + * QT video encoder using Win32 libs + * + * Copyright (C) 2002 Sascha Sommer + * + * This file is part of MPlayer. + * + * MPlayer 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 of the License, or + * (at your option) any later version. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ #define MAX_IDSIZE 0x6F diff --git a/libmpdemux/demux_nut.c b/libmpdemux/demux_nut.c index 53d80b0f68..8fd46e6921 100644 --- a/libmpdemux/demux_nut.c +++ b/libmpdemux/demux_nut.c @@ -14,9 +14,9 @@ typedef struct { int last_pts; // FIXME - nut_context_t * nut; - nut_stream_header_t * s; -} nut_priv_t; + nut_context_tt * nut; + nut_stream_header_tt * s; +} nut_priv_tt; static size_t mp_read(void * h, size_t len, uint8_t * buf) { stream_t * stream = (stream_t*)h; @@ -64,8 +64,7 @@ static int nut_check_file(demuxer_t * demuxer) { } static demuxer_t * demux_open_nut(demuxer_t * demuxer) { - extern int index_mode; - nut_demuxer_opts_t dopts = { + nut_demuxer_opts_tt dopts = { .input = { .priv = demuxer->stream, .seek = mp_seek, @@ -77,9 +76,9 @@ static demuxer_t * demux_open_nut(demuxer_t * demuxer) { .read_index = index_mode, .cache_syncpoints = 1, }; - nut_priv_t * priv = demuxer->priv = calloc(1, sizeof(nut_priv_t)); - nut_context_t * nut = priv->nut = nut_demuxer_init(&dopts); - nut_stream_header_t * s; + nut_priv_tt * priv = demuxer->priv = calloc(1, sizeof(nut_priv_tt)); + nut_context_tt * nut = priv->nut = nut_demuxer_init(&dopts); + nut_stream_header_tt * s; int ret; int i; @@ -97,8 +96,8 @@ static demuxer_t * demux_open_nut(demuxer_t * demuxer) { calloc(sizeof(WAVEFORMATEX) + s[i].codec_specific_len, 1); sh_audio_t* sh_audio = new_sh_audio(demuxer, i); - mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_AudioID, "nut", i); int j; + mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_AudioID, "nut", i); sh_audio->wf= wf; sh_audio->ds = demuxer->audio; sh_audio->audio.dwSampleSize = 0; // FIXME @@ -133,8 +132,8 @@ static demuxer_t * demux_open_nut(demuxer_t * demuxer) { calloc(sizeof(BITMAPINFOHEADER) + s[i].codec_specific_len, 1); sh_video_t * sh_video = new_sh_video(demuxer, i); - mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_VideoID, "nut", i); int j; + mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_VideoID, "nut", i); sh_video->bih = bih; sh_video->ds = demuxer->video; @@ -176,11 +175,11 @@ static demuxer_t * demux_open_nut(demuxer_t * demuxer) { } static int demux_nut_fill_buffer(demuxer_t * demuxer, demux_stream_t * dsds) { - nut_priv_t * priv = demuxer->priv; - nut_context_t * nut = priv->nut; + nut_priv_tt * priv = demuxer->priv; + nut_context_tt * nut = priv->nut; demux_packet_t *dp; demux_stream_t *ds; - nut_packet_t pd; + nut_packet_tt pd; int ret; double pts; @@ -238,9 +237,8 @@ static int demux_nut_fill_buffer(demuxer_t * demuxer, demux_stream_t * dsds) { } static void demux_seek_nut(demuxer_t * demuxer, float time_pos, float audio_delay, int flags) { - nut_context_t * nut = ((nut_priv_t*)demuxer->priv)->nut; - nut_priv_t * priv = demuxer->priv; - sh_audio_t * sh_audio = demuxer->audio->sh; + nut_context_tt * nut = ((nut_priv_tt*)demuxer->priv)->nut; + nut_priv_tt * priv = demuxer->priv; int nutflags = 0; int ret; const int tmp[] = { 0, -1 }; @@ -258,12 +256,11 @@ static void demux_seek_nut(demuxer_t * demuxer, float time_pos, float audio_dela while ((ret = nut_seek(nut, time_pos, nutflags, tmp)) == NUT_ERR_EAGAIN); priv->last_pts = -1; if (ret) mp_msg(MSGT_HEADER, MSGL_ERR, "NUT error: %s\n", nut_error(ret)); - if (sh_audio) resync_audio_stream(sh_audio); demuxer->filepos = stream_tell(demuxer->stream); } static int demux_control_nut(demuxer_t * demuxer, int cmd, void * arg) { - nut_priv_t * priv = demuxer->priv; + nut_priv_tt * priv = demuxer->priv; switch (cmd) { case DEMUXER_CTRL_GET_TIME_LENGTH: *((double *)arg) = priv->s[0].max_pts * @@ -282,7 +279,7 @@ static int demux_control_nut(demuxer_t * demuxer, int cmd, void * arg) { } static void demux_close_nut(demuxer_t *demuxer) { - nut_priv_t * priv = demuxer->priv; + nut_priv_tt * priv = demuxer->priv; if (!priv) return; nut_demuxer_uninit(priv->nut); free(demuxer->priv); diff --git a/libmpdemux/demux_vqf.c b/libmpdemux/demux_vqf.c index 013929a3bc..3aefa02dd9 100644 --- a/libmpdemux/demux_vqf.c +++ b/libmpdemux/demux_vqf.c @@ -3,6 +3,7 @@ #include <stdlib.h> #include <stdio.h> #include "libavutil/common.h" +#include "libavutil/intreadwrite.h" #include "mpbswap.h" #include "stream/stream.h" @@ -50,19 +51,22 @@ static demuxer_t* demux_open_vqf(demuxer_t* demuxer) { unsigned chunk_size; hi->size=chunk_size=stream_read_dword(s); /* include itself */ stream_read(s,chunk_id,4); - if(*((uint32_t *)&chunk_id[0])==mmioFOURCC('C','O','M','M')) + if (chunk_size < 8) return NULL; + chunk_size -= 8; + if(AV_RL32(chunk_id)==mmioFOURCC('C','O','M','M')) { - char buf[chunk_size-8]; + char buf[BUFSIZ]; unsigned i,subchunk_size; - if(stream_read(s,buf,chunk_size-8)!=chunk_size-8) return NULL; + if (chunk_size > sizeof(buf) || chunk_size < 20) return NULL; + if(stream_read(s,buf,chunk_size)!=chunk_size) return NULL; i=0; - subchunk_size=be2me_32(*((uint32_t *)&buf[0])); - hi->channelMode=be2me_32(*((uint32_t *)&buf[4])); + subchunk_size = AV_RB32(buf); + hi->channelMode = AV_RB32(buf + 4); w->nChannels=sh_audio->channels=hi->channelMode+1; /*0-mono;1-stereo*/ - hi->bitRate=be2me_32(*((uint32_t *)&buf[8])); + hi->bitRate = AV_RB32(buf + 8); sh_audio->i_bps=hi->bitRate*1000/8; /* bitrate kbit/s */ w->nAvgBytesPerSec = sh_audio->i_bps; - hi->samplingRate=be2me_32(*((uint32_t *)&buf[12])); + hi->samplingRate = AV_RB32(buf + 12); switch(hi->samplingRate){ case 44: w->nSamplesPerSec=44100; @@ -78,21 +82,23 @@ static demuxer_t* demux_open_vqf(demuxer_t* demuxer) { break; } sh_audio->samplerate=w->nSamplesPerSec; - hi->securityLevel=be2me_32(*((uint32_t *)&buf[16])); + hi->securityLevel = AV_RB32(buf + 16); w->nBlockAlign = 0; sh_audio->samplesize = 4; w->wBitsPerSample = 8*sh_audio->samplesize; w->cbSize = 0; + if (subchunk_size > chunk_size - 4) continue; i+=subchunk_size+4; - while(i<chunk_size-8) + while(i + 8 < chunk_size) { unsigned slen,sid; - char sdata[chunk_size]; - sid=*((uint32_t *)&buf[i]); i+=4; - slen=be2me_32(*((uint32_t *)&buf[i])); i+=4; + char sdata[BUFSIZ]; + sid = AV_RL32(buf + i); i+=4; + slen = AV_RB32(buf + i); i+=4; + if (slen > sizeof(sdata) - 1 || slen > chunk_size - i) break; if(sid==mmioFOURCC('D','S','I','Z')) { - hi->Dsiz=be2me_32(*((uint32_t *)&buf[i])); + hi->Dsiz=AV_RB32(buf + i); continue; /* describes the same info as size of DATA chunk */ } memcpy(sdata,&buf[i],slen); sdata[slen]=0; i+=slen; @@ -138,18 +144,18 @@ static demuxer_t* demux_open_vqf(demuxer_t* demuxer) { } } else - if(*((uint32_t *)&chunk_id[0])==mmioFOURCC('D','A','T','A')) + if(AV_RL32(chunk_id)==mmioFOURCC('D','A','T','A')) { demuxer->movi_start=stream_tell(s); - demuxer->movi_end=demuxer->movi_start+chunk_size-8; + demuxer->movi_end=demuxer->movi_start+chunk_size; mp_msg(MSGT_DEMUX, MSGL_V, "Found data at %"PRIX64" size %"PRIu64"\n",demuxer->movi_start,demuxer->movi_end); /* Done! play it */ break; } else { - mp_msg(MSGT_DEMUX, MSGL_V, "Unhandled chunk '%c%c%c%c' %u bytes\n",((char *)&chunk_id)[0],((char *)&chunk_id)[1],((char *)&chunk_id)[2],((char *)&chunk_id)[3],chunk_size); - stream_skip(s,chunk_size-8); /*unknown chunk type */ + mp_msg(MSGT_DEMUX, MSGL_V, "Unhandled chunk '%c%c%c%c' %u bytes\n",chunk_id[0],chunk_id[1],chunk_id[2],chunk_id[3],chunk_size); + stream_skip(s,chunk_size); /*unknown chunk type */ } } diff --git a/libmpdemux/parse_mp4.c b/libmpdemux/parse_mp4.c index 02b00341c2..6e4441a17c 100644 --- a/libmpdemux/parse_mp4.c +++ b/libmpdemux/parse_mp4.c @@ -1,10 +1,26 @@ -/* parse_mp4.c - MP4 file format parser code - * This file is part of MPlayer, see http://mplayerhq.hu/ for info. - * (c)2002 by Felix Buenemann <atmosfear at users.sourceforge.net> - * File licensed under the GPL, see http://www.fsf.org/ for more info. +/* + * MP4 file format parser code + * + * Copyright (C) 2002 Felix Buenemann <atmosfear at users.sourceforge.net> * Code inspired by libmp4 from http://mpeg4ip.sourceforge.net/. + * + * This file is part of MPlayer. + * + * MPlayer 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 of the License, or + * (at your option) any later version. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - + #include <stdio.h> #include <inttypes.h> #ifdef HAVE_MALLOC_H diff --git a/libmpdemux/parse_mp4.h b/libmpdemux/parse_mp4.h index 585751c320..0591557b08 100644 --- a/libmpdemux/parse_mp4.h +++ b/libmpdemux/parse_mp4.h @@ -1,7 +1,24 @@ -/* parse_mp4.h - Headerfile for MP4 file format parser code - * This file is part of MPlayer, see http://mplayerhq.hu/ for info. - * (c)2002 by Felix Buenemann <atmosfear at users.sourceforge.net> - * File licensed under the GPL, see http://www.fsf.org/ for more info. +/* + * MP4 file format parser code + * + * Copyright (C) 2002 Felix Buenemann <atmosfear at users.sourceforge.net> + * Code inspired by libmp4 from http://mpeg4ip.sourceforge.net/. + * + * This file is part of MPlayer. + * + * MPlayer 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 of the License, or + * (at your option) any later version. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #ifndef MPLAYER_PARSE_MP4_H diff --git a/libswscale/rgb2rgb_template.c b/libswscale/rgb2rgb_template.c index ab82035044..ce76c5eb7e 100644 --- a/libswscale/rgb2rgb_template.c +++ b/libswscale/rgb2rgb_template.c @@ -2016,14 +2016,14 @@ static inline void RENAME(uyvytoyv12)(const uint8_t *src, uint8_t *ydst, uint8_t { #ifdef HAVE_MMX __asm__ volatile( - "xorl %%eax, %%eax \n\t" + "xor %%"REG_a", %%"REG_a" \n\t" "pcmpeqw %%mm7, %%mm7 \n\t" "psrlw $8, %%mm7 \n\t" // FF,00,FF,00... ASMALIGN(4) "1: \n\t" - PREFETCH" 64(%0, %%eax, 4) \n\t" - "movq (%0, %%eax, 4), %%mm0 \n\t" // UYVY UYVY(0) - "movq 8(%0, %%eax, 4), %%mm1 \n\t" // UYVY UYVY(4) + PREFETCH" 64(%0, %%"REG_a", 4) \n\t" + "movq (%0, %%"REG_a", 4), %%mm0 \n\t" // UYVY UYVY(0) + "movq 8(%0, %%"REG_a", 4), %%mm1 \n\t" // UYVY UYVY(4) "movq %%mm0, %%mm2 \n\t" // UYVY UYVY(0) "movq %%mm1, %%mm3 \n\t" // UYVY UYVY(4) "pand %%mm7, %%mm0 \n\t" // U0V0 U0V0(0) @@ -2033,10 +2033,10 @@ static inline void RENAME(uyvytoyv12)(const uint8_t *src, uint8_t *ydst, uint8_t "packuswb %%mm1, %%mm0 \n\t" // UVUV UVUV(0) "packuswb %%mm3, %%mm2 \n\t" // YYYY YYYY(0) - MOVNTQ" %%mm2, (%1, %%eax, 2) \n\t" + MOVNTQ" %%mm2, (%1, %%"REG_a", 2) \n\t" - "movq 16(%0, %%eax, 4), %%mm1 \n\t" // UYVY UYVY(8) - "movq 24(%0, %%eax, 4), %%mm2 \n\t" // UYVY UYVY(12) + "movq 16(%0, %%"REG_a", 4), %%mm1 \n\t" // UYVY UYVY(8) + "movq 24(%0, %%"REG_a", 4), %%mm2 \n\t" // UYVY UYVY(12) "movq %%mm1, %%mm3 \n\t" // UYVY UYVY(8) "movq %%mm2, %%mm4 \n\t" // UYVY UYVY(12) "pand %%mm7, %%mm1 \n\t" // U0V0 U0V0(8) @@ -2046,7 +2046,7 @@ static inline void RENAME(uyvytoyv12)(const uint8_t *src, uint8_t *ydst, uint8_t "packuswb %%mm2, %%mm1 \n\t" // UVUV UVUV(8) "packuswb %%mm4, %%mm3 \n\t" // YYYY YYYY(8) - MOVNTQ" %%mm3, 8(%1, %%eax, 2) \n\t" + MOVNTQ" %%mm3, 8(%1, %%"REG_a", 2) \n\t" "movq %%mm0, %%mm2 \n\t" // UVUV UVUV(0) "movq %%mm1, %%mm3 \n\t" // UVUV UVUV(8) @@ -2057,28 +2057,28 @@ static inline void RENAME(uyvytoyv12)(const uint8_t *src, uint8_t *ydst, uint8_t "packuswb %%mm1, %%mm0 \n\t" // VVVV VVVV(0) "packuswb %%mm3, %%mm2 \n\t" // UUUU UUUU(0) - MOVNTQ" %%mm0, (%3, %%eax) \n\t" - MOVNTQ" %%mm2, (%2, %%eax) \n\t" + MOVNTQ" %%mm0, (%3, %%"REG_a") \n\t" + MOVNTQ" %%mm2, (%2, %%"REG_a") \n\t" - "addl $8, %%eax \n\t" - "cmpl %4, %%eax \n\t" + "add $8, %%"REG_a" \n\t" + "cmp %4, %%"REG_a" \n\t" " jb 1b \n\t" ::"r"(src), "r"(ydst), "r"(udst), "r"(vdst), "g" (chromWidth) - : "memory", "%eax" + : "memory", "%"REG_a ); ydst += lumStride; src += srcStride; __asm__ volatile( - "xorl %%eax, %%eax \n\t" + "xor %%"REG_a", %%"REG_a" \n\t" ASMALIGN(4) "1: \n\t" - PREFETCH" 64(%0, %%eax, 4) \n\t" - "movq (%0, %%eax, 4), %%mm0 \n\t" // YUYV YUYV(0) - "movq 8(%0, %%eax, 4), %%mm1 \n\t" // YUYV YUYV(4) - "movq 16(%0, %%eax, 4), %%mm2 \n\t" // YUYV YUYV(8) - "movq 24(%0, %%eax, 4), %%mm3 \n\t" // YUYV YUYV(12) + PREFETCH" 64(%0, %%"REG_a", 4) \n\t" + "movq (%0, %%"REG_a", 4), %%mm0 \n\t" // YUYV YUYV(0) + "movq 8(%0, %%"REG_a", 4), %%mm1 \n\t" // YUYV YUYV(4) + "movq 16(%0, %%"REG_a", 4), %%mm2 \n\t" // YUYV YUYV(8) + "movq 24(%0, %%"REG_a", 4), %%mm3 \n\t" // YUYV YUYV(12) "psrlw $8, %%mm0 \n\t" // Y0Y0 Y0Y0(0) "psrlw $8, %%mm1 \n\t" // Y0Y0 Y0Y0(4) "psrlw $8, %%mm2 \n\t" // Y0Y0 Y0Y0(8) @@ -2086,15 +2086,15 @@ static inline void RENAME(uyvytoyv12)(const uint8_t *src, uint8_t *ydst, uint8_t "packuswb %%mm1, %%mm0 \n\t" // YYYY YYYY(0) "packuswb %%mm3, %%mm2 \n\t" // YYYY YYYY(8) - MOVNTQ" %%mm0, (%1, %%eax, 2) \n\t" - MOVNTQ" %%mm2, 8(%1, %%eax, 2) \n\t" + MOVNTQ" %%mm0, (%1, %%"REG_a", 2) \n\t" + MOVNTQ" %%mm2, 8(%1, %%"REG_a", 2) \n\t" - "addl $8, %%eax \n\t" - "cmpl %4, %%eax \n\t" + "add $8, %%"REG_a" \n\t" + "cmp %4, %%"REG_a" \n\t" " jb 1b \n\t" ::"r"(src), "r"(ydst), "r"(udst), "r"(vdst), "g" (chromWidth) - : "memory", "%eax" + : "memory", "%"REG_a ); #else long i; diff --git a/libvo/gl_common.h b/libvo/gl_common.h index 2fcb8568ad..1662c7a5d3 100644 --- a/libvo/gl_common.h +++ b/libvo/gl_common.h @@ -225,6 +225,9 @@ #ifndef GL_FLOAT_RGB32_NV #define GL_FLOAT_RGB32_NV 0x8889 #endif +#ifndef GL_UNPACK_CLIENT_STORAGE_APPLE +#define GL_UNPACK_CLIENT_STORAGE_APPLE 0x85B2 +#endif #ifndef GL_FRAGMENT_PROGRAM #define GL_FRAGMENT_PROGRAM 0x8804 #endif diff --git a/libvo/mga_common.c b/libvo/mga_common.c index 34eee958e3..ef2240ac15 100644 --- a/libvo/mga_common.c +++ b/libvo/mga_common.c @@ -381,7 +381,7 @@ static int mga_init(int width,int height,unsigned int format){ if(width > 1024 && height > 1024) { - mp_msg(MSGT_VO,MSGL_ERR, MGSTR_LIBVO_MGA_ResolutionTooHigh); + mp_msg(MSGT_VO,MSGL_ERR, MSGTR_LIBVO_MGA_ResolutionTooHigh); return -1; } else if(height <= 1024) { @@ -392,7 +392,7 @@ static int mga_init(int width,int height,unsigned int format){ if(mga_vid_config.card_type != MGA_G550) { // we don't have a G550, so our resolution is too high - mp_msg(MSGT_VO,MSGL_ERR, MGSTR_LIBVO_MGA_ResolutionTooHigh); + mp_msg(MSGT_VO,MSGL_ERR, MSGTR_LIBVO_MGA_ResolutionTooHigh); return -1; } else { // there is a deeper problem @@ -463,7 +463,7 @@ static int preinit(const char *vo_subdevice) ioctl(f,MGA_VID_GET_VERSION,&ver); if(MGA_VID_VERSION != ver) { - mp_msg(MSGT_VO, MSGL_ERR, MGSTR_LIBVO_MGA_mgavidVersionMismatch, ver, MGA_VID_VERSION); + mp_msg(MSGT_VO, MSGL_ERR, MSGTR_LIBVO_MGA_mgavidVersionMismatch, ver, MGA_VID_VERSION); return -1; } diff --git a/libvo/vo_direct3d.c b/libvo/vo_direct3d.c index b631f22f14..c32cdc663a 100644 --- a/libvo/vo_direct3d.c +++ b/libvo/vo_direct3d.c @@ -30,6 +30,8 @@ #include "aspect.h" #include "w32_common.h" #include "libavutil/common.h" +#include "font_load.h" +#include "sub.h" static const vo_info_t info = { @@ -71,8 +73,25 @@ static struct global_priv { IDirect3DSurface9 *d3d_surface; /**< Offscreen Direct3D Surface. MPlayer renders inside it. Uses colorspace priv->movie_src_fmt */ + IDirect3DTexture9 *d3d_texture_osd; /**< Direct3D Texture. Uses RGBA */ + IDirect3DTexture9 *d3d_texture_system; /**< Direct3D Texture. System memory + cannot lock a normal texture. Uses RGBA */ IDirect3DSurface9 *d3d_backbuf; /**< Video card's back buffer (used to display next frame) */ + int is_osd_populated; /**< 1 = OSD texture has something to display, + 0 = OSD texture is clear */ + int device_caps_power2_only; /**< 1 = texture sizes have to be power 2 + 0 = texture sizes can be anything */ + int device_caps_square_only; /**< 1 = textures have to be square + 0 = textures do not have to be square */ + int device_texture_sys; /**< 1 = device can texture from system memory + 0 = device requires shadow */ + int max_texture_width; /**< from the device capabilities */ + int max_texture_height; /**< from the device capabilities */ + int osd_width; /**< current width of the OSD */ + int osd_height; /**< current height of the OSD */ + int osd_texture_width; /**< current width of the OSD texture */ + int osd_texture_height; /**< current height of the OSD texture */ } *priv; typedef struct { @@ -100,6 +119,13 @@ static const struct_fmt_table fmt_table[] = { #define DISPLAY_FORMAT_TABLE_ENTRIES (sizeof(fmt_table) / sizeof(fmt_table[0])) +#define D3DFVF_MY_VERTEX (D3DFVF_XYZ | D3DFVF_TEX1) + +typedef struct { + float x, y, z; /* Position of vertex in 3D space */ + float tu, tv; /* Texture coordinates */ +} struct_vertex; + /**************************************************************************** * * * * @@ -127,7 +153,8 @@ static void calc_fs_rect(void) priv->fs_panscan_rect.right = priv->src_width; priv->fs_panscan_rect.top = 0; priv->fs_panscan_rect.bottom = priv->src_height; - if (!vo_fs) return; + if (!vo_fs) + return; // adjust for fullscreen aspect and panscan aspect(&scaled_width, &scaled_height, A_ZOOM); @@ -175,20 +202,26 @@ static void destroy_d3d_surfaces(void) mp_msg(MSGT_VO, MSGL_V, "<vo_direct3d>destroy_d3d_surfaces called\r\n"); /* Let's destroy the old (if any) D3D Surfaces */ - if (priv->locked_rect.pBits) { + if (priv->locked_rect.pBits) IDirect3DSurface9_UnlockRect(priv->d3d_surface); - priv->locked_rect.pBits = NULL; - } + priv->locked_rect.pBits = NULL; - if (priv->d3d_surface) { + if (priv->d3d_surface) IDirect3DSurface9_Release(priv->d3d_surface); - priv->d3d_surface = NULL; - } + priv->d3d_surface = NULL; - if (priv->d3d_backbuf) { + /* kill the OSD texture and its shadow copy */ + if (priv->d3d_texture_osd) + IDirect3DTexture9_Release(priv->d3d_texture_osd); + priv->d3d_texture_osd = NULL; + + if (priv->d3d_texture_system) + IDirect3DTexture9_Release(priv->d3d_texture_system); + priv->d3d_texture_system = NULL; + + if (priv->d3d_backbuf) IDirect3DSurface9_Release(priv->d3d_backbuf); - priv->d3d_backbuf = NULL; - } + priv->d3d_backbuf = NULL; } /** @brief Create D3D Offscreen and Backbuffer surfaces. @@ -196,6 +229,8 @@ static void destroy_d3d_surfaces(void) */ static int create_d3d_surfaces(void) { + int osd_width = vo_dwidth, osd_height = vo_dheight; + int tex_width = osd_width, tex_height = osd_height; mp_msg(MSGT_VO, MSGL_V, "<vo_direct3d><INFO>create_d3d_surfaces called.\n"); if (FAILED(IDirect3DDevice9_CreateOffscreenPlainSurface( @@ -213,6 +248,77 @@ static int create_d3d_surfaces(void) return 0; } + /* calculate the best size for the OSD depending on the factors from the device */ + if (priv->device_caps_power2_only) { + tex_width = 1; + tex_height = 1; + while (tex_width < osd_width ) tex_width <<= 1; + while (tex_height < osd_height) tex_height <<= 1; + } + if (priv->device_caps_square_only) + /* device only supports square textures */ + tex_width = tex_height = tex_width > tex_height ? tex_width : tex_height; + // better round up to a multiple of 16 + tex_width = (tex_width + 15) & ~15; + tex_height = (tex_height + 15) & ~15; + + // make sure we respect the size limits without breaking aspect or pow2-requirements + while (tex_width > priv->max_texture_width || tex_height > priv->max_texture_height) { + osd_width >>= 1; + osd_height >>= 1; + tex_width >>= 1; + tex_height >>= 1; + } + + priv->osd_width = osd_width; + priv->osd_height = osd_height; + priv->osd_texture_width = tex_width; + priv->osd_texture_height = tex_height; + + mp_msg(MSGT_VO, MSGL_V, "<vo_direct3d><INFO>surface (%d, %d) requested = (%d, %d)\n", + vo_dwidth, vo_dheight, priv->osd_texture_width, priv->osd_texture_height); + + /* create OSD */ + if (FAILED(IDirect3DDevice9_CreateTexture(priv->d3d_device, + priv->osd_texture_width, + priv->osd_texture_height, + 1, + D3DUSAGE_DYNAMIC, + D3DFMT_A8L8, + D3DPOOL_SYSTEMMEM, + &priv->d3d_texture_system, + NULL))) { + mp_msg(MSGT_VO,MSGL_ERR, + "<vo_direct3d><INFO>IDirect3DDevice9_CreateTexture Failed (d3d_texture_system).\n"); + return 0; + } + + if (!priv->device_texture_sys) { + /* only create if we need a shadow version on the external device */ + if (FAILED(IDirect3DDevice9_CreateTexture(priv->d3d_device, + priv->osd_texture_width, + priv->osd_texture_height, + 1, + D3DUSAGE_DYNAMIC, + D3DFMT_A8L8, + D3DPOOL_DEFAULT, + &priv->d3d_texture_osd, + NULL))) { + mp_msg(MSGT_VO,MSGL_ERR, + "<vo_direct3d><INFO>IDirect3DDevice9_CreateTexture Failed (d3d_texture_osd).\n"); + return 0; + } + } + + /* setup default renderstate */ + IDirect3DDevice9_SetRenderState(priv->d3d_device, D3DRS_SRCBLEND, D3DBLEND_ONE); + IDirect3DDevice9_SetRenderState(priv->d3d_device, D3DRS_DESTBLEND, D3DBLEND_INVSRCALPHA); + IDirect3DDevice9_SetRenderState(priv->d3d_device, D3DRS_ALPHAFUNC, D3DCMP_GREATER); + IDirect3DDevice9_SetRenderState(priv->d3d_device, D3DRS_ALPHAREF, (DWORD)0x0); + IDirect3DDevice9_SetRenderState(priv->d3d_device, D3DRS_LIGHTING, FALSE); + IDirect3DDevice9_SetSamplerState(priv->d3d_device, 0, D3DSAMP_MINFILTER, D3DTEXF_LINEAR); + IDirect3DDevice9_SetSamplerState(priv->d3d_device, 0, D3DSAMP_MAGFILTER, D3DTEXF_LINEAR); + return 1; } @@ -298,10 +404,9 @@ static int reconfigure_d3d(void) destroy_d3d_surfaces(); /* Destroy the D3D Device */ - if (priv->d3d_device) { + if (priv->d3d_device) IDirect3DDevice9_Release(priv->d3d_device); - priv->d3d_device = NULL; - } + priv->d3d_device = NULL; /* Stop the whole Direct3D */ IDirect3D9_Release(priv->d3d_handle); @@ -352,6 +457,13 @@ static int resize_d3d(void) calc_fs_rect(); +#ifdef CONFIG_FREETYPE + // font needs to be adjusted + force_load_font = 1; +#endif + // OSD needs to be drawn fresh for new size + vo_osd_changed(OSDTYPE_OSD); + return 1; } @@ -364,16 +476,16 @@ static void uninit_d3d(void) destroy_d3d_surfaces(); /* Destroy the D3D Device */ - if (priv->d3d_device) { + if (priv->d3d_device) IDirect3DDevice9_Release(priv->d3d_device); - priv->d3d_device = NULL; - } + priv->d3d_device = NULL; /* Stop the whole D3D. */ if (priv->d3d_handle) { mp_msg(MSGT_VO, MSGL_V, "<vo_direct3d>Calling IDirect3D9_Release\r\n"); IDirect3D9_Release(priv->d3d_handle); } + priv->d3d_handle = NULL; } /** @brief Render a frame on the screen. @@ -470,7 +582,7 @@ static int query_format(uint32_t movie_fmt) mp_msg(MSGT_VO, MSGL_V, "<vo_direct3d>Accepted image format: %s\n", vo_format_name(fmt_table[i].mplayer_fmt)); return (VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW - /*| VFCAP_OSD*/ | VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN); + | VFCAP_OSD | VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN); } } @@ -501,6 +613,9 @@ static int query_format(uint32_t movie_fmt) static int preinit(const char *arg) { D3DDISPLAYMODE disp_mode; + D3DCAPS9 disp_caps; + DWORD texture_caps; + DWORD dev_caps; /* Set to zero all global variables. */ priv = calloc(1, sizeof(struct global_priv)); @@ -533,6 +648,31 @@ static int preinit(const char *arg) mp_msg(MSGT_VO, MSGL_V, "disp_mode.Width %d, disp_mode.Height %d\n", disp_mode.Width, disp_mode.Height); + if (FAILED(IDirect3D9_GetDeviceCaps(priv->d3d_handle, + D3DADAPTER_DEFAULT, + D3DDEVTYPE_HAL, + &disp_caps))) { + mp_msg(MSGT_VO, MSGL_ERR, "<vo_direct3d>Could not read display capabilities\n"); + return -1; + } + + /* Store relevant information reguarding caps of device */ + texture_caps = disp_caps.TextureCaps; + dev_caps = disp_caps.DevCaps; + priv->device_caps_power2_only = (texture_caps & D3DPTEXTURECAPS_POW2) && + !(texture_caps & D3DPTEXTURECAPS_NONPOW2CONDITIONAL); + priv->device_caps_square_only = texture_caps & D3DPTEXTURECAPS_SQUAREONLY; + priv->device_texture_sys = dev_caps & D3DDEVCAPS_TEXTURESYSTEMMEMORY; + priv->max_texture_width = disp_caps.MaxTextureWidth; + priv->max_texture_height = disp_caps.MaxTextureHeight; + + mp_msg(MSGT_VO, MSGL_V, "<vo_direct3d>device_caps_power2_only %d, device_caps_square_only %d\n" + "<vo_direct3d>device_texture_sys %d\n" + "<vo_direct3d>max_texture_width %d, max_texture_height %d\n", + priv->device_caps_power2_only, priv->device_caps_square_only, + priv->device_texture_sys, priv->max_texture_width, + priv->max_texture_height); + /* w32_common framework call. Configures window on the screen, gets * fullscreen dimensions and does other useful stuff. */ @@ -632,10 +772,9 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, destroy_d3d_surfaces(); /* Destroy the D3D Device */ - if (priv->d3d_device) { + if (priv->d3d_device) IDirect3DDevice9_Release(priv->d3d_device); - priv->d3d_device = NULL; - } + priv->d3d_device = NULL; if (!configure_d3d()) return VO_ERROR; @@ -645,7 +784,6 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, /** @brief libvo Callback: Flip next already drawn frame on the * screen. - * @return N/A */ static void flip_page(void) { @@ -667,16 +805,8 @@ static void flip_page(void) } } -/** @brief libvo Callback: Draw OSD/Subtitles, - * @return N/A - */ -static void draw_osd(void) -{ -} - /** @brief libvo Callback: Uninitializes all pointers and closes * all D3D related stuff, - * @return N/A */ static void uninit(void) { @@ -689,7 +819,6 @@ static void uninit(void) } /** @brief libvo Callback: Handles video window events. - * @return N/A */ static void check_events(void) { @@ -763,10 +892,145 @@ static int draw_slice(uint8_t *src[], int stride[], int w,int h,int x,int y ) } /** @brief libvo Callback: Unused function - * @return N/A */ static int draw_frame(uint8_t *src[]) { mp_msg(MSGT_VO, MSGL_V, "<vo_direct3d>draw_frame called\n"); return VO_FALSE; } + +/** @brief Maps MPlayer alpha to D3D + * 0x0 -> transparent and discarded by alpha test + * 0x1 -> 0xFF to become opaque + * other alpha values are inverted +1 (2 = -2) + * These values are then inverted again with + the texture filter D3DBLEND_INVSRCALPHA + */ +void vo_draw_alpha_l8a8(int w, int h, unsigned char* src, unsigned char *srca, + int srcstride, unsigned char* dstbase, int dststride) +{ + int y; + for (y = 0; y < h; y++) { + unsigned short *dst = (unsigned short*)dstbase; + int x; + for (x = 0; x < w; x++) { + dst[x] = (-srca[x] << 8) | src[x]; + } + src += srcstride; + srca += srcstride; + dstbase += dststride; + } +} + +/** @brief Callback function to render the OSD to the texture + */ +static void draw_alpha(int x0, int y0, int w, int h, unsigned char *src, + unsigned char *srca, int stride) +{ + D3DLOCKED_RECT locked_rect; /**< Offscreen surface we lock in order + to copy MPlayer's frame inside it.*/ + + if (FAILED(IDirect3DTexture9_LockRect(priv->d3d_texture_system, 0, + &locked_rect, NULL, 0))) { + mp_msg(MSGT_VO,MSGL_ERR,"<vo_direct3d>IDirect3DTexture9_LockRect failure.\n"); + return; + } + + vo_draw_alpha_l8a8(w, h, src, srca, stride, + (unsigned char *)locked_rect.pBits + locked_rect.Pitch*y0 + 2*x0, locked_rect.Pitch); + + /* this unlock is used for both slice_draw path and D3DRenderFrame path */ + if (FAILED(IDirect3DTexture9_UnlockRect(priv->d3d_texture_system, 0))) { + mp_msg(MSGT_VO,MSGL_ERR,"<vo_direct3d>IDirect3DTexture9_UnlockRect failure.\n"); + return; + } + + priv->is_osd_populated = 1; +} + +/** @brief libvo Callback: Draw OSD/Subtitles, + */ +static void draw_osd(void) +{ + if (vo_osd_changed(0)) { + D3DLOCKED_RECT locked_rect; /**< Offscreen surface we lock in order + to copy MPlayer's frame inside it.*/ + + /* clear the OSD */ + if (FAILED(IDirect3DTexture9_LockRect(priv->d3d_texture_system, 0, + &locked_rect, NULL, 0))) { + mp_msg(MSGT_VO,MSGL_ERR,"<vo_direct3d>IDirect3DTexture9_LockRect failure.\n"); + return; + } + + /* clear the whole texture to avoid issues due to interpolation */ + memset(locked_rect.pBits, 0, locked_rect.Pitch * priv->osd_texture_height); + + /* this unlock is used for both slice_draw path and D3DRenderFrame path */ + if (FAILED(IDirect3DTexture9_UnlockRect(priv->d3d_texture_system, 0))) { + mp_msg(MSGT_VO,MSGL_ERR,"<vo_direct3d>IDirect3DTexture9_UnlockRect failure.\n"); + return; + } + + priv->is_osd_populated = 0; + /* required for if subs are in the boarder region */ + priv->is_clear_needed = 1; + + vo_draw_text(priv->osd_width, priv->osd_height, draw_alpha); + + if (!priv->device_texture_sys) + { + /* only DMA to the shadow if its required */ + if (FAILED(IDirect3DDevice9_UpdateTexture(priv->d3d_device, + (IDirect3DBaseTexture9 *)priv->d3d_texture_system, + (IDirect3DBaseTexture9 *)priv->d3d_texture_osd))) { + mp_msg(MSGT_VO,MSGL_ERR,"<vo_direct3d>IDirect3DDevice9_UpdateTexture failure.\n"); + return; + } + } + } + + /* update OSD */ + + if (priv->is_osd_populated) { + + struct_vertex osd_quad_vb[] = { + {-1.0f, 1.0f, 0.0f, 0, 0 }, + { 1.0f, 1.0f, 0.0f, 1, 0 }, + {-1.0f,-1.0f, 0.0f, 0, 1 }, + { 1.0f,-1.0f, 0.0f, 1, 1 } + }; + + /* calculate the texture coordinates */ + osd_quad_vb[1].tu = + osd_quad_vb[3].tu = (float)priv->osd_width / priv->osd_texture_width; + osd_quad_vb[2].tv = + osd_quad_vb[3].tv = (float)priv->osd_height / priv->osd_texture_height; + + if (FAILED(IDirect3DDevice9_BeginScene(priv->d3d_device))) { + mp_msg(MSGT_VO,MSGL_ERR,"<vo_direct3d>BeginScene failed\n"); + return; + } + + /* turn on alpha test */ + IDirect3DDevice9_SetRenderState(priv->d3d_device, D3DRS_ALPHABLENDENABLE, TRUE); + IDirect3DDevice9_SetRenderState(priv->d3d_device, D3DRS_ALPHATESTENABLE, TRUE); + + /* need to use a texture here (done here as we may be able to texture from system memory) */ + IDirect3DDevice9_SetTexture(priv->d3d_device, 0, + (IDirect3DBaseTexture9 *)(priv->device_texture_sys + ? priv->d3d_texture_system : priv->d3d_texture_osd)); + + IDirect3DDevice9_SetFVF(priv->d3d_device, D3DFVF_MY_VERTEX); + IDirect3DDevice9_DrawPrimitiveUP(priv->d3d_device, D3DPT_TRIANGLESTRIP, 2, osd_quad_vb, sizeof(struct_vertex)); + + /* turn off alpha test */ + IDirect3DDevice9_SetRenderState(priv->d3d_device, D3DRS_ALPHATESTENABLE, FALSE); + IDirect3DDevice9_SetRenderState(priv->d3d_device, D3DRS_ALPHABLENDENABLE, FALSE); + + if (FAILED(IDirect3DDevice9_EndScene(priv->d3d_device))) { + mp_msg(MSGT_VO,MSGL_ERR,"<vo_direct3d>EndScene failed\n"); + return; + } + } +} diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c index a9a2690756..7ad0189a63 100644 --- a/libvo/vo_gl.c +++ b/libvo/vo_gl.c @@ -177,7 +177,8 @@ static void texSize(int w, int h, int *texw, int *texh) { while (*texh < h) *texh *= 2; } - if (ati_hack) *texw = (*texw + 511) & ~511; + if (mesa_buffer) *texw = (*texw + 63) & ~63; + else if (ati_hack) *texw = (*texw + 511) & ~511; } //! maximum size of custom fragment program @@ -400,11 +401,21 @@ static void uninitGl(void) { err_shown = 0; } +static void autodetectGlExtensions(void) { + const char *extensions = glGetString(GL_EXTENSIONS); + const char *vendor = glGetString(GL_VENDOR); + int is_ati = strstr(vendor, "ATI") != NULL; + if (ati_hack == -1) ati_hack = is_ati; + if (force_pbo == -1) force_pbo = strstr(extensions, "_pixel_buffer_object") ? is_ati : 0; + if (use_rectangle == -1) use_rectangle = strstr(extensions, "_texture_non_power_of_two") ? 2 : 0; +} + /** * \brief Initialize a (new or reused) OpenGL context. * set global gl-related variables to their default values */ static int initGl(uint32_t d_width, uint32_t d_height) { + autodetectGlExtensions(); texSize(image_width, image_height, &texture_width, &texture_height); glDisable(GL_BLEND); @@ -698,7 +709,8 @@ static uint32_t get_image(mp_image_t *mpi) { return VO_FALSE; } if (mpi->flags & MP_IMGFLAG_READABLE) return VO_FALSE; - if (ati_hack) { + if (mesa_buffer) mpi->width = texture_width; + else if (ati_hack) { mpi->width = texture_width; mpi->height = texture_height; } @@ -744,7 +756,7 @@ static uint32_t get_image(mp_image_t *mpi) { mpi->stride[1] = mpi->width >> 1; mpi->planes[2] = mpi->planes[1] + mpi->stride[1] * (mpi->height >> 1); mpi->stride[2] = mpi->width >> 1; - if (ati_hack) { + if (ati_hack && !mesa_buffer) { mpi->flags &= ~MP_IMGFLAG_COMMON_PLANE; if (!gl_buffer_uv[0]) GenBuffers(2, gl_buffer_uv); if (mpi->stride[1] * mpi->height > gl_buffersize_uv) { @@ -776,7 +788,6 @@ static uint32_t draw_image(mp_image_t *mpi) { unsigned char *planes[3]; mp_image_t mpi2 = *mpi; int w = mpi->w, h = mpi->h; - if (ati_hack) { w = texture_width; h = texture_height; } if (mpi->flags & MP_IMGFLAG_DRAW_CALLBACK) goto skip_upload; mpi2.flags = 0; mpi2.type = MP_IMGTYPE_TEMP; @@ -793,21 +804,26 @@ static uint32_t draw_image(mp_image_t *mpi) { stride[0] = mpi->stride[0]; stride[1] = mpi->stride[1]; stride[2] = mpi->stride[2]; planes[0] = mpi->planes[0]; planes[1] = mpi->planes[1]; planes[2] = mpi->planes[2]; mpi_flipped = stride[0] < 0; - if (!mesa_buffer && mpi->flags & MP_IMGFLAG_DIRECT) { - intptr_t base = (intptr_t)planes[0]; - if (mpi_flipped) - base += (mpi->h - 1) * stride[0]; - planes[0] -= base; - planes[1] -= base; - planes[2] -= base; - BindBuffer(GL_PIXEL_UNPACK_BUFFER, gl_buffer); - UnmapBuffer(GL_PIXEL_UNPACK_BUFFER); - gl_bufferptr = NULL; - if (!(mpi->flags & MP_IMGFLAG_COMMON_PLANE)) - planes[0] = planes[1] = planes[2] = NULL; - } - if (mpi->flags & MP_IMGFLAG_DIRECT) + if (mpi->flags & MP_IMGFLAG_DIRECT) { + if (mesa_buffer) { + glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, 1); + w = texture_width; + } else { + intptr_t base = (intptr_t)planes[0]; + if (ati_hack) { w = texture_width; h = texture_height; } + if (mpi_flipped) + base += (mpi->h - 1) * stride[0]; + planes[0] -= base; + planes[1] -= base; + planes[2] -= base; + BindBuffer(GL_PIXEL_UNPACK_BUFFER, gl_buffer); + UnmapBuffer(GL_PIXEL_UNPACK_BUFFER); + gl_bufferptr = NULL; + if (!(mpi->flags & MP_IMGFLAG_COMMON_PLANE)) + planes[0] = planes[1] = planes[2] = NULL; + } slice = 0; // always "upload" full texture + } glUploadTex(gl_target, gl_format, gl_type, planes[0], stride[0], mpi->x, mpi->y, w, h, slice); if (mpi->imgfmt == IMGFMT_YV12) { @@ -829,8 +845,10 @@ static uint32_t draw_image(mp_image_t *mpi) { mpi->x / 2, mpi->y / 2, w / 2, h / 2, slice); ActiveTexture(GL_TEXTURE0); } - if (!mesa_buffer && mpi->flags & MP_IMGFLAG_DIRECT) - BindBuffer(GL_PIXEL_UNPACK_BUFFER, 0); + if (mpi->flags & MP_IMGFLAG_DIRECT) { + if (mesa_buffer) glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, 0); + else BindBuffer(GL_PIXEL_UNPACK_BUFFER, 0); + } skip_upload: if (vo_doublebuffering) do_render(); return VO_TRUE; @@ -917,10 +935,10 @@ static int preinit(const char *arg) lscale = 0; cscale = 0; filter_strength = 0.5; - use_rectangle = 0; + use_rectangle = -1; use_glFinish = 0; - ati_hack = 0; - force_pbo = 0; + ati_hack = -1; + force_pbo = -1; mesa_buffer = 0; swap_interval = 1; slice_height = 0; diff --git a/libvo/vo_macosx.m b/libvo/vo_macosx.m index daede69573..24ffdc1e1f 100644 --- a/libvo/vo_macosx.m +++ b/libvo/vo_macosx.m @@ -10,6 +10,7 @@ #include <sys/types.h> #include <sys/ipc.h> #include <sys/mman.h> +#include <unistd.h> #include <CoreServices/CoreServices.h> //special workaround for Apple bug #6267445 //(OSServices Power API disabled in OSServices.h for 64bit systems) @@ -25,6 +26,8 @@ #include "aspect.h" #include "mp_msg.h" #include "m_option.h" +#include "mp_fifo.h" +#include "libvo/sub.h" #include "input/input.h" #include "input/mouse.h" @@ -729,7 +732,6 @@ static int control(uint32_t request, void *data) - (void) render { int curTime; - static int lastTime = 0; glClear(GL_COLOR_BUFFER_BIT); diff --git a/libvo/vo_png.c b/libvo/vo_png.c index ac0e99587e..c1a93c26f0 100644 --- a/libvo/vo_png.c +++ b/libvo/vo_png.c @@ -34,6 +34,7 @@ const LIBVO_EXTERN (png) static int z_compression = Z_NO_COMPRESSION; static int framenum = 0; +static int use_alpha; struct pngdata { FILE * fp; @@ -111,7 +112,7 @@ static struct pngdata create_png (char * fname, int image_width, int image_heigh bit_depth, color_type, interlace_type, compression_type, filter_type)*/ png_set_IHDR(png.png_ptr, png.info_ptr, image_width, image_height, - 8, PNG_COLOR_TYPE_RGB, PNG_INTERLACE_NONE, + 8, use_alpha ? PNG_COLOR_TYPE_RGBA : PNG_COLOR_TYPE_RGB, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT); mp_msg(MSGT_VO,MSGL_DBG2, "PNG Write Info\n"); @@ -190,10 +191,14 @@ static int draw_slice( uint8_t *src[],int stride[],int w,int h,int x,int y ) static int query_format(uint32_t format) { + const int supported_flags = VFCAP_CSP_SUPPORTED|VFCAP_CSP_SUPPORTED_BY_HW|VFCAP_ACCEPT_STRIDE; switch(format){ case IMGFMT_RGB24: case IMGFMT_BGR24: - return VFCAP_CSP_SUPPORTED|VFCAP_CSP_SUPPORTED_BY_HW|VFCAP_ACCEPT_STRIDE; + return use_alpha ? 0 : supported_flags; + case IMGFMT_RGBA: + case IMGFMT_BGRA: + return use_alpha ? supported_flags : 0; } return 0; } @@ -210,6 +215,7 @@ static int int_zero_to_nine(int *sh) } static opt_t subopts[] = { + {"alpha", OPT_ARG_BOOL, &use_alpha, NULL, 0}, {"z", OPT_ARG_INT, &z_compression, (opt_test_f)int_zero_to_nine}, {NULL} }; @@ -217,6 +223,7 @@ static opt_t subopts[] = { static int preinit(const char *arg) { z_compression = 0; + use_alpha = 0; if (subopt_parse(arg, subopts) != 0) { return -1; } diff --git a/libvo/vo_quartz.c b/libvo/vo_quartz.c index cc7cdb922b..f8b760e097 100644 --- a/libvo/vo_quartz.c +++ b/libvo/vo_quartz.c @@ -30,6 +30,7 @@ #include "m_option.h" #include "mp_fifo.h" #include "mpbswap.h" +#include "libvo/sub.h" #include "input/input.h" #include "input/mouse.h" diff --git a/loader/dmo/dmo.c b/loader/dmo/dmo.c index 3c5c748caf..ee6ac27f3c 100644 --- a/loader/dmo/dmo.c +++ b/loader/dmo/dmo.c @@ -117,9 +117,9 @@ DMO_Filter* DMO_FilterCreate(const char* dllname, const GUID* id, //VIDEOINFOHEADER* vi; memset(&dmo, 0, sizeof(dmo)); i = This->m_pMedia->vt->GetOutputType(This->m_pMedia, 0, 2, &dmo); - printf("GetOutputType %x \n", i); - printf("DMO 0x%x (%.4s) 0x%x (%.4s)\n" - //printf("DMO 0x%x 0x%x\n" + Debug printf("GetOutputType %x \n", i); + Debug printf("DMO 0x%x (%.4s) 0x%x (%.4s)\n" + //Debug printf("DMO 0x%x 0x%x\n" ":: fixszsamp:%d tempcomp:%d sampsz:%ld\n" ":: formtype: 0x%x\n" ":: unk %p cbform: %ld pbform:%p\n", @@ -135,7 +135,7 @@ DMO_Filter* DMO_FilterCreate(const char* dllname, const GUID* id, /* vi = (VIDEOINFOHEADER*) dmo.pbFormat; vi = (VIDEOINFOHEADER*) out_fmt->pbFormat; for (i = 0; i < out_fmt->cbFormat; i++) - printf("BYTE %d %02x %02x\n", i, ((uint8_t*)dmo.pbFormat)[i], ((uint8_t*)out_fmt->pbFormat)[i]); + Debug printf("BYTE %d %02x %02x\n", i, ((uint8_t*)dmo.pbFormat)[i], ((uint8_t*)out_fmt->pbFormat)[i]); */ } @@ -148,11 +148,11 @@ DMO_Filter* DMO_FilterCreate(const char* dllname, const GUID* id, inputs = outputs = 0; hr = This->m_pMedia->vt->GetOutputSizeInfo(This->m_pMedia, 0, &inputs, &outputs); - printf("GetOutput r=0x%lx size:%ld align:%ld\n", hr, inputs, outputs); + Debug printf("GetOutput r=0x%lx size:%ld align:%ld\n", hr, inputs, outputs); // This->m_pMedia->vt->AllocateStreamingResources(This->m_pMedia); hr = This->m_pMedia->vt->GetStreamCount(This->m_pMedia, &inputs, &outputs); - printf("StreamCount r=0x%lx %ld %ld\n", hr, inputs, outputs); + Debug printf("StreamCount r=0x%lx %ld %ld\n", hr, inputs, outputs); break; } @@ -1,7 +1,23 @@ -/* mangle.h - This file has some CPP macros to deal with different symbol - * mangling across binary formats. - * (c)2002 by Felix Buenemann <atmosfear at users.sourceforge.net> - * File licensed under the GPL, see http://www.fsf.org/ for more info. +/* + * CPP macros to deal with different symbol mangling across binary formats. + * + * Copyright (C) 2002 Felix Buenemann <atmosfear at users.sourceforge.net> + * + * This file is part of MPlayer. + * + * MPlayer 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 of the License, or + * (at your option) any later version. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #ifndef MPLAYER_MANGLE_H diff --git a/mp3lib/mp3.h b/mp3lib/mp3.h index daeda20856..d43b5f8bcb 100644 --- a/mp3lib/mp3.h +++ b/mp3lib/mp3.h @@ -4,7 +4,7 @@ #ifdef CONFIG_FAKE_MONO void MP3_Init(int fakemono); #else -void MP3_Init(); +void MP3_Init(void); #endif int MP3_Open(char *filename, int buffsize); void MP3_SeekFrame(int num, int dir); diff --git a/mp3lib/sr1.c b/mp3lib/sr1.c index 49feb45343..c5a0a1b9e7 100644 --- a/mp3lib/sr1.c +++ b/mp3lib/sr1.c @@ -403,7 +403,7 @@ void (*dct64_MMX_func)(short *, short *, real *); #ifdef CONFIG_FAKE_MONO void MP3_Init(int fakemono){ #else -void MP3_Init(){ +void MP3_Init(void){ #endif //gCpuCaps.hasMMX=gCpuCaps.hasMMX2=gCpuCaps.hasSSE=0; // for testing! diff --git a/stream/tvi_v4l2.c b/stream/tvi_v4l2.c index 7a15a9b0be..0742135740 100644 --- a/stream/tvi_v4l2.c +++ b/stream/tvi_v4l2.c @@ -1,19 +1,29 @@ /* -** Video 4 Linux 2 input -** -** This file is part of MPlayer, see http://mplayerhq.hu/ for info. -** -** (c) 2003 Martin Olschewski <olschewski@zpr.uni-koeln.de> -** (c) 2003 Jindrich Makovicka <makovick@gmail.com> -** -** File licensed under the GPL, see http://www.fsf.org/ for more info. -** -** Some ideas are based on works from -** Alex Beregszaszi <alex@fsn.hu> -** Gerd Knorr <kraxel@bytesex.org> -** -** CODE IS UNDER DEVELOPMENT, NO FEATURE REQUESTS PLEASE! -*/ + * Video 4 Linux 2 input + * + * copyright (c) 2003 Martin Olschewski <olschewski@zpr.uni-koeln.de> + * copyright (c) 2003 Jindrich Makovicka <makovick@gmail.com> + * + * Some ideas are based on works from + * Alex Beregszaszi <alex@fsn.hu> + * Gerd Knorr <kraxel@bytesex.org> + * + * This file is part of MPlayer. + * + * MPlayer 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 of the License, or + * (at your option) any later version. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ /* |