Commit Graph

985 Commits

Author SHA1 Message Date
wm4 f30bf73bf2 etc/input.conf: make file contents match default key bindings
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.
2012-03-25 22:30:37 +03:00
Uoti Urpala 8b5efd6455 libmenu: remove OSD menu functionality (--menu)
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.
2011-10-25 07:05:47 +03:00
Uoti Urpala e35362f507 codecs.conf: add Libav ProRes decoder 2011-09-23 06:27:05 +03:00
harklu 9e6933440a options, subs: add --ass-vsfilter-aspect-compat
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.
2011-08-12 14:19:10 +03:00
compn 78f6ca1a2c codecs.conf: add yv16 raw fourcc
samples at https://ffmpeg.org/trac/ffmpeg/ticket/307

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33787 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-07-06 13:01:08 +03:00
compn 01e441dddc codecs.conf: add vfw csmcodec for fourcc CSM0, map YV24 fourcc to raw444P codec
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33727 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-07-06 13:01:08 +03:00
ib ba160121ff etc/mplayer.desktop: revise desktop file
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
2011-07-06 09:28:04 +03:00
cehoyos dc6fe9692b codecs.conf: add fourcc DVOO to rawyuy2
Digital Voodoo SD 8 Bit.
2011-06-29 11:13:05 +03:00
cehoyos 97dfc4f219 codecs.conf: add libavcodec r10k decoder
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33462 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-06-29 11:11:50 +03:00
cehoyos bd3ed7cf1f codecs.conf: add S302M audio codec from libavcodec
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33460 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-06-29 11:11:36 +03:00
Uoti Urpala d3bef0286b vd_ffmpeg: autoselect output colorspaces without codecs.conf
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.
2011-06-26 06:27:50 +03:00
Grigori Goronzy 17db5cc98f input: add useful default pointer button bindings
Add two mouse button bindings:
1) left button double click toggles fullscreen
2) right button pauses/unpauses
2011-06-14 19:58:55 +03:00
Uoti Urpala cbdb7e6305 vo_xvmc: drop XvMC support
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.
2011-05-09 20:27:16 +03:00
cehoyos d0376729d1 codecs.conf: add Etymonix MPEG-2 I-frame codec to ffmpeg12
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33332 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-05-02 00:36:21 +03:00
cehoyos fa33ca0695 codecs.conf: add Canopus SD50 (CDV5) to ffdv entry
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33301 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-05-02 00:36:20 +03:00
reimar 6d99ffbeed codecs.conf: add Deluxe Paint Animation decoder from libavcodec
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33290 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-05-02 00:36:20 +03:00
cehoyos c51e9d5ae1 codecs.conf: add Kega Video (kgv1) from libavcodec
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33254 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-05-02 00:36:20 +03:00
cehoyos 673a2c7597 codecs.conf, mp_taglists: add FFmpeg Bitmap Brothers JV decoder
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33125 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-05-02 00:35:48 +03:00
compn 211e93aeec codecs.conf: cleanup/unify hdv* fourccs, except vdpau
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33113 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-05-01 16:25:37 +03:00
cehoyos c824034689 codecs.conf: only list 4:2:0 colorspace fourccs for VDPAU
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
2011-04-13 03:35:26 +03:00
cehoyos 42f97b2b82 codecs.conf, stheader.h: support CrystalHD decoding (libavcodec)
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
2011-04-13 03:21:41 +03:00
compn b49b4e6ef9 codecs.conf: add xd55 isom for mpeg2 video from fcp
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33094 b3059339-0415-0410-9bf9-f77b7e298cf2

Conflicts:

	etc/codecs.conf
