Commit Graph

29413 Commits

Author SHA1 Message Date
Uoti Urpala f2864e9a07 x11_common.h: Remove declarations of some nonexistent variables 2009-05-04 03:53:50 +03:00
Uoti Urpala b863100784 core: Set mpctx->chapters to NULL at uninit
The uninit code called talloc_free(mpctx->chapters) but didn't clear
the pointer. As a result playing a file with ordered chapters and one
without almost certainly triggered an abort when closing the second
file. Fix by setting the pointer to NULL after freeing.
2009-05-03 21:48:58 +03:00
Uoti Urpala ce35ed0209 vd_ffmpeg.c: Use FFmpeg-mt compatible code for codec delay
This code to calculate codec delay should work with both with regular
FFmpeg and FFmeg-mt. This MPlayer version is not completely compatible
with current FFmpeg-mt though, since it has a build system change
which matches upstream FFmpeg but hasn't been integrated in FFmpeg-mt
yet (RUNTIME_CPUDETECT -> CONFIG_RUNTIME_CPUDETECT rename).
2009-04-30 03:54:34 +03:00
Uoti Urpala 017fafac44 core: Handle missing timestamp errors a bit better
If there is no timestamp available for a video frame at all, use
timestamp from the previous frame (if any) instead of leaving it as
MP_NOPTS_VALUE. The main practical difference for playback is that
MP_NOPTS_VALUE caused timing to be reset, moving current video
position immediately to time of the next frame that had a timestamp
and thus likely advancing the video too fast. Now the next frame with
a timestamp will be shown at its proper position relative to the
previous timestamp.
2009-04-24 04:00:42 +03:00
Uoti Urpala 1b272e3b2d demux_lavf: Make absolute seek time 0-based instead of file start
demux_lavf interpreted absolute seeks as relative to the start of the
file, so if the file didn't start at timestamp 0 then seeking to
timestamp X went to a position MPlayer would display as start+X. Make
the seeks use the same timestamps as used in the original file. This
works better for most use cases as no part of MPlayer normally uses or
displays such "since start of file" timestamp values. There could be
some cases where the old semantics are useful, but I think they do not
justify making it the default behavior; a separate feature for that
could be added if it turns out to be needed.
2009-04-24 02:18:19 +03:00
Uoti Urpala 7180728cba stheader.h: Allow inclusion before demuxer.h
stheader.h used 'demuxer_t *' without including demuxer.h, causing
compilation to fail if demuxer.h had not been included first. Use
'struct demuxer *' instead so the type does not need to be defined.
2009-04-19 17:37:03 +03:00
Uoti Urpala d9066294f9 defaultopts.c: Minor simplification
This happens to avoid a compiler bug in the current GCC development
branch.
2009-04-09 04:19:40 +03:00
Uoti Urpala 0e8c38c19b Merge svn changes up to r29154
Synchronizes runtime CPU detection handling in the build system with
latest FFmpeg.
2009-04-09 02:38:37 +03:00
ramiro ca242e5f73 Rename RUNTIME_CPUDETECT to CONFIG_RUNTIME_CPUDETECT and always define it.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29154 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-08 20:21:21 +00:00
diego 94959cc333 Specify precise dependencies for generated header file codecs.conf.h.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29153 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-08 18:25:23 +00:00
cehoyos 51623a5995 Reduce compilation time after version.h was updated.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29152 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-08 16:13:51 +00:00
diego 79701be883 Fix wrong syntax in test example, noticed by Jason Holt, jholt google com.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29151 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-08 11:56:09 +00:00
Uoti Urpala 6dd56815b4 Merge svn changes up to r29150 2009-04-08 02:46:32 +03:00
Uoti Urpala 53eeb0e412 Merge branch 'ordered_chapters' 2009-04-08 02:43:44 +03:00
Uoti Urpala 96daf7ed5e Add option -noordered-chapters. 2009-04-08 02:42:19 +03:00
diego 5815029bd2 Add rules to install gmplayer manual pages.
based on a patch by Reinhard Tartler, siretart tauware de


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29150 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-06 14:06:53 +00:00
ramiro b2baebacd3 swscale: Remove X86 commented out code.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29149 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-05 19:17:53 +00:00
Uoti Urpala b309b60a0c vo_xv: Fix context Shminfo table size
This bug could cause problems if you used -dr with xv. The most likely
symptom was crash at uninit.
2009-04-05 16:46:26 +03:00
Gabrov 6f32d685ca synced with r29147
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29148 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-05 04:15:44 +00:00
Gabrov 5386953793 eliminate a trailing whitespace
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29147 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-05 04:14:47 +00:00
jrash e0fe78d4c7 sync with en/mplayer.1 r29133
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29146 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-05 03:50:03 +00:00
ramiro 9442096523 swscale: Use function pointers for swScale functions.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29145 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-04 22:45:02 +00:00
ramiro f89e6c2334 swscale: {}-related cosmetics.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29144 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-04 22:43:24 +00:00
ramiro 8b6298459d swscale: Add const to some swScale functions' parameters.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29143 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-04 22:41:46 +00:00
compn 3a9dbba3c6 remove startup -volume wish, option was added a while ago
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29142 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-04 21:21:40 +00:00
compn 2a18b0bf36 add tivo (ty) and rm (rmvb) to file chooser, fixes bug 663
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29141 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-04 20:30:49 +00:00
cehoyos 133807ced3 Avoid spurious rebuilds on svn up. The check to find out if the header file
changed compared two lines to one, which would result in false positive updates.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29140 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-04 19:50:57 +00:00
diego 389853416f Fix passing CFLAGS and LDFLAGS with = in them as configure parameters.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29138 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-04 14:17:53 +00:00
compn b901ebc9a0 make = and + both adjust audio delay, useful for keyboards without keypads
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29137 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-04 04:27:09 +00:00
Uoti Urpala ce0bf1bd4a Merge svn changes up to r29136
Fixes compilation with latest FFmpeg.
2009-04-03 16:45:21 +03:00
compn a9d4cebae0 add fourccs: dvp and dvs1, from vlc dv video fourcc list
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29136 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-03 13:39:34 +00:00
cehoyos 431ac86c7b Fix compilation for newly added VAAPI_HWACCEL's.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29135 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-03 08:08:44 +00:00
Uoti Urpala 35a7dfc737 Make VO xv preferred over vdpau again
I can still reproduce bugs easily with vo vdpau, and there's no pause
update support for it yet.
2009-04-02 23:55:26 +03:00
Uoti Urpala d136cf6882 Merge svn changes up to r29134 2009-04-02 23:55:13 +03:00
bircoph 83c2df3565 Use native endian float filter provided by libbs2b instead of
selection based on WORDS_ENDIAN.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29134 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-02 20:49:47 +00:00
bircoph 12a6f0c056 Add documentation for libbs2b audio filter.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29133 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-02 19:02:59 +00:00
bircoph e3b6f71b2d Add libbs2b audio filter itself.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29132 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-02 19:01:57 +00:00
bircoph a4861528c6 Support for libbs2b audio filter.
Add auto detection and selection routines to configure.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29131 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-02 19:01:23 +00:00
cehoyos 06c07eb5c0 Fix compilation with libavcodec's HWACCEL.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29130 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-02 18:38:15 +00:00
ramiro 96323d1d5d swscale: Remove mmx2 params from h[yc]scale().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29129 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-02 18:34:11 +00:00
ramiro 9574441a1c swscale: Split h[yc]scale_fast() into their own functions.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29128 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-02 18:32:49 +00:00
ramiro 755c96e953 swscale: Execute sfence and emms depending on runtime flags.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29127 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-02 18:31:22 +00:00
diego 2e903f7c75 Remove unnecessary malloc.h #includes and related #ifdeffery.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29126 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-02 09:20:48 +00:00
diego 77416e41cf Add recently added FFmpeg subdirs to DIRS variable.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29125 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-02 08:42:16 +00:00
Uoti Urpala 2d91b19956 Support chapter seeking with ordered chapters 2009-04-02 06:51:26 +03:00
Uoti Urpala f12c83b85b Change demuxer_seek_chapter() parameters
Remove the "num_chapters" and "mode" parameters that aren't needed by
any callers. Change "float *seek_pts" to "double *". Allocate the
string returned via "chapter_name" with talloc.
2009-04-02 06:51:26 +03:00
Uoti Urpala 997f636599 demux_mkv: Remove first_tc and stop_timecode
The first_tc code was used to force timestamps in the file to start
from 0. There should be no need to do this, and it would likely break
ordered chapter support for any files it affected (since the chapter
timecodes would refer to the original times, not the modified ones).

