1
0
mirror of https://github.com/mpv-player/mpv synced 2024-12-28 01:52:19 +00:00
Commit Graph

8541 Commits

Author SHA1 Message Date
diego
42ed53f221 libfaad2:/ Remove forked internal libfaad2 copy
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32741 b3059339-0415-0410-9bf9-f77b7e298cf2

Remove AAC/FAAD2 installation instructions.

There is nothing special about building and installing FAAD2, so there is
no longer a need to keep maintaining instructions for it.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32742 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-01-31 16:00:58 +02:00
Uoti Urpala
f6fb536f87 DOCS/tech/: remove several obsolete files
Some of the files contain some usable stuff, but overall they're
obsolete enough that it's better to remove the current versions.
2011-01-29 04:05:28 +02:00
jrash
6ccf28b238 DOCS/man/zh_CN: sync with en/mplayer.1 rev. 32699
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32718 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-01-29 02:48:41 +02:00
Uoti Urpala
f50f34245e Merge branch 'sub'
* sub:
  sub/OSD: move some related files to sub/
  subtitles: options: enable -ass by default
  subtitles: change default libass rendering style
  demux_mkv, chapters: change millisecond arithmetic to ns
  cleanup: rename ass_* functions to mp_ass_*
  subs: use correct font aspect ratio for libass + converted subs
  cleanup: some random minor code simplification and cleanup
  vf_vo: fix EOSD change detection bug
  sd_ass: remove subreader use, support plaintext markup
  subtitles: style support for common SubRip tags and MicroDVD
  core: ordered chapters: fix bad subtitle parameter
  subs/demux: don't try to enable sub track when creating it
  subtitles/demux: store duration instead of endpts in demux packets
  subtitles: add framework for subtitle decoders
  options: add special -leak-report option
  subtitles: remove code trying to handle text subs with libavcodec
  cleanup: move MP_NOPTS_VALUE definition to mpcommon.h
  subtitles: move global ass_track to struct osd_state
  core: move most mpcommon.c contents to mplayer.c
  core: move global "subdata" and "vo_sub_last" to mpctx
  subtitles: remove sub_last_pts hack
  options: move -noconfig to option struct, simplify
2011-01-26 20:42:15 +02:00
Uoti Urpala
ebd2058d03 subtitles: options: enable -ass by default
There are still some problems with -ass. For example some other
subtitle options won't work the same way or at all with it enabled,
and inserting the video filter for VOs that lack native rendering
support won't work with different colorspaces. However I think that
the benefit from styling support outweights those disadvantages, and
also that the "discoverability" of features is better this way; it
will be easier for people who encounter problems to find -noass than
for people who see no styling to find out that they could add it with
-ass.

Enable -ass by default. Also fix other outdated information in the
manpage entries for -ass and -fontconfig.
2011-01-26 20:39:05 +02:00
Uoti Urpala
1a3fcc73d1 manpage: document -playlist being unsafe in its option description
This really should have been added to the manpage at the start of the
previous decade. There's still bad advice about -playlist in the XML
docs, but I'll remove that later when purging more obsolete/wrong
stuff from there.
2011-01-24 16:45:51 +02:00
Clément Bœsch
0b59e33b4e manpage: Remove forgotten "MPlayer only" notes 2011-01-09 17:00:19 +02:00
Clément Bœsch
6acc1bf4f0 manpage: Remove "MPlayer only" notes 2011-01-06 18:11:10 +02:00
Uoti Urpala
30445e2fa4 vo_vdpau: allow "deint=-N" to specify mode without enabling deint
Allow negative values of the "deint" parameter and make them select
the same deinterlacing mode as the corresponding positive value, but
without enabling deinterlace on startup. This is useful for
configuration files. Also tweak the overall manpage description of
vo_vdpau a bit to make it sound less as if the VO would be for
hardware acceleration only.
2011-01-04 23:51:31 +02:00
Clément Bœsch
d76ad5f227 manpage: Remove MEncoder references 2010-12-25 15:36:44 +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
f0649f13d6 core: add support for precise non-keyframe-limited seeks
Add support for seeking to an arbitrary non-keyframe position by
decoding video starting from the previous keyframe. Whether to use
this functionality when seeking is controlled by the new option
-hr-seek and a new third argument to the "seek" command. The default
is to use it for absolute seeks (like chapter seeks) but not for
relative ones. Because there's currently no support for cutting
encoded audio some desync is expected if encoded audio passthrough is
used. Currently precise seeks always go to the first frame with
timestamp equal to or greater than the target position; there's no
support for "matching or earlier" backwards seeks at frame level.
2010-12-20 19:02:16 +02:00
Uoti Urpala
2bc2399797 vd_ffmpeg: set thread count to number of cores on machine by default
Make "-lavdopts threads=0" mean an autodetected number of threads, and
make that the default value of the option. Also increase the upper
limit of the option from 8 to 16. Add new file osdep/numcores.c which
tries to determine the number of cores available on the machine.

