1
0
mirror of https://github.com/mpv-player/mpv synced 2024-12-29 02:22:19 +00:00
Commit Graph

33795 Commits

Author SHA1 Message Date
mplayer-svn
94c34b95aa af: some spelling/grammar fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34349 b3059339-0415-0410-9bf9-f77b7e298cf2
Author: reimar
2012-08-03 01:34:25 +02:00
mplayer-svn
af6ac8ef5e af_lavcac3enc: remove pointless casts
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34348 b3059339-0415-0410-9bf9-f77b7e298cf2
Author: reimar
2012-08-03 01:34:09 +02:00
mplayer-svn
6259df5313 demux_audio: improve WAV format detection
Make WAV format detection more restrictive so it does not incorrectly
grab qcp files.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34343 b3059339-0415-0410-9bf9-f77b7e298cf2
Author: reimar
2012-08-03 01:33:55 +02:00
mplayer-svn
e687d1e51a af: fix crash on invalid channel count
Sanitize channel count for libaf to avoid crashes since it is used unchecked.

af_downmix is an example of a function that can/will crash for invalid values.
0 is not invalid since it is used as "autodetect" for output.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34342 b3059339-0415-0410-9bf9-f77b7e298cf2
Author: reimar
2012-08-03 01:33:37 +02:00
mplayer-svn
595928542a vo_md5sum: support printing to stdout
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34313 b3059339-0415-0410-9bf9-f77b7e298cf2
Author: reimar
2012-08-03 01:33:12 +02:00
mplayer-svn
b8c3a20f5e demux_audo: fix wrong runtime and average bitrate for VBR MP3
Do so by determining the number of frames from the Xing/Info/VBRI
headers and by calculation a correct duration which leads to an
reasonable average bytes per seconds.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34273 b3059339-0415-0410-9bf9-f77b7e298cf2
Author: ib
2012-08-03 01:32:39 +02:00
mplayer-svn
273d1ddd71 demux_audio: ensure that demuxer->movi_end will be set
This also simplifies the code that checks for TAG.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34272 b3059339-0415-0410-9bf9-f77b7e298cf2
Author: ib
2012-08-03 01:32:20 +02:00
mplayer-svn
1764bfacca osdep:/glob-win.c: reformat
Use uncrustify on glob-win.c to fix the indentation mess in it.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34239 b3059339-0415-0410-9bf9-f77b7e298cf2
Author: reimar
2012-08-03 01:31:32 +02:00
mplayer-svn
2934b22c80 configure: add -D__STDC_FORMAT_MACROS to CXXFLAGS
This is required to safely #include inttypes.h in .cpp files.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34231 b3059339-0415-0410-9bf9-f77b7e298cf2
Author: diego
2012-08-03 01:31:19 +02:00
mplayer-svn
76ce3b7d6e Replace 'q' printf length modifier by 'll'
'q' is just a deprecated synonym of 'll' that should no longer be used.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34224 b3059339-0415-0410-9bf9-f77b7e298cf2
Author: diego
2012-08-03 01:31:00 +02:00
mplayer-svn
78f51230d7 libmpcodecs: add ad_spdif.c, S/PDIF passthrough decoder
patch by Naoya OYAMA, naoya.oyama gmail com

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

fix ad_spdif

Call av_register_all() before initialising the SPDIF muxer.

Fixes playback with -demuxer mpegts -ac spdifac3.
Patch by Naoya OYAMA, naoya D oyama gmail

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

Use new API avformat_new_stream() instead of the deprecated
av_new_stream().

Patch by Naoya OYAMA, naoya D oyama gmail

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

Cosmetics: Remove empty statement.

Patch by Naoya OYAMA, naoya D oyama gmail

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

Use init_avformat() instead of av_register_all().

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

