1
mirror of https://github.com/mpv-player/mpv synced 2024-10-22 08:51:57 +02:00
Commit Graph

31569 Commits

Author SHA1 Message Date
Uoti Urpala
e913d6c5da Merge svn changes up to r31004 2010-04-26 17:55:05 +03:00
Uoti Urpala
be935e2766 Ignore svn changes up to r30974
FFmpeg build stuff.
2010-04-26 17:45:07 +03:00
Uoti Urpala
6a7956a11b Merge svn changes up to r30972 2010-04-26 17:44:48 +03:00
Uoti Urpala
e6048e1830 Skip svn change r30968
Already done long ago in git.
2010-04-26 17:43:35 +03:00
Uoti Urpala
4785c2617e Merge svn changes up to r30967 2010-04-26 17:42:20 +03:00
Uoti Urpala
2732d5efba Skip svn change r30918 2010-04-26 17:13:37 +03:00
Uoti Urpala
95fba94860 Merge svn changes up to r30917 2010-04-26 17:11:04 +03:00
Uoti Urpala
3c2d6d9a8e Merge svn change r30908 2010-04-26 17:00:52 +03:00
Uoti Urpala
ff559b8e90 Merge svn changes up to r30907 2010-04-26 16:57:25 +03:00
Uoti Urpala
d2e25a90c4 core: track current chapter for relative chapter seeks
Due to inexact seeks, chapter seek commands may result in a playback
position that's inside the previous chapter. This causes problems when
the user does repeated next-chapter/previous-chapter seeks, because
the code will use the wrong base for calculating 'next' or
'previous'. Improve the behavior by adding a heuristic that keeps
track of what chapter the user last wanted to seek to and adjusts the
"current chapter" value based on that.
2010-04-25 23:29:46 +03:00
Uoti Urpala
823b989f0f mplayer.c: silence some compiler warnings
No semantic changes.
2010-04-25 23:05:01 +03:00
Uoti Urpala
082287f3a3 cfg-mplayer.h: add casts to silence warnings 2010-04-25 23:00:19 +03:00
Uoti Urpala
66a983985d mplayer.h: remove unnecessary declarations (dvd_device, cdrom_device) 2010-04-25 22:58:35 +03:00
Uoti Urpala
b1372a4f56 cosmetics: mark sub.c:osd_update_ext() static 2010-04-25 22:57:49 +03:00
Uoti Urpala
0b6e3647a5 commands: finish seeks before processing other commands
The code processing seek commands only sets/alters variables
specifying the current seek target. Before all queued commands were
processed first, and any needed seeks were executed after that. This
was somewhat unreliable, as commands queued later were not guaranteed
to see all the effects of earlier seek commands if they happened to be
processed in the same batch. Change the behavior so that processing
commands is interrupted and the real seek executed if the next command
is anything other than a basic seek. This guarantees that other
commands see a consistent state, while still allowing the combining of
consecutive seeks (which is useful for example when the user keeps the
seek-forward key pressed down, and key repeat is faster than seeks can
be executed).
2010-04-25 22:48:40 +03:00
Uoti Urpala
4cb23ad350 input: remove unused "paused" arguments from some functions 2010-04-25 22:48:18 +03:00
Uoti Urpala
1393793cd3 menu.h: add struct tag declaration to avoid warnings 2010-04-25 22:48:10 +03:00
Uoti Urpala
05ae9dbd0d Fix chapter handling with first chapter not at beginning of file
Before "-chapter 1" did nothing even if the first chapter didn't start
at the beginning of file. Fix it.
Before all chapter property commands (including chapter seek keys)
failed if the current playback position was before the start of the
first chapter. Now they'll work. Relative chapter seeks will go to the
first chapter (even if that's in the wrong direction for backward
seeks).
2010-04-25 22:48:10 +03:00
Uoti Urpala
dd1760e697 demux_mkv: fix verbose output of chapter numbering
The "Chapter N from..." lines printed with -v used wrong N.
2010-04-25 22:48:10 +03:00
Uoti Urpala
859e956523 Fix -chapter with ordered chapters
Move the code doing an initial seek specified by -chapter to a
position where it works if ordered chapters are used.
2010-04-25 22:48:10 +03:00
Uoti Urpala
a2133d7684 options: move -chapter values to option struct
-chapter can optionally take a range with a start and an end. Add a
new option type which supports such values and use that instead of a
custom per-option function.

