1
0
mirror of https://github.com/mpv-player/mpv synced 2024-12-25 08:12:17 +00:00
Commit Graph

115 Commits

Author SHA1 Message Date
eugeni
8d4098a160 VobSub tracks cannot be handled by libass, do not mark them with 'a'.
This fixes the bug with VobSub not being displayed with -ass.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21625 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-15 19:35:06 +00:00
eugeni
b5a682f0aa Rename: ass_process_font -> ass_add_font.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21471 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-03 17:35:40 +00:00
diego
9c2d44923a Remove superfluous bswap.h include.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21437 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-02 12:32:44 +00:00
eugeni
d8b0acaa87 Cosmetics: indentation fix.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21182 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-23 17:37:28 +00:00
reimar
b38e1ca6e7 Generalize subtitle switching, demux_ogg does not need a special case
anymore and demux_mov works now, too.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21054 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-19 14:23:54 +00:00
rtogni
d4f55932c1 Don't spam the console with timestamps (non-error messages printed every
frame should be lower than V level)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20937 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 22:48:53 +00:00
rtogni
88990e297c Fix extradata passing to lavc RV20 decoder
Pass video codec extradata unchanged from demux_real, sync vd_realvid to 
the new format
Sync mkv demuxer to the changes above (cmsg24 extradata was totally 
broken before)
Detect cmsg24 size from extradata (was fixed)
Based on a patch by elupus >> elupus >a< ecce se <<


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20936 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 22:40:35 +00:00
reimar
c5fa0bbf92 Make subtitle stream handling more similar to audio and video streams.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20888 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-13 16:15:23 +00:00
mosu
9c4d028084 If parsing a seek head fails then mplayer should try continue parsing the file after the seek head.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20750 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-07 18:14:30 +00:00
reimar
4587221d67 Fix index-based seeking in audio-only files, fixes bug #621
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20728 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-05 20:29:29 +00:00
kraymer
66f0513be8 add MSGTR_MPDEMUX_MKV for demux_mkv.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20696 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-05 13:53:27 +00:00
eugeni
efea99c2c9 Libass interface reworked:
- ass_instance_t renamed to ass_renderer_t
- ass_library_t introduced
- use of mplayer-specific global variables limited to ass_mp.c


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20493 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-28 15:07:18 +00:00
reimar
2ec8dc1fec Implement -noidx since index can use quite a bit of memory, esp. when using valgrind.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20230 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-15 12:48:18 +00:00
reimar
aa5a9bc123 Cosmetics
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20182 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-12 17:21:15 +00:00
reimar
280c746919 strncpy->strlcpy
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20181 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-12 17:19:43 +00:00
reimar
74890695e8 Remove useless return; at end of function
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20180 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-12 17:19:10 +00:00
reimar
7ef8e59e30 Simplify demux_mkv_get_sub_lang
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20179 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-12 17:18:20 +00:00
ptt
07198ca3ae modifications pointed out by reimar doffinger
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20174 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-12 14:11:39 +00:00
ptt
68613bbee7 added OSD audio switching visualization
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20162 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-11 17:25:46 +00:00
reimar
d0947a5bb7 More possible memleaks.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20161 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-11 15:57:51 +00:00
reimar
de216f1950 Avoid memleak on error while reading attachments or multiple
MATROSKA_ID_FILEDATA parts.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20160 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-11 15:47:37 +00:00
reimar
6a4cc21801 Simplify (by using realloc with NULL parameter) and refactor code to grow
array in 32-increments


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20146 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-10 15:01:11 +00:00
reimar
bdc8d80e9b Free track->language before assigning new value
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20143 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-09 19:10:36 +00:00
reimar
5240b8bf98 Missing (in close function)/misplaced free for track structure itself.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20142 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-09 18:56:16 +00:00
reimar
ccff4a6164 Free track data if error occurs while reading trackentry
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20141 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-09 18:48:55 +00:00
reimar
89ca5fd9b7 Free track encodings on error or demuxer close
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20139 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-09 18:28:58 +00:00
reimar
37f549101b replace malloc+memset by calloc
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20136 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-09 18:00:54 +00:00
reimar
3b81347247 Remove cast of realloc result missed in last patch
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20135 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-09 17:48:43 +00:00
reimar
4f58754e78 Remove unneeded casts for malloc/realloc calls
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20134 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-09 17:41:37 +00:00
eugeni
f7e89b57fa Add matroska v2 (SimpleBlock) support.
Patch by Federico Menarini (federico d menarini a gmail d com).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19983 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-25 21:17:43 +00:00
eugeni
13387709ef Fix r19815: mkv_d->duration could be assigned an uninitialized value.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19818 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-13 02:02:17 +00:00
eugeni
fa6bc3aa4f Fix seeking in Matroska files with non-default TimecodeScale value.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19817 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-12 21:45:06 +00:00
eugeni
ee0ac67094 Fix block duration calculation in mkv demuxer.
According to specs, BlockDuration value is based on TimecodeScale.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19816 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-12 21:40:01 +00:00
eugeni
3f1e7dd9a8 Fix movie duration calculation in case when TimecodeScale element comes after
Duration element.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19815 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-12 21:33:10 +00:00
reimar
2e802cf855 Fix crash on DEMUXER_CTRL_SWITCH_AUDIO introduced by aid_vid_mismatch patch
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19651 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-03 10:10:57 +00:00
eugeni
cc29cb220f Add support for rendering matroska plaintext subtitles with libass.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19649 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-02 20:46:26 +00:00
eugeni
e12a9c7206 Matroska subtitles are always utf-8, no need to recode them.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19648 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-02 19:55:45 +00:00
eugeni
1ad2da1fbb Fix read beyond the end of allocated memory block.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19647 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-02 19:51:26 +00:00
eugeni
62bfae1406 Display track names in matroska files.
Patch by Paul Lebedev _paul d lebedev a gmail d com_.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19646 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-02 19:39:24 +00:00
eugeni
a12ab82a62 Extract "application/x-font" attachments from matroska, in addition
to "application/x-truetype-font". They usually contain Type1 fonts.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19627 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-01 19:47:39 +00:00
reimar
ccf75d6711 Get rid of demux_aid_vid_mismatch mess.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19546 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-26 19:17:04 +00:00
eugeni
5762122f37 SSA/ASS parser reworked, with 2 main results:
support for script embedded fonts (fonts, uuencoded directly into script) added;
matroska interface functions have got more sensible names.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19498 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-22 22:11:01 +00:00
eugeni
bdb9b1d5dc Fix seeking in matroska files when timecodes do not start from zero.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19436 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-18 12:20:43 +00:00
eugeni
1de0c3327d Add matroska chapter seeking capability.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19348 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-06 18:55:34 +00:00
rathann
02362913a7 Native MPEG4 SP/ASP/AP support in Matroska.
Patch by Aurelien Jacobs and myself.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19159 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-22 14:35:49 +00:00
rfelker
79bacf325c more c++ decl crap
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18989 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-10 02:51:52 +00:00
eugeni
e15ae9a600 Initial libass release (without mencoder support).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18942 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-07 18:26:51 +00:00
eugeni
512eb68dc1 Rename mkv_sh_sub_t to sh_sub_t, move it to demuxer.h.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18939 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-07 18:02:49 +00:00
uau
e2727ec797 Add a new video pts tracking mode, enabled by option -correct-pts.
This mode has the following differences:
- Video timing is correct for streams with B frames, at least with some
  demuxers.
- Video filters can modify frame timestamps and insert new frames, and
  removing frames is handled better than before.
- Some things are known to break, it's not usable as the default yet.

Things should work as before when the -correct-pts option is not used.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18922 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-06 06:58:17 +00:00
reynaldo
8f65768bf2 rm unnecesary casts from void* - part 4
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18890 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-03 13:21:54 +00:00