Commit Graph

97 Commits

Author SHA1 Message Date
arpi ca0263659f compiler warning fixes patch by Dominik Mierzejewski <dominik@rangers.eu.org>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9218 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-02-02 02:42:59 +00:00
henry e633df0399 sub_utf8 handling hopefully fixed
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9146 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-28 18:45:58 +00:00
arpi 7e5bca4243 maybe fix ogm vs. iconv
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9144 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-28 18:28:09 +00:00
arpi 09e742fe2f Add a command line option (-sub-no-text-pp) to disable subtitles
postprocessing, ie. { } removal etc.
patch by Salvador Eduardo Tropea <salvador@inti.gov.ar>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9127 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-27 23:41:56 +00:00
pontscho ebdb38271e - add subcp
- fix some 10l in gui
- fix one 10l bug in subreader


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9057 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-21 19:12:46 +00:00
arpi 824048ca44 1) Removed the code to remove {} from sub_read_line_ssa
2) Put this code in a separated function: sub_pp_ssa
3) After recoding added a call to sub_pp_ssa. To be more acqurate: I
added a pointer to function to hold a postprocessing function to be
invoked after using iconv. There are one pointer for each format, if
this pointer isn.t NULL the post processing function is called.
patch by Salvador Eduardo Tropea <salvador@inti.gov.ar>
help by <hephooey@fastmail.fm>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9010 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-19 00:54:55 +00:00
mosu 84fac13ad1 bunkus: fixed a small bug with skipping "{...}" in ssa subs
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8941 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-13 10:07:38 +00:00
arpi d459e64463 Overlapping subs are a feature mainly present in subtitling
software formats, such as JACOsub and SSA. This patch enables
them, by default, only with this formats; however the user can
force both enabling and disabling overlapping subtitles by the
mean of -overlapsub and -nooverlapsub options. The code itself
should avoid all the 'jumping subtitles' problems reported by the
users.
patch by salvatore.falco@katamail.com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8883 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-10 22:53:34 +00:00
arpi 2c443c4c0b Since version 2.7 the file extension for JACOsub changed from
'.js' to '.jss', to avoid confusion with javascript.
There is also a new format for list_sub_file output; however
this is used only in debugging subtitles code, while disabled in
real life use.

patch by <salvatore.falco@katamail.com>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8863 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-09 19:25:05 +00:00
arpi 732657af3f some subviewer versions uses : instead of . or ,
reported by Nagy Gábor <ngabor79@index.hu>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8790 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-05 02:46:13 +00:00
arpi e6e0f6674f 10l
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8786 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-04 21:26:35 +00:00
arpi 1eb429c1d8 10l
patch by Oskar Liljeblad <oskar@osk.mine.nu>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8735 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-03 12:30:47 +00:00
arpi f8c9f53352 support for subviewer format using dots instead of commas:
00:00:27.000 --> 00:00:28.300
patch by Oskar Liljeblad <oskar@osk.mine.nu>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8644 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-29 21:04:45 +00:00
arpi e29bcd7e02 This patch adds a call to subcp_recode1(), so this subtitles too are
processed through iconv().
Kresimir Kukulj                      madmax@iskon.hr


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8619 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-28 15:19:41 +00:00
arpi d3b9403406 Attached is a small patch to fix a couple of problems I found when using
.SSA subtitle files:
1) A comma appears at the beggining of the text. From comments on the
code this seems to be a delicated matter, so I just added a conditional
to eliminate the comma if it is at the beggining of the string.
2) It looks like this format uses {*} for attributes, like {/fs36} to
select "font size 36pt". These things becomes really annoying when
displayed with the real text ;-), so I added a simple filter to collapse
all the text enclosed with { and }.

Salvador Eduardo Tropea <salvador@inti.gov.ar>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8603 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-28 13:42:24 +00:00
arpi 919f3710b1 dump subtitles in SAMI format
patch by Salvatore Falco <sfalco@studenti.ing.uniroma1.it>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8364 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-05 00:07:59 +00:00
arpi a3243d2265 optional (compile-time switch) subtitles-sorting feature
patch by Salvatore Falco <sfalco@studenti.ing.uniroma1.it>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8363 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-05 00:05:57 +00:00
arpi 268b2c1a0f overlapping subtitles support is now optional, can be disabled (-nooverlapsub)
patch by Salvatore Falco <sfalco@studenti.ing.uniroma1.it>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8362 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-05 00:03:35 +00:00
arpi 7228f67795 dump in JACOsub format
patch by Salvatore Falco <sfalco@studenti.ing.uniroma1.it>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8361 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-04 23:58:38 +00:00
arpi 4bda81ad16 I recently sent a patch for a new subtitles format, JACOsub. Since then I
found a better definition of jacosub standard, and this patch is the
result. It supports timeresolutions changes and shifts.
Salvatore Falco <sfalco@studenti.ing.uniroma1.it>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8208 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-16 03:25:37 +00:00
arpi 41db8e63dc allow max 0.2s overlapping without splitting subs
patch by salvatore.falco@katamail.com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8207 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-16 03:23:49 +00:00
arpi f859d013a8 *HUGE* set of compiler warning fixes, unused variables removal
based on patch by Dominik Mierzejewski <dominik@rangers.eu.org>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8124 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-06 23:54:29 +00:00
arpi d200725e88 This patch is to add support for overlapping subtitles, that is
subtitles whose start or end happens during another subtitle.
After reading the subtitles from the file in sub_read_file(),
this patch looks for overlapping subtitles and split
them into more non-overlapping subtitles.

