Commit Graph

31589 Commits

Author SHA1 Message Date
Uoti Urpala ba3b65b92f Skip svn changes up to r31022 2010-04-26 18:06:49 +03:00
Uoti Urpala 837c48ddee Merge svn changes up to r31020 2010-04-26 18:06:00 +03:00
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 151e497922 Add -MP to dependency command.
This should avoid issues with make stalling after header files
have been renamed or removed.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31022 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-05 17:15:08 +00:00
diego 093e1cb672 Drop unused DEPEND_CMD from config.mak; FFmpeg no longer needs it.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31021 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-05 17:11:58 +00:00
reimar 7bf961b1a3 Remove unused functions.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31020 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-05 16:42:52 +00:00
reimar 9521c190c3 Export VCD tracks as chapters, just like for cue:// URLs.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31019 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-05 16:40:04 +00:00
reimar d55c67d157 Change ifdefs to make more sense: HAVE_SSSE3 should only be around SSSE3-code,
not around MMX code etc.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31018 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-05 16:38:40 +00:00
diego bafe08d111 VBlankActiveFunc is a pointer to a parameterless function; mark it as such.
This fixes the warning:
vidix/sis_vid.c:96: warning: function declaration isn't a prototype


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31017 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-05 15:58:38 +00:00
reimar a55acacbda Fix RGB support for corevideo: corevideo can only support
ARGB and BGRA, which depending on endianness matches only one
of RGB32 and BGR32.
Also add RGB24 support which works independent of endianness,


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31016 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-05 13:11:06 +00:00
reimar c0b8b92d99 Enable OSD also for BGR32, the code is the same as for RGB32.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31015 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-05 07:22:21 +00:00
reimar a8a98ee6d1 Implement VOCTRL_DRAW_IMAGE instead of the deprecated draw_frame, avoiding
an extra memcpy in case of stride mismatch.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31014 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-05 07:15:22 +00:00
reimar e6455d7161 Check texture dimensions instead of internal format in max texture
size check to work around OS X ATI driver bugs:
- does not keep format but use an equivalent one (1 becomes 0x8040).
- does not set to 0 on failure but to 0x8018


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31013 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-04 19:56:26 +00:00
reimar 3107620451 Cosmetics/reindent.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31012 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-04 19:44:03 +00:00
reimar 1a42a53fd2 Avoid duplicating a condition.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31011 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-04 19:42:52 +00:00
reimar 5e8cfc7230 Print width before height,
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31010 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-04 19:39:54 +00:00
reimar 475a831ac8 Fix width/height mixup in error message.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31009 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-04 19:38:47 +00:00
diego ce1ade971d Remove -O4 from FAAC check, it is in our standard CFLAGS already.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31008 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-04 17:57:00 +00:00
diego cc30ded639 Directly use CFLAGS for ASFLAGS instead of duplicating the variable content.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31007 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-04 17:18:47 +00:00
reimar b8a7ed8a79 Factor out the YUV->RGB conversion auto-selection and also
enable auto-selection of ATI fragment shaders since they
should do accurate conversions now.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31006 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-04 16:56:30 +00:00
diego ad26195a80 cosmetics: prettyprint config.mak somewhat
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31005 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-04 16:48:46 +00: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