Commit Graph

3637 Commits

Author SHA1 Message Date
reimar dec2db6326 demux_lavf: Always use convergence_duration for subtitles
Otherwise subtitles will stay on screen forever for ASS subtitles in
mkv if no ASS renderer is used.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32032 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:49 +02:00
reimar 415b948f2e demuxer.c: reset subtitle EOF on seeking
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32031 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:49 +02:00
reimar 0e82595632 demux_lavf: print subtitle type in more cases
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32006 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:49 +02:00
diego 15fee47bc6 demux_ogg.c: remove unused variable
Avoid redundant use of variable 'size' in demux_ogg_read_packet(), fixes:
libmpdemux/demux_ogg.c:266: warning: unused variable 'size'

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31946 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:48 +02:00
diego 26541aeb8b printf format fixes ("%d" -> "%zd")
Add 'z' length modifier to %d printf format specifier for size_t argument.
stream/http.c:675: warning: format '%d' expects type 'int', but argument 4 has type 'size_t'

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

Add 'z' length modifier to %d printf format specifiers for size_t arguments.
libmpdemux/demux_avi.c:553: warning: format '%u' expects type 'unsigned int', but argument 5 has type 'size_t'
libmpdemux/demux_avi.c:553: warning: format '%u' expects type 'unsigned int', but argument 7 has type 'size_t'

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

Add 'z' length modifier to %d printf format specifiers for size_t arguments.
libmpdemux/demux_lmlm4.c:75: warning: format '%d' expects type 'int', but argument 5 has type 'ssize_t'
libmpdemux/demux_lmlm4.c:163: warning: format '%d' expects type 'int', but argument 6 has type 'ssize_t'
libmpdemux/demux_lmlm4.c:163: warning: format '%d' expects type 'int', but argument 7 has type 'ssize_t'

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

Add 'z' length modifier to %d printf format specifier for size_t argument.
stream/asf_streaming.c:676: warning: format '%d' expects type 'int', but argument 5 has type 'size_t'

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31938 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:48 +02:00
diego 7e57bfd853 demux: Move mp_a52_framesize from demux_ts.c to parse_es.c
The function is used in the MPEG muxer as well and not specific to MPEG-TS.
Jointly developed by Nico Sabbi and myself.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31929 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:48 +02:00
reimar 1e403d0593 demux_ts.c: cleanup
Remove some useless casts.

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

Remove an unused variable.

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

Simplify ts_sync. Might also make it easier to optimize a bit.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31923 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:48 +02:00
siretart 2e6ff523dd spelling fixes
Found by the Debian QA tool 'lintian'

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

