1
0
mirror of https://github.com/mpv-player/mpv synced 2025-01-02 21:12:23 +00:00
Commit Graph

32225 Commits

Author SHA1 Message Date
Uoti Urpala
d9e3281608 demux_mkv: support V_MJPEG video tag 2010-10-27 01:46:05 +03:00
Uoti Urpala
dd61521a6e demux_mkv: accept files with no doctype in EBML header
Assume files which start with an EBML header but have no DocType
element in that header have type "matroska", and attempt to play
them. Reportedly some mkvmerge versions create such files.
2010-10-21 22:58:51 +03:00
Uoti Urpala
7a190c461b TOOLS/matroska.py: recognize ChapCountry 2010-10-21 21:47:12 +03:00
Uoti Urpala
96312757c5 vd_ffmpeg: fix aspect ratio problems with recent FFmpeg
The code left ctx->last_sample_aspect_ratio at 0/0 when allocating a
context. In older FFmpeg versions av_cmp_q() against 0/0 always said
the numbers are equal; but this changed recently, triggering incorrect
overwrite of container aspect ratio. The logic looks like it'd need
further fixes, but for now just initialize last_sample_aspect_ratio to
0/1; this should restore the previous behavior from before FFmpeg
changes, which worked well enough for the most common cases.
2010-10-16 05:14:25 +03:00
Uoti Urpala
266e0341ba vd_ffmpeg: fix calloc/av_free mixup
avctx->palctrl was allocated with calloc() but freed with av_freep().
Free it with free() instead. Also change the main decoder context
allocation to use talloc.
2010-10-16 04:38:20 +03:00
Uoti Urpala
c3b6850e81 af_lavcac3enc: fix assert failure "s->expect_len <= s->pending_data_size"
The code handling input format negotiation incorrectly used the bps
value of the suggested input format instead of the format it was going
to actually use. As a result the player could abort with the above
assertion failure. Fix.
2010-10-14 22:33:09 +03:00
Uoti Urpala
7a669a6407 vo: improve fixed-vo behavior when video size changes in x11 VOs
Now the window is only resized when video size (or size specified by
-geometry) changes; reconfiguring the window with the same size no
longer changes back to default size from possibly user-modified one.