numcores.c is based (heavily modified) on public domain numcpus.c by
Philip Willoughby <pgw99@doc.ic.ac.uk>, downloaded from
http://csgsoft.doc.ic.ac.uk/numcpus/
2010-12-20 05:53:28 +02:00
Uoti Urpala
74ac4d10a4 DOCS/tech/slave.txt: update some obsolete information
Update obsolete information based on old pause behavior. Remove
mention of old GUI-specific commands.
2010-12-18 12:38:45 +02:00
Uoti Urpala
b9a3579ec9 commands: add generic option -> property wrapper
Add mp_property_generic_option(), a property function that can be used
for generic option-based properties that do not require any action
beyond manipulating the value of the option variable. Currently it
directly implements GET and SET, plus STEP_UP for "choice" options
only. Use it to add a property for -pts-association-mode (not
particularly useful in normal use, but serves as a test).
2010-12-18 11:59:09 +02:00
Uoti Urpala
7e366113f7 options: add "choice" option type, use for -pts-association-mode
Add a "choice" option type. Options of this type take a string as
input and set an int option variable to the value corresponding to the
string. The string->int mapping is option-specific and is given in the
option definition. Strings not found in the mapping are rejected as
invalid option values.

Change the option -pts-association-mode to use this new option type
and accept values "auto, decoder, sort" instead of "0, 1, 2". The
change in accepted values shouldn't cause problems as this option is
not appropriate to use in normal user config files.
2010-12-18 10:14:25 +02:00
compn
3bf9f6c1a7 manpage: correct -tv audiorate description, change bitrate to samplerate
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32699 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-12-16 06:22:19 +02:00
reimar
a7f4b6b102 commands: Allow cycling subtitles backwards with 'J'
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32680 b3059339-0415-0410-9bf9-f77b7e298cf2

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32714 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-12-16 06:21:53 +02:00
jrash
9e35edf08b DOCS/man/zh_CN: sync with en/mplayer.1 rev. 32661
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32674 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-12-16 05:20:17 +02:00
compn
4f1b2d9b18 DOCS/xml: change --with-extraincdir to --extra-cflags
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32669 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-12-16 05:11:32 +02:00
Uoti Urpala
102b240e96 ao_pcm: change message to mention "-novideo" instead of "-vc null"
-novideo is the right way to disable video, and should also work in
more cases now that lavf is used as the default demuxer for more formats
(like AVI; internal AVI demuxer fails with -novideo).

Also change the man page description of -novideo a bit to make it
sound less negative about the chances of the option working.
2010-12-08 07:36:32 +02:00
Uoti Urpala
7001c2d994 core: ordered chapters: add heuristic for merging inaccurate chapters
Some Matroska files have inaccurate ordered chapter endpoints, and so
parts where one chapter should end and the next begin at the same
timestamp were not merged. This resulted in an unnecessary seek over a
minimal distance. Add a heuristic to merge parts with a minimal gap or
overlap between them.

