Commit Graph

32737 Commits

Author SHA1 Message Date
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 156ba34ac7 Copyright: delete removed library copies from list 2011-02-01 04:42:37 +02:00
Uoti Urpala 5db34ebd93 terminal output: change infamous "Core dumped" message
The "Core dumped ;)" message printed after finishing a stream dump is
known to confuse users but was kept as "humor". Change it to say
"Stream dump complete." instead.
2011-02-01 04:30:02 +02:00
Uoti Urpala ebce4808fc manpage: remove BUGS section, misc fixes
About the only useful part of the BUGS section on the manpage was a
link to mplayerhq.hu, and that doesn't really apply any more (includes
references to Subversion etc). Remove that section and update/remove
some outdated info.
2011-02-01 04:22:11 +02:00
Uoti Urpala fad3585ef4 options: remove CONF_OLD option flag
The resulting semantics of this flag are weird enough that they're
unlikely to be what is wanted in any situation. Remove the flag and
convert the two options using it, -screenw and -screenh, to use
CONF_NOSAVE instead. I'm not sure why those specific options had the
flag and if any flag is really needed, but I don't want to check in
detail now and using CONF_NOSAVE should keep about the same behavior
in practice.

A bit more detail about the weird behavior this flag had:

When not using file groups, the flag had the same behavior as
CONF_NOSAVE, namely that when switching files the option would not be
reset to the global value (only possible file-specific settings were
applied). When using file groups, group-specific options would apply
to the _first two_ files in the group, but for the rest after the
first two, settings would not be reset when changing files (wtf?).
This was a result of the following sequence:
1) push higher-level settings, enter group
2) apply group-specific settings
3) push settings before applying ones specific to file 1 in group
4) apply file 1 settings, play file 1
5) pop settings to return to group settings
6) push settings before applying ones specific to file 2
7) apply file 2 settings
8) pop settings

Here the option was set at 2). 3) saved it because it had been set
after last push, so 5) restored the setting and it was used for file 2
too. However 6) no longer saved it because there had been pushes after
the original setting in 2), thus 8) no longer restored the setting and
the option was no longer forced to any particular value when playing
further files after that.
2011-01-31 21:53:05 +02:00
Uoti Urpala 4ea60a3d0e options: mark -fs with CONF_NOSAVE to keep state between files
Most of the time users want to keep current fullscreen state when
switching to another file, rather than always resetting to the global
default that was determined when the command line was parsed. Add the
CONF_NOSAVE flag to the -fs option to achieve this. The change means
that the fullscreen state from the previous file is kept unless there
is an explicit file-specific -fs or -nofs setting for the new file
(or in case file groups are used, moving to the new file enters a
group with explicitly specified state).
2011-01-31 21:15:59 +02:00
Uoti Urpala f923fd720c options: remove unused "func_full" option type
vo_zr was the last user of the "func_full" option type. I think it's
better if future features are implemented using more straightforward
option functionality. Delete the func_full implementation.
2011-01-31 16:03:11 +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
Uoti Urpala b138ca43ca vo_dxr2, ao_dxr2: drop dxr2 support
dxr2 support had been broken quite a while and nobody noticed. There
were finally commits to fix it in the svn repo, but rather than apply
those I'll just drop dxr2 support.
2011-01-31 16:03:10 +02:00
Uoti Urpala 6d534cd3cb vidix: drop VIDIX support
By now VIDIX is too obscure to justify the amount of code and
complexity it requires in the sources. Although there is no pressing
need to drop it just now from a code point of view, I'll rather remove
it before release than release with VIDIX support and then drop it
later.

Some of the manpage mentions of VIDIX were in "this option supported
for these VOs" lists that looked outdated and failed to mention vdpau
for example. Replace such incorrect lists with a generic "not
supported for all VOs" mention.
2011-01-31 16:03:10 +02:00
Uoti Urpala 902289f2b3 translation: remove \r and \n from translated PAUSE string 2011-01-31 16:03:10 +02:00
diego c1dfa22eba cosmetics: configure: Drop leading underscore from _need_* variables
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32816 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-01-31 16:03:10 +02:00
reimar 35ceaf8918 cache: suggest increasing cache size in the "not filling!" message
Change "cache not filling" warning to include a hint to increase the
cache size.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32815 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-01-31 16:03:10 +02:00
diego 1ff555e2ed configure: add return_check and return_statement_check helpers
cosmetics: Move header_check helper function.

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

Add return_check() helper function and use it to simplify some checks.

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