reintroduce typo in genres.h that was fixed fixed r31913 to match the id3v2 spec

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31920 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:03 +02:00
diego 900ca4cb3e demux_ts.c: avoid compiler warning by adding initialization
Initialize frame_length variable to zero to avoid the warning:
libmpdemux/demux_ts.c:669: warning: 'frame_length' may be used uninitialized in this function

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31874 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:46 +02:00
diego 578ad534b3 configure: Rename "network" variable and option to "networking"
This avoids conflicts with the FFmpeg variable of the same name.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31749 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:44 +02:00
reimar 8362b060d4 demux_ts: Improve subtitle support
Make it use the infrastructure for subtitle handling so e.g. switching
subtitles at runtime works and add support for PGS subtitles.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31724 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:44 +02:00
Uoti Urpala 7d17b5e254 demuxer.c: add new_sh_sub_sid_lang
Allocates a new sh_sub and specifies language at the same time. I
don't think this is a particularly good API but add it for easier
compatibility with some svn changes.
2010-11-02 04:14:44 +02:00
reimar 9e537d1f6e subs: Add support for DVB and XSUB subtitles, not yet working properly
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31694 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:43 +02:00
reimar ce19a13986 asfheader, demux_audio: Remove some pointless be2me/le2me
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31685 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:43 +02:00
reimar 5f65cbcc07 demux_pva.c: Remove completely nonsensical le2me usages
The only effect these had was breaking playback on big-endian.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31682 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:43 +02:00
reimar 01a95808f1 aviheader.c: Remove obfuscating use of le2me_32.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31681 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:43 +02:00
reimar 29f20dc812 demux_ts: add memory access checks
Add packet->len checks to avoid out-of-bounds reads and negative
es->size values.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31671 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:43 +02:00
reimar 5c53ce6bae demux_ts: fix crash on broken packets
Check packet size before memmove to avoid crashes e.g. if we recognized the
wrong type and subtracted more header bytes than there are overall bytes.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31669 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:43 +02:00
reimar 96c17fe68b subs: Add support for PGS subtitle decoding via libavcodec
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31665 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:43 +02:00
aurel d7a9c6d240 demux_lavf: stricter check for convergence_duration validity
Avoid using meaningless values

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31642 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:20 +02:00
reimar fc95b0d5f3 asfguid.h: Use AV_RL32 also in x86
It is well enough optimized nowadays.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31610 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:20 +02:00
reimar 2308e045de cleanup: Add const qualifiers for struct ad_functions pointers
The ad_functions structs are in rodata, mark some pointers to them
const.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31606 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:13:02 +02:00
reimar 815460d289 demux_lavf: Avoid a crash if stream->url is not set
Print a warning since this is not supposed to happen.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31587 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:11:43 +02:00
diego a1b8092c87 Factorize MPlayer/MEncoder version string handling.
The string now resides in a central object file instead of
being duplicated in every file that requires a version string.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31577 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:11:43 +02:00
reimar ad0be725b8 demux_ts: change IS_ macros to functions
Replace ever-growing-to-uglyness IS_* macros to by functions and
switch().

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31540 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:11:42 +02:00
diego 1ba2cadb83 demux_real: use MKTAG definition from libavutil
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31531 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:11:42 +02:00
reimar bdafaeb65c demux_ts: detect LATM AAC as a separate type
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31520 b3059339-0415-0410-9bf9-f77b7e298cf2

Place AUDIO_AAC_LATM definition next to AUDIO_AAC.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31521 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:11:09 +02:00
reimar 1b078bc2c5 demux_y4m: increase error message verbosity from MSGL_V to MSGL_ERR
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31464 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:11:07 +02:00
reimar 531964aa8d demux_ty: Cleanup some code, possibly fix vstream support (untested)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31423 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:10:10 +02:00
diego a7bc7d8e63 cleanup: #include loader/wine/winbase.h instead of local declarations
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31414 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:07:44 +02:00
cehoyos 8de983fe7f rtsp: Support RTSP/RTP over HTTP via LIVE555
Patch by Malte Särner, malte D sarner A multiq se

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

Fix compilation with nemesi and live555.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31348 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:07:16 +02:00
reimar c1b0498c1f demuxer.c: Make ds_get_next_pts work for the first packet of a stream
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31338 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-10-27 20:30:30 +03:00
reimar 786b5e4352 demux_real: Don't try to read index if stream is not seekable
Fixes playback of piped real files (except multirate where this seems
not possible).

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31335 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-10-27 20:23:46 +03:00
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 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
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 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 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
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 497c32cdad Merge svn changes up to r31291 2010-06-02 18:55:18 +03:00
aurel 9be39d0640 Switch mkv demuxing to lavf by default.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31294 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-31 19:44:02 +00:00
Uoti Urpala 2fcd4cf73e demux_mkv: fix possible seek crash
Commit fc39d48465 ("demux_mkv: store streams sequentially in
demuxer->[avs]_streams") had a copy-paste error causing it to look up
a video ID where it should have been an audio one. The most likely
visible symptom was a segfault when seeking while playing a
high-numbered audio track. Looks like I was careless with that
original commit, second bug in the same one...
2010-05-31 21:50:17 +03:00
diego def243261a Move TS_MAX_PROBE_SIZE #define to demux_ts.h instead of duplicating it.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31291 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-30 22:14:13 +00:00
Uoti Urpala d75206ce68 demux_mkv: support VP8 video tag 2010-05-30 17:21:59 +03:00
Uoti Urpala 9a2224ac0f demux_mkv: support WebM files
Accept files with doctype "webm" in addition to "matroska".
2010-05-30 17:15:22 +03:00
Uoti Urpala 8ce2c41ca5 Merge svn changes up to r31226 2010-05-30 16:25:04 +03:00