stop_timecode was used to implement end of playback at a specified
chapter. There is now common code which implements that and
demuxer-specific implementations are not needed.
2009-04-02 06:51:26 +03:00
Uoti Urpala 901ea8880a demux_mkv: Adjust seeks a bit to catch inexact keyframe matches
Allow a seek to "time X or before" to match a keyframe at X plus 1 ms,
and correspondingly for seeks to "X or later". This allows seeks to a
known keyframe to succeed even if the time is not quite perfectly
exact.

The main motivation for this improvement was chapter seeking. Some
time ago things worked in practice because chapter times were slightly
below the exact target and demux_mkv seeked forward of the specified
position by default. Some commits ago demux_mkv started seeking
backward by default, which is generally a more desirable behavior, but
worked worse for the chapter times which happened to be slightly
behind a keyframe rather than ahead. After this commit chapter seeks
go to the desired keyframe again.
2009-04-02 06:51:26 +03:00
Uoti Urpala 7db6430959 VO: Don't reset pause status in VO config() functions
Many VOs kept track of pause status, but reset the value when their
config() function was called. However it can be called while playback
stays in pause mode. Modify the VOs to not change anything in
config(). Also send the VO either VOCTRL_PAUSE or VOCTRL_RESUME when
the playback of a new file is starting to make sure they have the
right status.
2009-04-02 06:51:26 +03:00
Uoti Urpala 861d6d2bd9 Make -fixed-vo the default
Lack of -fixed-vo causes the output window to be recreated not only
when changing files but also when switching the video stream, and that
happens when moving from one ordered chapter source to another. Having
the window disappear and reappear (likely at another location if it
was ever moved) is just too annoying.
2009-04-02 06:51:26 +03:00