Add return_statement_check() helper function and use it to simplify some checks.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32806 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-01-31 16:03:10 +02:00
cboesch 5cb40ec42f mplayer.c: simplify code a bit, remove "main:" label
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32791 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-01-31 16:03:10 +02:00
cboesch 303865cb81 cleanup: vo_md5sum: Remove unused define/undef
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32786 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-01-31 16:03:10 +02:00
reimar 9cc34ca725 stream/http: assume MakeMKV webservers always support ranges
Add MakeMKV to list of webservers always supporting ranges even when
they claim otherwise.

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

Fix hack to check for MakeMKV server being inverted.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32807 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-01-31 16:03:10 +02:00
siretart 65cc2366a3 TOOLS/: minor fixes in tool code
Fix printf format string warning

fixes this warning:
asfinfo.c: In function 'print_video_header':
asfinfo.c:158: warning: format '%.4s' expects type 'char *', but argument 3 has type 'long int *'

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

add missing fclose

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

add missing fclose()

found by cppcheck:
[avisubdump.c:199]: (error) Resource leak: f

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32776 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-01-31 16:03:10 +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
diego 659c500084 ao_coreaudio: fix compilation on OS X 10.4.
This version is the last OS version available for certain classes of
PPC Macs, but it lacks AudioDeviceIOProcID, so it has to be emulated.

patch by Aaro Koskinen, aaro.koskinen iki fi

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32770 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-01-31 16:03:10 +02:00
compn d1d8892fdf DOCS/tech/codecs.conf.txt: add notes about BE/LE colorspaces
Add some notes about BE/LE colorspaces and fix a small typo.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32769 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
ranma 1c37a03ac6 libmpdemux/mf.c: Don't hardcode filename length
Use limits.h to get the maximum length instead of hardcoding it.
Original patch by Sang-Uok Kum.

Signed-off-by: Tobias Diedrich <ranma@google.com>

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32766 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 359e85c234 osdep: tweak some #includes
Add/remove a few standard header #includes in osdep files.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32762 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-01-31 16:03:10 +02:00
reimar 6bed5460eb configure: Define _XOPEN_SOURCE to 600 in mkstemp check
Define _XOPEN_SOURCE to 600 instead of 500 in mkstemp check, this is
consistent to the use in libavcodec, consistent with other
_XOPEN_SOURCE defines in tests and it fixes detection on Solaris that
refuses to compile system headers when combining std=c99 with
_XOPEN_SOURCE 500.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32759 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-01-31 16:03:10 +02:00
diego af0e2107b2 configure: add define_statement_check function
Add define_statement_check function and use it to simplify some checks.

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

Simplify a bunch of configure checks with the statement_check function.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32760 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-01-31 16:03:10 +02:00
reimar 23fdd9463c stream/tvi_v4l2.c: simplify by using getfps helper function
Use getfps helper function everywhere, simplifies code and avoids a
possible division by 0.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32755 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
cboesch 74c285e090 cleanup: define ROUND() macro in mpcommon.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32751 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-01-31 16:03:10 +02:00
diego 14c5377a0f DOCS/xml: don't use old "--with-extralibdir" configure option
Replace mentions of obsolete '--with-extralibdir' configure option by
'--extra-ldflags'.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32748 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-01-31 16:03:09 +02:00
diego d5a4a63d4b configure: simplify some tests
Simplify vector declarations and fast inttypes check with statement_check().

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

Drop unnecessary Xlib.h #include from Xss screensaver extensions check.

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

configure: Simplify *BSD ioctl_meteor.h check.

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

Add sys/time.h #include to videodev.h/videodev2.h checks.

Older kernels had broken videodev* headers that lacked the required #include.
patch by Michael Lampe, mlampe0 googlemail com

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

Revert previous wrong simplification of AltiVec vector declarations check.

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

cosmetics: Drop some unnecessary end-of-line backslashes after &&/||.

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

cosmetics: Get rid of some backslashes at the end of lines.

This is done by either moving the logical &&/|| operators to the
preceding line or by merging the two lines together.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32753 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-01-31 16:03:09 +02:00
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
reimar 7c87946c69 loader: Remove __ptr32 and __ptr64 typedefs
We do not need them and they cause compilation errors with cygwin's
mingw-w64 cross-compilers (32 bit target) since its _mingw.h has a
"#define __ptr32", which makes these typedefs an invalid syntax.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32728 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-01-29 04:05:28 +02:00
reimar c46bd9a252 build: cygwin: don't rely on _WIN32 being defined
configure: Compilation fixes for current Cygwin

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

Do not #define _WIN32 on the command line for Cygwin.