Author: diego
2012-08-03 01:30:08 +02:00
mplayer-svn
8a9348b079 configure: drop extra standard compiler/linker flags for *BSD systems
Adding the standard library locations to the search path is doubtful
behavior and unnecessary at least on FreeBSD.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34128 b3059339-0415-0410-9bf9-f77b7e298cf2
Author: diego
2012-08-03 01:26:54 +02:00
mplayer-svn
c0c47c3474 x11: change stop_xscreensaver default to 1 to be more user-friendly
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34076 b3059339-0415-0410-9bf9-f77b7e298cf2
Author: reimar
2012-08-03 01:26:33 +02:00
mplayer-svn
9c76680dfb x11: make the stop-xscreensaver option behave as described in the man page
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34074 b3059339-0415-0410-9bf9-f77b7e298cf2
Author: reimar
2012-08-03 01:26:32 +02:00
mplayer-svn
335c6259d2 subreader: fix reading of aqr/subrip09 subtitles
NULL return would indicate EOF, thus the "clear subtitle" entries
would cause sub file parsing to stop.
In addition the wrong sub end times would be used with CONFIG_SORTSUB.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33993 b3059339-0415-0410-9bf9-f77b7e298cf2
Author: reimar
2012-08-03 01:26:22 +02:00
mplayer-svn
c5b0ec92f9 subreader: get rid of some code duplication
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33992 b3059339-0415-0410-9bf9-f77b7e298cf2
Author: reimar
2012-08-03 01:21:52 +02:00
wm4
b0e695cf79 Remove leftover BeOS support stuff
As by mplayer-svn commit 33972. Their BeOS removal was more thorough.
2012-08-03 01:20:51 +02:00
mplayer-svn
92dc567ed9 cache2: make warnings easier to understand
Mark two warnings that usually only indicate a performance issue as such.

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

Another attempt to make message easier to understand.

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

Author: reimar
2012-08-03 01:13:34 +02:00
mplayer-svn
4f04019338 vo_null: do not accept hwaccel formats
Do not accept hwaccel formats since they need special vo
support and thus will actually not work with it.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33953 b3059339-0415-0410-9bf9-f77b7e298cf2
Author: reimar
2012-08-03 01:13:02 +02:00
wm4
9dc8d891d1 configure: drop check for -lposix4
This was needed for ancient Solaris systems.
mplayer-svn dropped this check in r33892.
2012-08-03 01:10:48 +02:00
mplayer-svn
060e581f06 vf_stereo3d.c: half-width side-by-side formats for stereo3d
Half-width side-by-side formats for stereo3d.

Patch by Steaphan Greene [sgreene cs.binghamton.edu]

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33877 b3059339-0415-0410-9bf9-f77b7e298cf2
Author: reimar
2012-08-03 01:09:18 +02:00
wm4
debca22212 loader: remove weird kstat thing
Apparently the win32 binary codec loader used this to retrieve the
CPU frequency on Solaris.
2012-08-03 01:00:55 +02:00
wm4
dfbfc7e75e configure: remove some unused checks 2012-08-03 00:59:39 +02:00
wm4
ebaaa41f2a Remove teletext support
Teletext requires special OSD support. Because I can't even test
teletext, I can't restore support for it. Since teletext can be
considered ancient and obscure, and since it doesn't make sense to keep
the remaining teletext code without being able to use it, I'm removing
it.
2012-08-03 00:12:46 +02:00
wm4
2aef9e2ef3 stream: remove V4L TV input and V4L radio support
There are V4L2 drivers, and the old V4L stuff seems plain unnecessary.
2012-08-02 23:51:54 +02:00
wm4
7059c15f4a mplayer: rip out --capture support
While this was an interesting idea, it wasn't actually useful.
Basically it dumped the raw data (as requested by the demuxer) into a
file. The result is only useful if the file format was raw or maybe
some MPEG packet stream, but not with most modern file formats.
2012-08-02 23:22:52 +02:00
wm4
e48b21dd87 VO: remove VO direct rendering
This was disabled by default, and could be enabled with -dr. It was
disabled by default because it was buggy: there were issues with OSD
corruption.

It wasn't entirely sane for OpenGL based VOs either. OpenGL can chose
to drop mapped pixel buffer objects, requiring the application to map
and fill the buffer again. But there was no mechanism in mplayer to
fill the lost buffer again. (It seems this rarely happened in practice,
though.)

On the other side, users liked the --dr flag, because it promised them
more speed. I'm not sure if it actually helped with speed, but it's
unlikely it had any real advantages on modern systems.

In order to evade the --dr cargo culting in mplayer config files, it's
best to get rid of it.
2012-08-02 22:07:38 +02:00
wm4
6c05d49730 stream: remove stream_cue
stream_cue, which provided the cue:// protocol handler, was extremely
hacky and didn't even manage to play some samples I tried.