This commit also fixes a build configuration bug: before the
availability of the -chapter option depended on DVD functionality
being enabled in the binary, even though the option works with other
sources too.
2010-04-25 22:48:10 +03:00
Uoti Urpala
9c63c084ff mplayer.c: share seek-reset code with chapter seeks
Move code resetting various things after a seek into a separate
function and use that for chapter seeks too. In most cases this won't
change behavior because chapter seeks were already falling back to the
same time-based seek code.
2010-04-25 22:47:32 +03:00
Uoti Urpala
7be5f14c3a demux_lavf, stream_ffmpeg: support librtmp seeks 2010-04-23 23:50:34 +03:00
Uoti Urpala
1d4d1bff82 stream_ffmpeg, demux_lavf: Use flv demuxer for rtmp streams
Use lavf's flv demuxer for rtmp/rtmps/... stream types. Letting
generic format probing handle this could work, but with the current
probing implementation it'd at least depend on not-really-guaranteed
details of the stream layer (probing different formats and then
decoding depends on seeking back in between; rtmp streams don't
support such seeking directly so would need to rely on details of
caching behavior).
2010-04-23 22:57:25 +03:00
Uoti Urpala
4583c12a2c options: move lavfdopts to option struct 2010-04-23 22:08:18 +03:00
Uoti Urpala
eb48fefe94 stream_ffmpeg.c: change reads back to url_read_complete()
Change reading data from FFmpeg from url_read() back to
url_read_complete(). url_read_complete() behavior has changed in
FFmpeg and no longer returns an error for partial reads at EOF so it's
usable now. Using it is probably not significantly better than
url_read(), but at least it handles EAGAIN.
2010-04-23 21:19:50 +03:00
Uoti Urpala
19907b8fbc demuxer.c: clean up stream-seek code
Only try to use the dvd/dvdnav stream seek hack with those stream
types. Generally demuxers can not be expected to cope with the stream
suddenly seeking under them. In principle it would be more correct to
make the test demuxer-based (instead of assuming that using stream
seeks in this manner is OK with whatever demuxer that will be used
with these streams), but that'd be more work.
2010-04-23 21:01:21 +03:00
Uoti Urpala
f9d224b1ad Move some sh_audio field setting out of demuxer.c
These fields are decoder details, not information set by the demuxer.
2010-04-23 20:50:11 +03:00
Uoti Urpala
e3bd668ebd Move seek-reset functionality out of demuxer.c
Move code for resetting decoders after seeks, chapter seeks and angle
changes out of demuxer.c. This functionality belongs on a higher
level; the demux layer can't always know what kind of reinitialization
is required.
2010-04-23 20:14:59 +03:00
diego
00959d5cf7 Remove no longer necessary CONFIG_SWSCALE from config.h/config.mak.
FFmpeg now builds with the software scaler enabled by default.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31004 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-04 16:32:54 +00:00
diego
275efd21b1 Mark parameterless function declarations as (void). Fixes the warnings:
loader/wine/msacm.h:693: warning: function declaration isn't a prototype
loader/wine/msacm.h:901: warning: function declaration isn't a prototype


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31003 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-04 16:21:07 +00:00
diego
2c7f1f8156 Mark input-related m_option_t arrays as const.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31002 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-04 16:15:38 +00:00
diego
935147dd64 Mark vf_size_preset_fields m_option_t array as const.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31001 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-04 16:15:08 +00:00
diego
51d72c7764 Mark muxer-related m_option_t arrays as const.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31000 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-04 16:12:23 +00:00
diego
637dd3d064 Mark cfg_fields m_option_t array as const.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30999 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-04 16:11:20 +00:00
diego
d2d509dc39 Mark dxr2_opts array as const.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30998 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-04 16:08:15 +00:00
diego
75fad5bac6 Mark encoder-related m_option_t struct arrays as const.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30997 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-04 15:59:09 +00:00
diego
f8a9b4e17a Revert marking m_option struct member as const.
It is used for non-const things, so the original change was wrong.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30996 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-04 15:57:17 +00:00
reimar
22f6170009 Share more code between the two ATI fragment shader YUV to RGB
conversion methods and extend them to support more accurate
conversion (though at the cost of some speed).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30995 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-04 11:45:05 +00:00
reimar
4a8486f844 Try to detect and work around broken glXGetProcAddress on at
least PPC OS X 10.4.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30994 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-03 20:31:03 +00:00
reimar
269b96d75e Implement OpenGL-based YUV to RGB version for Radeon 9200 class
cards on OS X.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30993 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-03 19:58:06 +00:00
diego
c7cdd996f5 Remove commented-out #include of a non-existing file.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30992 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-03 14:40:08 +00:00
diego
ff93cd656b Add a header for x264enc_set_param() instead of forward declaring it.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30991 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-03 14:20:34 +00:00
diego
8b4b82d008 Remove pointless #ifdef CONFIG_LIBAVCODEC preprocessor check.
The file is only compiled if that condition is true.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30990 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-03 13:51:14 +00:00
diego
e7a1dbc122 Mark m_option struct member as const.
This fixes many warnings similar to:
cfg-mplayer.h:368: warning: initialization discards qualifiers from pointer target type


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30989 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-03 11:06:57 +00:00
reimar
0c6b8880ce Indentation fix.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30988 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-03 07:12:32 +00:00
reimar
2cebf8eeb7 Add mpgl prefix to all OpenGL-related function pointers.
This is necessary because at least the GetString symbol
causes clashes on PPC OSX 10.4, causing -vo gl to always
crash.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30987 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-03 07:08:07 +00:00
attila
0a49e5e96c dont mention base64 about sending attachments.
this may (and has) confused people, beside
that 99.9% of all MUA will do the right thing
here anyways.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30986 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-02 17:29:22 +00:00
cehoyos
103ca0c902 Cosmetics: Fix indentation.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30985 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-02 10:13:45 +00:00
cehoyos
1468d39b01 Do not try -march=native for icc.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30984 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-02 10:13:08 +00:00