Based on patch by Hector Martin <hector@marcansoft.com>.
2010-11-26 16:58:10 +02:00
reimar
41e04522af sub_cc: Allow selecting the Close Captioning channel
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32607 b3059339-0415-0410-9bf9-f77b7e298cf2

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32608 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-14 12:23:56 +02:00
compn
13902c2967 DOCS/tech/codecs.conf.txt: document how to add ffmpeg codecs
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32604 b3059339-0415-0410-9bf9-f77b7e298cf2

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32615 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-14 12:23:42 +02:00
Uoti Urpala
a4ce95de81 core: do initial A-V sync by modifying audio stream
Add code to enforce matching pts with video when (re)starting the
audio stream, by either cutting away the first samples or inserting
silence at the beginning. New option -noinitial-audio-sync can be used
to disable this and return to old behavior.
2010-11-13 19:46:02 +02:00
Uoti Urpala
3d999246e4 audio: add -gapless-audio option
If the option is enabled and all audio has been buffered to the AO,
then the player will move to the next file without waiting for the
buffered audio to drain, while leaving the AO initialized. If the
playback of the next file starts quickly enough (before the AO buffer
empties) then it should continue writing audio to the same AO with no
gap in between.
2010-11-12 18:29:09 +02:00
jrash
d067f6a2a0 DOCS/man/zh_CH: sync with en/mplayer.1 rev. 32566
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32567 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-07 21:48:16 +02:00
reimar
c69e262a62 vf_stereo3d: Add stereo3d filter
Further review very welcome, but it is time (and good enough) to add this.

Patch by Gordon Schmidt [gordon.schmidt s2000.tu-chemnitz de] with
changes by Endre Kollár [taxy443 gmail com].

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32527 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 07:48:40 +02:00
Uoti Urpala
3cb3bbbddc Add a simple capture feature (-capture)
If a specified key is pressed during playback, the current stream is
captured to a file, similar to what -dumpstream achieves.

original patch by Pásztor Szilárd, don tricon hu

Taken from the following svn commits, but with several fixes and
modifications (one obvious user-visible difference is that the default
key binding is 'C', not 'c'):

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32524 b3059339-0415-0410-9bf9-f77b7e298cf2

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32529 b3059339-0415-0410-9bf9-f77b7e298cf2

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32530 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 07:48:31 +02:00
attila
fb8a99a81b manpage: Make commas and backslashes show properly
patch by Rudolf Polzer (divVerent)

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32519 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:38 +02:00
reimar
dbd5feedd5 new slave command: af_cmdline, for changing audio filter options
Add experimental af_cmdline slave command to allow changing filter
options at runtime.

Patch by Adrian Stutz [adrian sttz ch]

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32505 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:37 +02:00
diego
374eb4f188 DOCS/man: Add missing values for the chanlist suboption of -tv
patch by Giorgio Vazzana, mywing81 gmail com

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32447 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:08 +02:00
Gabrov
993f99fc2e DOCS/xml/hu: synced with r32361
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32362 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:08 +02:00
diego
29dcd8808d DOCS/xml: Remove outdated warning about obsolete gcc 2.96.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32283 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:55 +02:00
diego
868fb5d278 build: update DirectFB requirements, reduce #ifdefs
Require DirectFB version 0.9.15 instead of 0.9.13.
This simplifies the build system at the cost of requiring a library
version that was released at the end rather than the middle of 2002.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32251 b3059339-0415-0410-9bf9-f77b7e298cf2

Simplify DirectFB check.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32252 b3059339-0415-0410-9bf9-f77b7e298cf2

Require DirectFB version 0.9.22.
This allows getting rid of a lot of library version check #ifdeffery.
Release 0.9.22 is from February 2005, so the requirement is reasonable.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32253 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:55 +02:00
jrash
d8c6e479a1 DOCS/man/zh_CN: Synced with rev. 32066
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32130 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:45 +02:00
reimar
477769e6b3 manpage: Clarify the meaning of the -nosub option
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32014 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:49 +02:00
diego
573ec84910 DOCS/xml: edit TV/radio chapters
Remove empty paragraph from TV input chapter.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31977 b3059339-0415-0410-9bf9-f77b7e298cf2

Merge TV input and TV teletext chapter into the usage chapter.
This improves the overall structure of the documentation.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31978 b3059339-0415-0410-9bf9-f77b7e298cf2

Restore mistakenly removed TV input chapter introduction.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31979 b3059339-0415-0410-9bf9-f77b7e298cf2

Merge radio chapter into the usage chapter.
This improves the overall structure of the documentation.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31980 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:49 +02:00
diego
a81c889a1d DOCS/xml: Merge CD/DVD chapter into the usage chapter
This improves the overall structure of the documentation.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31970 b3059339-0415-0410-9bf9-f77b7e298cf2