Newer Cygwin versions no longer do this and hopefully we should be able
to survive without this hack as well.  This change necessitates adapting
two #ifdefs in the MPlayer codebase.  It is committed untested as I do
not have access to a Cygwin system.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32763 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-01-29 04:04:53 +02:00
cboesch b11e69b22a cleanup: Replace two malloc+memset with calloc.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32723 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-01-29 02:50:00 +02:00
reimar 7c8cb100af vo_gl: mark llvmpipe as a software renderer
llvmpipe, while only slow instead of insanely slow, is a software
renderer. Recognize it as such and disable -vo gl_nosw on it.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32719 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-01-29 02:48:58 +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
cboesch f8973099ba stream/http: support 307 (Temporary Redirect) responses
Patch by chocolateboy (chocolateboy from cpan org)

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32717 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-01-29 02:40:56 +02:00
Uoti Urpala da8c199505 core: timing: fix overflow with extreme playback speed
With extreme playback speed changes it was possible to trigger an
overflow in code calculating frame timing. This could break the VDPAU
frame scheduling mechanism and lead to the shown picture not changing
until reset by events such as seeking. Add an extra check to prevent
the overflow.
2011-01-28 20:15:22 +02:00
Uoti Urpala 5a0e71a972 commands: improve playback speed property/commands
Add a definition to show the playback speed property on screen, and
change the separate commands (speed_mult etc) to use the property
mechanism. Now 'set_property_osd speed' can show the value on OSD, and
the separate commands respect the range limits of the option.
2011-01-28 20:13:58 +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 c9026cb321 sub/OSD: move some related files to sub/ 2011-01-26 20:39:05 +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 828af33bfe subtitles: change default libass rendering style
Change the default style used for rendering plaintext subtitles with
libass. The following attributes change:

* FontSize: Increase the size multiplier used with the default
  -subfont-autoscale 3 from 1.4 to 1.7, thus making the font 21%
  larger. Actually implementing the -subfont-autoscale modes other
  than 1 would give a multiplier of 5/3=1.67 for 4:3 aspect ratio
  video, sqrt(337)/9=2.04 for 16:9.

* PrimaryColour: Change color from yellow to white.

* Outline: Before this was 2 regardless of user font size choice. Make
  it FontSize/16 instead. With default font size this is about half
  the previous width.

* Kerning: Enable kerning for the track. There won't be styling
  designed for VSFilter's lack of kerning, and hopefully people won't
  use broken fonts with bad kerning tables for the default font
  either.
2011-01-26 20:39:04 +02:00
Uoti Urpala 304cafd31d demux_mkv, chapters: change millisecond arithmetic to ns
demux_mkv kept various integer timestamps in millisecond units.
Matroska timestamp arithmetic is however specified in nanoseconds
(even though files typically use 1 ms precision), and using ms units
instead of that only made things more complex. Based on the demux_mkv
example the general demuxer-level chapter structure also used ms
units. Change the demux_mkv arithmetic and demuxer chapter structures
to use nanoseconds instead. This also fixes a seeking problem in
demux_mkv with files using a TimecodeScale other than the usual
1000000 (confusion between ms and TimecodeScale*ns units).
2011-01-26 20:39:04 +02:00
Uoti Urpala a248c2c7a1 cleanup: rename ass_* functions to mp_ass_*
The various ass_* functions were created when libass was part of the
MPlayer tree and the distinction between MPlayer-specific and other
functions was less clear. Now that libass is a clearly separate
library, using the same ass_* namespace for player functions is ugly.
Rename the functions to use mp_ass_ prefix instead.
2011-01-26 20:39:04 +02:00
Uoti Urpala 966340b31a subs: use correct font aspect ratio for libass + converted subs
Rendering of ASS subtitles tries to be bug compatible with VSFilter
and stretches fonts when the video is anamorphic (some scripts try to
compensate for this VSFilter behavior, so trying to render them
"correctly" would give the wrong result). However this behavior is not
appropriate for subtitles we converted to ASS format ourselves for
libass rendering, as they certainly don't have VSFilter bug
workarounds. Change the code to use different behavior for "native"
ASS tracks and converted ones. It's questionable whether the
VSFilter-compatible behavior is appropriate for external .ass files
either, as there could be anamorphic and non-anamorphic versions of
the same video and the bug-compatible behavior can only be correct for
one alternative at most. However it's probably better to keep it as a
default at least, so that extracting a muxed subtitle track and using
that does not give behavior different from the original muxed one.

The aspect ratio setting is per ASS_Renderer, and changing it resets
libass caches. For that reason this commit adds separate renderer
instances to use for the "correct" and "VSFilter bug compatible"
cases.
2011-01-26 20:38:53 +02:00
Uoti Urpala 8612c771fc cleanup: some random minor code simplification and cleanup 2011-01-26 13:04:17 +02:00