Salvatore Falco <sfalco@studenti.ing.uniroma1.it>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7984 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-30 19:26:05 +00:00
arpi b364822847 JACOSub is another subtitling format, whose specifications are at:
http://unicorn.us.com/jacosub
patch by Salvatore Falco <sfalco@studenti.ing.uniroma1.it>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7983 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-30 19:16:58 +00:00
arpi 4293eebe30 small memleaks
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7776 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-17 00:53:14 +00:00
atmos4 ff72be050b Enable -subfps for time based subtitles, too.
Please update the DOCS for -subfps:
"If you have time-based subtitles like subviewer that can't be synced by -subdelay
try specifying -subfps with the framerate of the movie the time-based sub was
created for, eg. -subfps 25 if you use subs from a 25 fps movie with a movie
using a different framerate. If you need to guess -subfps, try 25, 23.98 and 29.97"


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7611 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-06 02:59:04 +00:00
atmos4 d803db3e15 Skip html tags (like <i>) inside subviewer subtitles.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7609 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-06 00:46:47 +00:00
arpi d483a015a2 tons of warning fixes, also some 10l bugfixes, including Dominik's PVA bug
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7473 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-09-22 02:33:28 +00:00
kmkaplan 5f9adff3f6 New option for mplayer: -dumpmicrodvdsub
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7461 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-09-21 17:23:46 +00:00
nexus af4654d926 FreeBSD iconv change/fix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7129 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-08-28 23:00:25 +00:00
kmkaplan 86be4b3562 Correct dump_srt millisecond output
Add support for input from frame based subtitles to dump_srt.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6793 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-07-25 18:05:08 +00:00
arpi 146376549d subrip sometimes uses pipe as newline separator - patch by MOLNAR Andor <dolphy@inf.elte.hu>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6658 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-07-06 15:19:08 +00:00
alex c282ad5a4c support for SSA v4 by Dirk <noisyb at gmx.net>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6598 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-06-29 10:39:58 +00:00
arpi f1748e040e msg/i18n fixes and some printf->mp_msg
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6297 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-06-03 23:23:03 +00:00
arpi e8235b8140 sub_read_line_ssa sig11 fix by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>
when this function encounters a multiline subtitle with more lines than
SUB_MAX_TEXT, this stupid bug manifests. The function actually reads one
line less than the returned count. Subsequently, either during iconv or
during playing a null pointer gets referenced, with obvious result.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6248 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-05-31 21:48:36 +00:00
arpi c04588fedf possible sig11 fixed in .rt parser (weisskreuzova.zip)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6243 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-05-30 17:44:58 +00:00
iive 1eb8577aa5 added dump subtitles to .srt
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6209 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-05-27 17:20:55 +00:00
alex cdfc03fab6 applied 64bit patch from Ulrich Hecht <uli at suse dot de>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6164 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-05-23 15:27:49 +00:00
arpi 6fe43d0d87 patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6077 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-05-13 20:41:20 +00:00
pl 8a99b7a507 patch by Didier <did-c-debian@ifrance.com>:
- subviewer 2.0 support


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6013 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-05-07 21:58:01 +00:00
arpi 8c740ea4f8 accept \N too, patch by Reinder <r.cuperus@student.utwente.nl>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5991 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-05-05 21:33:13 +00:00
arpi 2bb2db0a65 frame-based mpsub parser fix - patch by Rizsanyi Zsolt <rizsanyi@myrealbox.com>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5829 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-04-25 12:59:24 +00:00
arpi cfa148bdb8 vplayer sub fix by Arkadiusz Podgorski <wodzu@softomat.com.pl>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5364 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-03-27 01:22:11 +00:00
laaz e0acf7f92c -subfps and -subdelay alters -dumpmpsub's output
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4887 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-02-28 02:37:13 +00:00
laaz 77f3ac91e6 Fixed a bug with -dumpmpsub
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4881 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-02-28 01:01:50 +00:00
eyck 094cd24bf4 too many arguments to sscan in subdetect.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4520 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-02-03 19:17:22 +00:00
eyck cff3abbe48 detect microdvd with empty second frame.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4445 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-01-31 12:03:49 +00:00
laaz 7bc932abc8 fixed mpsub bug requested by Gabucino
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4099 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-01-12 00:02:52 +00:00
atlka d136021db3 1. subs know are readed after reading AVI header so we already know fps
2. modified vplayer format reader - default time is ~6 sec - maybe that should
be an option


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4065 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-01-09 16:35:24 +00:00
atlka 61bcfde0a0 corrections to adjust_subs_time function which now uses fps if needed
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4053 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-01-08 14:10:22 +00:00