Merge CD/DVD chapter into the usage chapter for all translations.
This improves the overall structure of the documentation.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31971 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:49 +02:00
diego
022515479f DOCS/xml/zh_CN: replace usage.xml symlink to English with copy
Remove usage.xml symlink in the Chinese documentation translation.
It will be replaced with the English text in a moment.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31965 b3059339-0415-0410-9bf9-f77b7e298cf2

Add copy of English usage.xml file to Chinese translation.
This will be useful to merge other parts of the Chinese translation into it.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31966 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:49 +02:00
diego
fb46c7bdbe DOCS/xml: Remove pointless compilation sections from radio and TV input chapters
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31947 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:48 +02:00
diego
f01d26822e DOCS/xml: Integrate advanced audio usage sections into the general usage chapter.
This avoids an empty chapter that just contains sections.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31940 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:48 +02:00
diego
36a2552760 DOCS/xml: Remove bogus teletext hotkeys section
It is both wrong and misplaced.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31936 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:48 +02:00
jrash
27fcef8df1 DOCS/man/zh_CN: sync with en/mplayer.1 rev. 31814
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31867 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:46 +02:00
diego
b1502bd15c DOCS/xml/README: improve
The package list for Debian systems is not specific to the Sarge release.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31841 b3059339-0415-0410-9bf9-f77b7e298cf2

Remove instructions for installing XML/XSL packages from source.
This information is outside the scope of this README file.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31842 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:46 +02:00
diego
3bbc42c43b DOCS/xml/configure: misc changes
Simplify xmllint test.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31836 b3059339-0415-0410-9bf9-f77b7e298cf2

cosmetics: Drop leading underscores from variable names.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31837 b3059339-0415-0410-9bf9-f77b7e298cf2

Remove unused variable fake_docbook_xsl.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31838 b3059339-0415-0410-9bf9-f77b7e298cf2

Adding XML entities for the English XML files to main.xml is enough.
The English version is the master and will always be complete.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31839 b3059339-0415-0410-9bf9-f77b7e298cf2

cosmetics: Use more compact "if .. then" shell syntax.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31840 b3059339-0415-0410-9bf9-f77b7e298cf2

Simplify adding --catalogs option to xsltproc/xmllint command line.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31843 b3059339-0415-0410-9bf9-f77b7e298cf2

Add an XML catalog search path that works for current macports systems.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31844 b3059339-0415-0410-9bf9-f77b7e298cf2

whitespace cosmetics: fix indentation

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31845 b3059339-0415-0410-9bf9-f77b7e298cf2

Skip searching for an xmllint command.
The xmllint target is separate from building the documentation; thus if xmllint
is not available, the xmllint targets can fail without further harm.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31846 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:46 +02:00
diego
a103afe7a4 DOCS/xml/en/documentation.xml: mark MPlayer as GPL v2 only
Almost all files are v2+, but there are some bits of v2 only code
left, so MPlayer as a whole is still v2 only.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31835 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:46 +02:00
Gabrov
34cfcd33df DOCS/*/hu: synced with r31833
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31834 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:46 +02:00
diego
6db1ac87fc DOCS/xml: updates
Drop one pointless subsectioning level from radio input chapter.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31815 b3059339-0415-0410-9bf9-f77b7e298cf2

Remove subsection that describes how to tweak CD/DVD drives.
It is getting outdated and outside the scope of MPlayer documentation.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31816 b3059339-0415-0410-9bf9-f77b7e298cf2

Remove pointless and non-informative SDL section from video output chapter.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31817 b3059339-0415-0410-9bf9-f77b7e298cf2

Drop one level of pointless subsectioning.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31818 b3059339-0415-0410-9bf9-f77b7e298cf2

Split TV chapter in two.
This avoids a chapter without content apart from the (sub)sections.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31819 b3059339-0415-0410-9bf9-f77b7e298cf2

Remove MTRR section from video output chapter.
The information it contains should be irrelevant in 2010.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31820 b3059339-0415-0410-9bf9-f77b7e298cf2

Remove graphics cards subsections from Xv section in video output chapter.
The information contained is very outdated.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31821 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:46 +02:00