Also fix a bug in fullscreen handling that could cause incorrect
window size when turning fullscreen off.
2010-07-23 03:38:40 +03:00
Uoti Urpala
8362ad36ac Merge svn changes up to r31332 2010-06-05 23:37:42 +03:00
Uoti Urpala
b6db356750 Skip svn change r31329
Already supported.
2010-06-05 23:36:49 +03:00
Uoti Urpala
dde8b753e4 Merge svn changes r31318 to r31328
r31328 is a somewhat questionable (changing the option at that point
isn't quite safe), but it was a failure case already...
2010-06-05 23:35:42 +03:00
Uoti Urpala
331167ae13 Skip svn changes r31316, r31317
r31316 is not exactly wrong, but the way forcing FPS works is overall
quite broken. If there's a real need to add that test then other code
would need to be fixed too.
2010-06-05 23:23:52 +03:00
Uoti Urpala
9ce39d6807 Merge svn change r31315 2010-06-05 23:23:18 +03:00
Uoti Urpala
9b199cda4e Skip svn changes r31308 to r31314 2010-06-05 23:18:48 +03:00
Uoti Urpala
0ef8b61999 Merge svn changes r31306, r31307 2010-06-05 23:16:40 +03:00
Uoti Urpala
0c6ec62753 Skip svn changes r31304, r31305 2010-06-05 23:15:22 +03:00
reimar
601d6af3ec Update codecs.conf version again, we had quite a few additions to it.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31332 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-05 18:11:51 +00:00
reimar
7e9ff557a0 Extend -vf format to allow substituting the format for a compatible one
(e.g. chaning rgb24 to bgr24).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31331 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-05 17:55:20 +00:00
reimar
1689c3422f Fix -vf format and -vf noformat to work with slices.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31330 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-05 17:45:35 +00:00
reimar
bb90bfbd08 Add webm/VP8 support to native matroska demuxer.
Patch by James Zern [jzern google com]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31329 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-05 17:32:11 +00:00
reimar
09bca6575f If we have no FPS value, try enabling -correct-pts mode, it does
not require any FPS value.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31328 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-05 16:46:25 +00:00
reimar
eced1edd7e Add partial support for dirac to TS demuxer.
E.g. no header parsing is implemented so -fps must be specified manually.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31327 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-05 16:37:10 +00:00
reimar
29b2cae621 Also print current stream position in mp_read debug output.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31326 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-05 16:14:56 +00:00
reimar
1581d9deb2 Remove explicit eof check for mp_read code, stream code handles this case
better, e.g. properly supporting growing files.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31325 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-05 16:12:36 +00:00
reimar
159f5f451d Di not do a stream_reset on seeking backwards, the seek itself should
do whatever is best/necessary, this method will just drop cached data.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31324 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-05 16:00:49 +00:00
reimar
244b884728 Do not make seek fail explicitly simply because eof was hit somewhen,
instead reuse the eof checking code further down.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31323 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-05 15:57:57 +00:00
cehoyos
ef14d50ad6 Fix compilation after FFmpeg r23485.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31322 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-05 13:44:20 +00:00
jrash
7b50ebd44b sync with en/mplayer.1 rev. 31292
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31321 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-05 11:38:19 +00:00
reimar
5377f6a0c3 Remove colorspace conversion code from -vo yuv4mpeg, -vf scale should
be able to handle this just as well (or better) including interlaced.
If not, this needs to be fixed there instead of duplicating code.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31320 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-05 06:45:01 +00:00
reimar
06d20bd774 Sync libdvdcss with their latest SVN.
In particular fixes a wring return value check which caused descrambling
to be aborted for no good reason.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31319 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-05 06:41:43 +00:00
reimar
e22ebfddb1 Add support for -geometry x syntax since the documentation claims
it is supported.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31318 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-05 06:28:58 +00:00
reimar
5bd98b116a Do not use libass functions if it is disabled.
Fixes compilation if freetype is not available.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31317 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-04 18:46:22 +00:00
reimar
e41db02518 Default to -correct-pts off if -fps was given, since -fps has no effect
(and doesn't really make sense) with correct-pts mode.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31316 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-04 17:11:56 +00:00
reimar
f0e84a0b23 Force window placement also if -xineramascreen was set >= 0,
not only if -geometry was given.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31315 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-04 17:10:38 +00:00
Uoti Urpala
2b252e9acf configure: fix disabling of (x)mga without swscale internals
The _mga/_xmga variables weren't changed to "no", causing a build
failure if mga/xmga support would have been otherwise enabled but was
only switched off because of the swscale test.
2010-06-04 16:00:18 +03:00
siretart
9e2e3a1cb8 apply missing bits from cd4e8dc1fa
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31314 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-03 21:50:08 +00:00
reimar
637edc7a27 Try always enabling correct pts again for lavf demuxer, since the know
issue with PAFF seems solved to me, and disabled correct-pts causes
flickering with -ass (which of course should be fixed as well though).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31313 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-03 21:01:37 +00:00
reimar
82aabb77d3 Limit buffered PTS only when we actually got a frame from the decoder.
This avoids some issues with H.264 PAFF due to dropping PTS values too
early because only every second packet actually produced output.
Just keeping up to one additional pts value would have avoided this
particular issue as well, but this is more generic.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31312 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-03 20:59:40 +00:00
reimar
9343d1cb2d If an invalid pts value is detected, try to to make up some if it seems
reasonable.
This avoids completely losing A-V sync e.g. when pts was not reordered correctly.
This was tested with http://samples.mplayerhq.hu/V-codecs/h264/PAFF/tv_cut.mkv
for this sample proper pts reordering is the correct solution, but more resilient
handling of the error case is still useful.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31311 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-03 20:39:41 +00:00
siretart
d6d87593a7 vo_yuv4mpeg: disable RGB support when compiling against a shared libswscale
This avoids using swscale internals when compiling against a shared libswscale.

Patch inspired by Uoti Urpala's work in his git branch:
cd4e8dc1fa


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31310 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-03 17:37:58 +00:00
Uoti Urpala
6d6e030a79 mp3lib: use ffmpeg_files/x86_cpu.h 2010-06-03 19:57:49 +03:00
Uoti Urpala
a1f9878c3d options: fix -a52drc default value (should be 1)
Commit 3f076c0fb3 ("options: move -a52drc to option struct") from
yesterday left out setting the default value of the option,
effectively changing the default from 1 to 0. Add the missing part to
change it back to 1.
2010-06-03 15:43:42 +03:00
cehoyos
de6a0324d8 Simplify libass version check.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31309 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-03 08:17:51 +00:00
cehoyos
67a5bb95ee Raise LIBASS_VERSION, forgotten in r31293.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31308 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-03 08:17:10 +00:00
reimar
9b04897e76 Add the -march fallback for amdfam10 also to the x86_64 case.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31307 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-02 22:09:04 +00:00
cehoyos
ac02b9ee47 libavcodec/libx264.c requires x264 0.98 since r23430.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31306 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-02 20:50:55 +00:00
cehoyos
0cded5de1c Fix compilation with external libass.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31305 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-02 20:21:29 +00:00
cehoyos
1c906775a0 ass_set_aspect_ratio() takes three arguments since 0x00907010.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31304 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-02 20:12:50 +00:00
Uoti Urpala
7c4dbb8a20 demux_mkv: enable automatic index generation by default
Change demux_mkv to behave by default as it did with -idx before. The
index generation code in demux_mkv linearly scans the file up to the
seek timestamp (it doesn't read the whole file up front like some
other demuxers do). Doing that is probably a better default for files
with no index than rejecting the seek request and asking user to
specify -idx.
2010-06-02 19:30:40 +03:00
Uoti Urpala
80be936a56 Merge svn changes up to r31303 2010-06-02 19:12:01 +03:00
Uoti Urpala
ed1a1e28d8 Skip svn changes up to r31294 (mostly)
-a52drc range extension was already done earlier (and the svn commit
is buggy for ad_liba52). However keep the man page change (this is the
only part not skipped).

We don't want to use lavf for Matroska demuxing; it's questionable
whether that's a good idea even in svn, and the internal demuxer here
is definitely a better choice.
2010-06-02 18:58:37 +03:00