Remove it, because it's plain unneeded. There is much better support
for .cue files elsewhere:

- libcdio can play pairs of .cue/.bin files:

      mplayer cdda:// --cdrom-device=your_cue_file.cue

  Note that if the .cue file is not accompanied by a .cue file, but
  an encoded file for example, this most likely won't work.

- mplayer can play .cue files directly:

      mplayer your_cue_file.cue

  This works, even if the .cue file comes with encoded files that are
  not .bin . Note that if you play .bin files, mplayer will assume a
  specific raw audio format. If the format doesn't match, mplayer will
  play noise and destroy your speakers. Note that format mismatches are
  extremely common, because the endianness seems to be essentially
  random. (libcdio uses a clever algorithm to detect the endian, and
  doesn't have this problem.)
2012-08-02 22:07:38 +02:00
wm4
aad9af2033 AF: remove af_gate and af_comp
To quote the manpage: "This filter is untested, maybe even unusable."

And it seems they were never touched again after it was added many
years ago (except for cosmetic changes). Just get rid of them.
2012-08-02 22:07:38 +02:00
wm4
751333eb63 Revert "codecs: prefer libmad over libmpg123"
This reverts commit c8b0f21154.

This was a very bad idea. It caused A/V desync with some crappy AVI
files, and upon inspecting ad_mad.c, it seems all hope is lost.
Go back to the prefering the mpg123 & libav codecs.
2012-08-02 22:07:19 +02:00
Stefano Pigozzi
32ff1fac14 man: update man with vo_corevideo and vo_sharedbuffer
Conflicts:
	DOCS/man/en/vo.rst
2012-08-02 22:07:19 +02:00
wm4
77ef3d4f7e man: update documentation related to screenshots 2012-08-02 22:07:19 +02:00
wm4
83f21cec7b man: remove documentation for deleted stuff
Also make some minor cosmetic changes.
2012-08-02 22:07:19 +02:00
wm4
504e2336b7 manpage: merge new manpage
About a year ago, ubitux converted most of the old manpage from the
hard to maintain nroff format to reStructuredText. This was not merged
back into the master repository immediately. The argument was that the
new manpage still required work to be done. However, progress was very
slow. Even worse: the old manpage wasn't updated, because it was
scheduled for deletion, and updating it would have meant useless work.

Now the situation is that the new manpage still isn't finished, and the
old manpage is grossly out of sync with the player. This is not helpful
for users. Additionally, keeping the new manpage in a separate branch,
while the normal development repository for code had the old manpage,
was very inconvenient, because you couldn't just update the
documentation in the same commit as the code.

Even though the new manpage isn't finished yet, merging it now seems to
be the best course of action. Squash-merge the manpage development
branch [1], revision e89f5dd3f2, which branches from the mplayer2
master branch after revision 159102e0cb.

Committers:

* Clément Bœsch <ubitux@gmail.com> (Initial conversion to RST.)
* Uoti Urpala <uau@mplayer2.org> (Many updates.)
* Myself (Minor edits.)

Most text of the manpage has been directly taken from the old manpage,
because this is a conversion, not a complete rewrite.

[1] http://git.mplayer2.org/uau/mplayer2.git/log/?h=man
2012-08-02 22:05:27 +02:00
wm4
ed3f0c3e4b vf: remove VFCAP_FLIPPED and VFCAP_CONSTANT
These were unused.
2012-08-02 02:51:33 +02:00
wm4
d5315a678e mplayer: expand --title as property, remove --use-filename-title
The --title option, which sets the GUI window caption, is now expanded
as slave mode property string (like osd_show_property_text). Make the
default value for --title include the filename. This makes a behavior
similar to --use-filename-title the default.

Remove the --use-filename-title option, as it's redundant now.
2012-08-02 02:37:00 +02:00
wm4
c7a15ed0dd m_config: reallow specifying static default values for string options
Commit dc2a4863af introduced a new way of specifying default values
for strings (you're supposed to use OPTDEF_STR() instead of putting it
into the option struct, such as it was done in defaultopts.c). The code
to handle the old way was explicitly disabled, which caused random
crashes when used.

Allow the old way again. With the main option struct in particular, I
see no reason why some option defaults should be specified in
defaultopts.c, and some directly along the options.
2012-08-02 02:37:00 +02:00
wm4
16c6e1dee9 cpudetect: remove unused/forgotten crap 2012-08-01 23:49:06 +02:00
wm4
9dbe8e1b84 input: change bind_keys() to use bstr
This seems rather pointless considering there are still stupid
bstrdup0()s left, but maybe this is the right direction.
2012-08-01 23:43:17 +02:00
wm4
a87084c841 Makefile: move commands from distclean to clean and add missing files
There is no reason why generated source files shouldn't be part of the
clean target, as opposed to distclean. On the contrary, having them
in distclean only looks dangerous when trying to deal with broken
dependency rules. Move them to clean, except config.h (which would
require configure to be run again).

Also, some recently added generated files were missing from the clean
targets.
2012-08-01 23:25:52 +02:00
wm4
4b8fa8a597 build: remove references to cpuinfo
This was a horrible little tool to detect the host CPU at build time.
Forgotten in commit 74df1d8e05.

Also remove forgotten codec-cfg entry in .gitignore .
2012-08-01 23:05:59 +02:00
wm4
b35d89d42b input: replace internal key binds with included etc/input.conf
The internal array of default key bindings is removed. Include the
file etc/input.conf at compile time (using the file2header tool), and
parse the default binds from etc/input.conf at startup time.

This lowers maintainance overhead, and makes sure the default bindings
and etc/input.conf don't deviate. Commit f30bf73bf2 already
made sure etc/input.conf matches the default bindings, so this commit
shouldn't change anything user-visible.
2012-08-01 22:52:28 +02:00
wm4
d1ccee76b1 input: refactor: store builtin key binds along user user binds
Builtin (i.e. default) binds are still separately handled, and this
commit shouldn't change any user-visible behavior.
2012-08-01 22:45:35 +02:00
wm4
deddef4c75 input: simplify input.conf parsing
Now input.conf is loaded into memory at once, instead of streaming the
file into the parser.

The real reason for this change is that I want to be able to read the
config file from memory. (Using fmemopen() would have been simpler, but
that is available on sane platforms only.)
2012-08-01 21:50:24 +02:00
wm4
168293e0ae osd: minor simplification of vo_osd_changed()
vo_osd_changed() was a weird function: it was used both to query and
mutate state, which is a bad combination. The VOs used it to query
and reset the state, and the mplayer frontend mostly used it to set
the state. In some cases, the frontend did both (that code used a
variable "int hack" to backup the state and set it again).

Simplify it and make the VOs use a vo_osd_has_changed() function to
query whether the OSD bitmaps have to be recreated. vo_osd_changed()
on the other hand is now used to update state only. The OSD change
state is reset when osd_draw_text() is called.

Update vo_corevideo.m to use vo_osd_resized() as well (forgotten change
from libass-OSD merge).

Simplify osd_set_text() and its usages.
2012-08-01 18:23:28 +02:00
wm4
59b938c8aa stream: remove native RTSP/RTP/PNM support
There are still various other RTSP implementations available, such as
libnemesi, live555, and libav. The mplayer native version was a huge
chunk of old unmaintained code.
2012-08-01 17:47:14 +02:00
wm4
c92538dfaa Remove dead code
This was done with the help of callcatcher [1]. Only functions which
are statically known to be unused are removed.

Some unused functions are not removed yet, because they might be needed
in the near future (such as open_output_stream for the encode branch).

There is one user visible change: the --subcc option did nothing, and is
removed with this commit.

[1] http://www.skynet.ie/~caolan/Packages/callcatcher.html
2012-08-01 17:07:35 +02:00
Stefano Pigozzi
7175f178de gitignore: add osd_font autogenerated file 2012-08-01 08:49:05 +02:00
Stefano Pigozzi
f05013cf86 mangle: change preprocessor define for macosx
__DARWIN is still not defined, use __APPLE__ instead
2012-08-01 08:46:20 +02:00
Stefano Pigozzi
38e705b3e4 vo_corevideo: remove font_load code
This was probably forgotten in the commit that removed the dependency on
freetype.
2012-08-01 08:44:58 +02:00