summaryrefslogtreecommitdiffstats
path: root/etc
Commit message (Collapse)AuthorAgeFilesLines
* video, audio: use lavc decoders without codecs.conf entriesUoti Urpala2012-07-241-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for using libavcodec decoders that do not have entries in codecs.conf. This is currently only used with demux_lavf, and the codec selection is based on codec_id returned by libavformat. Also modify codec-related terminal output somewhat to make it use information from libavcodec and avoid excessively long default output. The new any-lavc-codec support is implemented with codecs.conf entries that invoke vd_ffmpeg/ad_ffmpeg without directly specifying any libavcodec codec name. In this mode, the decoders now instead select the libavcodec codec based on codec_id previously set by demux_lavf (if any). These new "generic" codecs.conf entries specify "status buggy", so that they're tried after any specific entries with higher-priority status. Add new directive "anyinput" to codecs.conf syntax. This means the entry will always match regardless of fourcc. This is used for the above new codecs.conf entries (so the driver always gets to decide whether to accept the input, and will fail init() if it can't find a suitable codec in libavcodec). Remove parsing support for the obsolete codecs.conf directive "cpuflags". This directive has not had any effect and has not been used in default codecs.conf since many years ago. Shorten codec-related terminal output. When using libavcodec decoders, show the libavcodec long_name field rather than codecs.conf "info" field as the name of the codec. Stop showing the codecs.conf entry name and "vfm/afm" name by default, as these are rarely needed; they're now in verbose output only. Show "VIDEO:" line at VO initialization rather than at demuxer open. This didn't really belong in demuxer code; the new location may show more accurate values (known after decoder has been opened) and works right if video track is changed after initial demuxer open. The vd.c changes (primarily done for terminal output changes) remove round-to-even behavior from code setting dimensions based on aspect ratio. I hope nothing depended on this; at least the even values were not consistently guaranteed anyway, as the rounding code did not run if the video file did not specify a nonzero aspect value.
* build, codec-cfg.c: simplify builtin codecs.conf handlingUoti Urpala2012-07-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | The player can read codec mapping (codecs.conf) from an external file or use embedded defaults. Before, the defaults were stored in the player binary in the form of final already-parsed data structures. Simplify things by storing the text of the codecs.conf file instead, and parse that at runtime the same way an external file would be parsed. To create the previous parsed form, the build system first compiled a separate binary named "codec-cfg", which parsed etc/codecs.conf and then wrote the results as a C data structure that could be compiled into the program. The new simple conversion of codecs.conf into a C string is handled by the new script TOOLS/file2string.py. After removing the codec-cfg binary, HOST_CC is no longer used for anything. Remove the --host-cc configure option and associated logic. Also remove the codec2html and codec-cfg-test functionality. Building those was already broken and nobody cared. There was a broken 3-character-long "fourcc" entry in etc/codecs.conf. This happened to be accepted before but triggered a parse error after the changes. Remove the broken entry and make the parsing functions explicitly test for this error.
* etc/input.conf: make file contents match default key bindingswm42012-03-251-100/+146
| | | | | | | | | There were some slight differences between what input.conf mapped, and what was in input.c def_cmd_binds[]. Make them match. Add some minor documentation improvements in input.cfg. Also remove double comments ('##'), because they were confusing.
* libmenu: remove OSD menu functionality (--menu)Uoti Urpala2011-10-253-284/+0
| | | | | | | | | | Something like the OSD menu functionality could be useful. However the current implementation has several problems and would require a relatively large amount of work to get into good shape. As far as I know there are few users of the existing functionality. Nobody is working on the existing code and keeping it compiling at all while changing other code would require extra work. So delete the menu code and some related code elsewhere that's used by nothing else.
* codecs.conf: add Libav ProRes decoderUoti Urpala2011-09-231-0/+11
|
* options, subs: add --ass-vsfilter-aspect-compatharklu2011-08-121-0/+1
| | | | | | | | | Add option --ass-vsfilter-aspect-compat and corresponding property ass_vsfilter_aspect_compat. The setting controls whether to enable the emulation of traditional VSFilter behavior where subtitles are stretched if the video is anamorphic (previously always enabled for native SSA/ASS subtitles). Enabled by default. Add 'V' as a new default keybinding to toggle the property.
* codecs.conf: add yv16 raw fourcccompn2011-07-061-0/+2
| | | | | | samples at https://ffmpeg.org/trac/ffmpeg/ticket/307 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33787 b3059339-0415-0410-9bf9-f77b7e298cf2
* codecs.conf: add vfw csmcodec for fourcc CSM0, map YV24 fourcc to raw444P codeccompn2011-07-061-0/+11
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33727 b3059339-0415-0410-9bf9-f77b7e298cf2
* etc/mplayer.desktop: revise desktop fileib2011-07-061-8/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revise desktop file. Split Name entry into Name and GenericName entries. This is according to the Desktop Entry Specification. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33540 b3059339-0415-0410-9bf9-f77b7e298cf2 Revise desktop file. Make slightly revised Catalan Name entry the GenericName entry. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33541 b3059339-0415-0410-9bf9-f77b7e298cf2 Add German GenericName entry to desktop file and revise German Comment entry. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33542 b3059339-0415-0410-9bf9-f77b7e298cf2 Make French and Italian Comment entries in desktop file GenericName entries. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33543 b3059339-0415-0410-9bf9-f77b7e298cf2 Remove Spanish and Chinese Comment entries from desktop file. There are no GenericName entries for Spanish and Chinese and it's uncertain whether the Comment entries are OK. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33544 b3059339-0415-0410-9bf9-f77b7e298cf2 Add X-GNOME-FullName entries to desktop file. According to the Desktop Entry Specification, the "full name" should be built from Name and GenericName. While some desktop environments do this (like KDE), GNOME doesn't and uses its own key instead. This closes Bugzilla #1680. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33545 b3059339-0415-0410-9bf9-f77b7e298cf2 Add Japanese entries to desktop file. Translation by committer. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33546 b3059339-0415-0410-9bf9-f77b7e298cf2 Add Italian Comment entry to desktop file. Translation by Giorgio Vazzana, mywing81 gmail com. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33547 b3059339-0415-0410-9bf9-f77b7e298cf2 Add French Comment entry to desktop file. Translation by Etienne Buira, etienne.buira free fr. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33548 b3059339-0415-0410-9bf9-f77b7e298cf2
* codecs.conf: add fourcc DVOO to rawyuy2cehoyos2011-06-291-0/+2
| | | | Digital Voodoo SD 8 Bit.
* codecs.conf: add libavcodec r10k decodercehoyos2011-06-291-0/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33462 b3059339-0415-0410-9bf9-f77b7e298cf2
* codecs.conf: add S302M audio codec from libavcodeccehoyos2011-06-291-0/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33460 b3059339-0415-0410-9bf9-f77b7e298cf2
* vd_ffmpeg: autoselect output colorspaces without codecs.confUoti Urpala2011-06-261-154/+0
| | | | | | | | | | | | | Selecting the colorspace to output from a decoder is done in the function mpcodecs_config_vo(). Add a new version of this function, mpcodecs_config_vo2(), that allows the decoder to specify a list of candidate colorspaces instead of always using a hardcoded list specified in the codecs.conf entry. If the codecs.conf entry has any "out" lines then those still take priority and the decoder-provided list (if any) is ignored. Make vd_ffmpeg provide a list of the colorspaces it's willing to output. Remove "out" lines from most entries for libavcodec video decoders in codecs.conf, so that the automatic values are now used instead.
* input: add useful default pointer button bindingsGrigori Goronzy2011-06-141-0/+7
| | | | | | Add two mouse button bindings: 1) left button double click toggles fullscreen 2) right button pauses/unpauses
* vo_xvmc: drop XvMC supportUoti Urpala2011-05-091-35/+0
| | | | | | | | | Due to libavcodec changes vo_xvmc would have needed some modifications to keep working. However, I think there's little real demand for XvMC, so I'll just drop XvMC support. XvMC only supported MPEG-2, making it of very limited usefulness nowadays, plus the vo_xvmc implementation was not high quality and never worked particularly well or reliably anyway.
* codecs.conf: add Etymonix MPEG-2 I-frame codec to ffmpeg12cehoyos2011-05-021-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33332 b3059339-0415-0410-9bf9-f77b7e298cf2
* codecs.conf: add Canopus SD50 (CDV5) to ffdv entrycehoyos2011-05-021-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33301 b3059339-0415-0410-9bf9-f77b7e298cf2
* codecs.conf: add Deluxe Paint Animation decoder from libavcodecreimar2011-05-021-0/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33290 b3059339-0415-0410-9bf9-f77b7e298cf2
* codecs.conf: add Kega Video (kgv1) from libavcodeccehoyos2011-05-021-0/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33254 b3059339-0415-0410-9bf9-f77b7e298cf2
* codecs.conf, mp_taglists: add FFmpeg Bitmap Brothers JV decodercehoyos2011-05-021-0/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33125 b3059339-0415-0410-9bf9-f77b7e298cf2
* codecs.conf: cleanup/unify hdv* fourccs, except vdpaucompn2011-05-011-22/+14
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33113 b3059339-0415-0410-9bf9-f77b7e298cf2
* codecs.conf: only list 4:2:0 colorspace fourccs for VDPAUcehoyos2011-04-131-3/+0
| | | | | | VDPAU hardware decoding does not support colorspaces other than 4:2:0. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33096 b3059339-0415-0410-9bf9-f77b7e298cf2
* codecs.conf, stheader.h: support CrystalHD decoding (libavcodec)cehoyos2011-04-131-1/+119
| | | | | | | | | | Add the various decoders to codecs.conf and increase the maximum number of buffered pts in stheader.h (apparently CrystalHD can have very high decoder lag). Patch by Philip Langdale, philipl overt org git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33095 b3059339-0415-0410-9bf9-f77b7e298cf2
* codecs.conf: add xd55 isom for mpeg2 video from fcpcompn2011-04-131-5/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33094 b3059339-0415-0410-9bf9-f77b7e298cf2 Conflicts: etc/codecs.conf
* codecs.conf: Use fourcc instead of format where appropriatecehoyos2011-04-131-60/+60
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33077 b3059339-0415-0410-9bf9-f77b7e298cf2
* ad_pcm, codecs.conf: support 'lpcm' in mov and float in aiffcehoyos2011-04-131-0/+2
| | | | | | | | | | | Support 'lpcm' in mov files, has audible (clipping?) artefacts on some systems. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33075 b3059339-0415-0410-9bf9-f77b7e298cf2 Support 32bit big endian float pcm in aiff. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33076 b3059339-0415-0410-9bf9-f77b7e298cf2
* codecs.conf: Add FourCC ai12 for AVC Intra 100 / 1080.cehoyos2011-04-131-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33061 b3059339-0415-0410-9bf9-f77b7e298cf2
* ad_liba52: Fix -ac a52 with tags other than 0x2000 or dnetreimar2011-04-131-1/+4
| | | | | | | Audio with all codec tags other than 0x2000 was byte-swapped, while only "dnet" should be. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33028 b3059339-0415-0410-9bf9-f77b7e298cf2
* codecs.conf, mp_taglists.c: add LXF PCM and dvvideocehoyos2011-04-121-0/+7
| | | | | | | | | | Support audio in Leitch/Harris' VR native stream format (LXF). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32990 b3059339-0415-0410-9bf9-f77b7e298cf2 Support dvvideo in Leitch/Harris' VR native stream format (LXF). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32991 b3059339-0415-0410-9bf9-f77b7e298cf2
* codecs.conf: add ai5q and ai1q fourccs for h264 decoderscompn2011-04-121-0/+3
| | | | | | ported from ffmpeg git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32948 b3059339-0415-0410-9bf9-f77b7e298cf2
* codecs.conf: clarify XAN DPCM commentcehoyos2011-04-121-1/+1
| | | | | | | | | At least for Wing Commander 4 files, -demuxer lavf is needed to play XAN DPCM audio (while Wing Commander 3 avi plays fine with -demuxer avi, although it also contains the video codec we call "XAN wc4"). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32894 b3059339-0415-0410-9bf9-f77b7e298cf2
* codecs.conf: Support 0x594A as format value for XAN DPCM audiocehoyos2011-04-121-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32885 b3059339-0415-0410-9bf9-f77b7e298cf2
* mp3lib: drop internal mp3lib treeUoti Urpala2011-04-021-17/+0
| | | | | | | | | | | | | Delete mp3lib which has been the default mp3 decoder until now. In addition to being an unnecessary embedded library it now fails to compile correctly with the new gcc-4.6, producing noise. After the deletion the default decoder priority for mp3 will be first libmpg123 (a newer version of the code that mp3lib was based on) if available, then ffmp3float which should be available in all normal compiles. I think that some tweaking may be required as these decoder alternatives get wider testing, but any problems should be solvable and there should be no need for mp3lib.
* codecs.conf: Add FFmpeg WC4 xan decodercehoyos2011-02-151-0/+8
| | | | | | Patch by Philip Langdale, philipl overt org git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32875 b3059339-0415-0410-9bf9-f77b7e298cf2
* codecs.conf: add apco, ap4h, ai55, ai15 fourccscompn2011-02-151-0/+5
| | | | | | | add apco and ap4h fourcc to prores decoder add ai55 and ai15 fourcc to h264 docoders git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32843 b3059339-0415-0410-9bf9-f77b7e298cf2
* libmpeg2: drop libmpeg2 supportUoti Urpala2011-02-011-39/+0
| | | | | libavcodec mpeg2 decoder has been the default for a while and seems to work fine.
* vo_zr2: drop Zoran supportUoti Urpala2011-01-311-7/+0
| | | | | | | There were multiple files specific to Zoran support, and they also depended on internal FFmpeg headers (so it would probably have been hard to get them to compile now even if you tried). It's obsolete now, so just drop the whole mess.
* codecs.conf, vd_ffmpeg: Enable fflagarith video decodercehoyos2011-01-311-0/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32773 b3059339-0415-0410-9bf9-f77b7e298cf2
* codecs.conf: add format id for FLAC in movcehoyos2011-01-311-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32767 b3059339-0415-0410-9bf9-f77b7e298cf2
* codecs.conf: Fix playback of ffv1 yuv422p16cehoyos2011-01-311-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32764 b3059339-0415-0410-9bf9-f77b7e298cf2
* example.conf: Disambiguate remarks about profilesdiego2011-01-311-15/+19
| | | | | | | Also move the profiles to the bottom of the example configuration file as the original remarks in the file suggested. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32754 b3059339-0415-0410-9bf9-f77b7e298cf2
* Merge branch 'hr-seek'Uoti Urpala2010-12-201-0/+9
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * hr-seek: input: add default keybindings Shift+[arrow] for small exact seeks input: support bindings with modifier keys for X input core: audio: make ogg missing audio timing workaround more complex core: add support for precise non-keyframe-limited seeks core: add struct for queued seek info commands: add generic option -> property wrapper options: add "choice" option type, use for -pts-association-mode core: remove looping in update_video(), modify command handling a bit core: seek: use accurate seek mode with audio-only files core: avoid using sh_video->pts as "current pts" libvo: register X11 connection fd in input event system core: timing: add special handling of long frame intervals core: move central play loop to a separate function Conflicts: DOCS/tech/slave.txt
| * input: add default keybindings Shift+[arrow] for small exact seeksUoti Urpala2010-12-201-0/+5
| |
| * input: support bindings with modifier keys for X inputUoti Urpala2010-12-201-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for binding commands to modifier+key combinations like "Shift+Left" or "Ctrl+Alt+x", and support reading such combinations from the output window of X VOs. The recognized modifier names are Shift, Ctrl, Alt and Meta. Any combination of those and then a non-modifier key name, separated by '+', is accepted as a key name in input.conf. For non-special keys that produce characters shift is ignored as a modifier. For example "A" is handled as a key without modifiers even if you use shift to write the capital letter; 'a' vs 'A' already distinguishes the combinations with a normal keymap, and having separate 'a', 'Shift+A' and 'A' (written with caps lock for example) would bring more confusion than benefit. Currently reading the modifier+key combinations is only supported in the output window of those VOs that use x11_common.c event handling. It's not possible to input the key combinations in other VOs or in a terminal window.
* | example.conf: add some profile information and user-agent examplescompn2010-12-161-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32709 b3059339-0415-0410-9bf9-f77b7e298cf2 add realplayer user-agent git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32712 b3059339-0415-0410-9bf9-f77b7e298cf2 add winamp useragent example git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32713 b3059339-0415-0410-9bf9-f77b7e298cf2
* | codecs.conf: add ffmpeg g722 audio codeccompn2010-12-161-0/+7
| | | | | | | | | | | | works on incoming/g722/ sample git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32662 b3059339-0415-0410-9bf9-f77b7e298cf2
* | codecs.conf: add Avid DNxHD through QuickTimereimar2010-12-161-1/+10
|/ | | | | | | | | | | | | | | | Add support for decoding Avid DNxHD through the QuickTime component. This is needed for the 10-bit variant which the FFmpeg decoder does not support (unfortunately both use the same FourCC). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32649 b3059339-0415-0410-9bf9-f77b7e298cf2 Bump codecs.conf version. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32650 b3059339-0415-0410-9bf9-f77b7e298cf2 change dnxhd to qtdnxhd. consistant with all other quicktime decoders git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32658 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: Fix Bluray vs. Blu-ray typodiego2010-11-141-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32606 b3059339-0415-0410-9bf9-f77b7e298cf2
* codecs.conf: Prefer FFmpeg AAC decoder over libfaad2diego2010-11-141-2/+1
| | | | | | | | | | FFmpeg's AAC decoder is much faster than libfaad2. The only known exception is libfaad2 compiled in fixed-point mode on systems with slow FPUs. Now that LATM support in FFmpeg is complete, FFmpeg's AAC decoder has a similar feature set as libfaad2. This leaves no reason not to use FFmpeg by default. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32605 b3059339-0415-0410-9bf9-f77b7e298cf2
* codecs.conf: document need to add fourccs to parser list in demuxer.ccehoyos2010-11-081-0/+16
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32597 b3059339-0415-0410-9bf9-f77b7e298cf2
* codecs.conf: add missing YV12 output formats for FFmpeg codecsreimar2010-11-081-4/+4
| | | | | | | For FFmpeg codecs YV12 should always be in the supported format lists if I420 is. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32593 b3059339-0415-0410-9bf9-f77b7e298cf2
* codecs.conf: mark fflatm non-buggy (now default for AAC/LATM)reimar2010-11-081-1/+1
| | | | | | | fflatm seems to be working, whereas external faad does not work at all with latm (internal does). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32585 b3059339-0415-0410-9bf9-f77b7e298cf2
* codecs_conf, mp_taglists: Use only one fourcc for LATMreimar2010-11-081-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32584 b3059339-0415-0410-9bf9-f77b7e298cf2
* mplayer.desktop: Add video/3gpp and application/x-flash-video mime typesdiego2010-11-081-1/+1
| | | | | | patch extracted from the ALT Linux patch set git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32574 b3059339-0415-0410-9bf9-f77b7e298cf2
* codecs.conf, mp_taglists: Support FFmpeg LATM decodingcehoyos2010-11-081-15/+22
| | | | | | | |