2011-04-13 03:18:57 +03:00
cehoyos 3cb235736e codecs.conf: Use fourcc instead of format where appropriate
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33077 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-04-13 03:17:05 +03:00
cehoyos e43e0de9e6 ad_pcm, codecs.conf: support 'lpcm' in mov and float in aiff
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
2011-04-13 03:17:05 +03:00
cehoyos 2c2f620e7a codecs.conf: Add FourCC ai12 for AVC Intra 100 / 1080.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33061 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-04-13 03:15:05 +03:00
reimar 55dbd183e3 ad_liba52: Fix -ac a52 with tags other than 0x2000 or dnet
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
2011-04-13 03:15:05 +03:00
cehoyos fa0d14555d codecs.conf, mp_taglists.c: add LXF PCM and dvvideo
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
2011-04-12 19:39:30 +03:00
compn 989694678d codecs.conf: add ai5q and ai1q fourccs for h264 decoders
ported from ffmpeg

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32948 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-04-12 18:45:11 +03:00
cehoyos 4726be4314 codecs.conf: clarify XAN DPCM comment
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
2011-04-12 18:35:38 +03:00
cehoyos c4814bc8b6 codecs.conf: Support 0x594A as format value for XAN DPCM audio
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32885 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-04-12 18:34:50 +03:00
Uoti Urpala f9b5f2870c mp3lib: drop internal mp3lib tree
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.
2011-04-02 07:28:53 +03:00
cehoyos 8affafc2a8 codecs.conf: Add FFmpeg WC4 xan decoder
Patch by Philip Langdale, philipl overt org

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32875 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-02-15 19:30:57 +02:00
compn 8aac9fae9b codecs.conf: add apco, ap4h, ai55, ai15 fourccs
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
2011-02-15 19:16:49 +02:00
Uoti Urpala 7cd7416c73 libmpeg2: drop libmpeg2 support
libavcodec mpeg2 decoder has been the default for a while and seems to
work fine.
2011-02-01 20:10:27 +02:00
Uoti Urpala 626d5ed628 vo_zr2: drop Zoran support
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.
2011-01-31 16:03:11 +02:00
cehoyos 9a021242a9 codecs.conf, vd_ffmpeg: Enable fflagarith video decoder
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32773 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-01-31 16:03:10 +02:00
cehoyos 5937ee8a5b codecs.conf: add format id for FLAC in mov
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32767 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-01-31 16:03:10 +02:00
cehoyos 2ce17b5afd codecs.conf: Fix playback of ffv1 yuv422p16
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32764 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-01-31 16:03:10 +02:00
diego 52ba5ea684 example.conf: Disambiguate remarks about profiles
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
2011-01-31 16:03:10 +02:00
Uoti Urpala 0afb326035 Merge branch 'hr-seek'
* 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
2010-12-20 19:17:43 +02:00
Uoti Urpala 5bb2f9787f input: add default keybindings Shift+[arrow] for small exact seeks 2010-12-20 19:02:24 +02:00
Uoti Urpala 67fd58d6f0 input: support bindings with modifier keys for X input
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.
2010-12-20 19:02:24 +02:00
compn 597dc5a388 example.conf: add some profile information and user-agent examples
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
2010-12-16 06:22:19 +02:00
compn f96ba3ad32 codecs.conf: add ffmpeg g722 audio codec
works on incoming/g722/ sample

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32662 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-12-16 05:05:41 +02:00
reimar 04a3a3825f codecs.conf: add Avid DNxHD through QuickTime
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
2010-12-16 04:57:04 +02:00
diego aae78f0509 cosmetics: Fix Bluray vs. Blu-ray typo
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32606 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-14 12:23:56 +02:00
diego e3c6f09752 codecs.conf: Prefer FFmpeg AAC decoder over libfaad2
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
2010-11-14 12:23:56 +02:00
cehoyos af4b23cd36 codecs.conf: document need to add fourccs to parser list in demuxer.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32597 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-08 18:05:12 +02:00
reimar 01a10dd579 codecs.conf: add missing YV12 output formats for FFmpeg codecs
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
2010-11-08 18:05:11 +02:00
reimar c739ab2992 codecs.conf: mark fflatm non-buggy (now default for AAC/LATM)
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
2010-11-08 18:05:11 +02:00