Mercurial > mplayer.hg
annotate subreader.c @ 30308:b33880a47b41
Reindent
author | mru |
---|---|
date | Sun, 17 Jan 2010 14:25:19 +0000 |
parents | 30ac5dc10c44 |
children | a88a4507e2cf |
rev | line source |
---|---|
258 | 1 /* |
2 * Subtitle reader with format autodetection | |
3 * | |
4 * Written by laaz | |
5 * Some code cleanup & realloc() by A'rpi/ESP-team | |
11873 | 6 * |
258 | 7 */ |
8 | |
9 | |
10 #include <stdio.h> | |
11 #include <stdlib.h> | |
12 #include <string.h> | |
706
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
13 #include <ctype.h> |
258 | 14 |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
15 #include <sys/types.h> |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
16 #include <dirent.h> |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
17 |
2151
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
18 #include "config.h" |
6296 | 19 #include "mp_msg.h" |
258 | 20 #include "subreader.h" |
19271
64d82a45a05d
introduce new 'stream' directory for all stream layer related components and split them from libmpdemux
ben
parents:
19198
diff
changeset
|
21 #include "stream/stream.h" |
29893 | 22 #include "libavutil/common.h" |
258 | 23 |
27393 | 24 #ifdef CONFIG_ENCA |
12443 | 25 #include <enca.h> |
26 #endif | |
27 | |
3701 | 28 #define ERR ((void *) -1) |
258 | 29 |
27393 | 30 #ifdef CONFIG_ICONV |
2151
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
31 #include <iconv.h> |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
32 char *sub_cp=NULL; |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
33 #endif |
27393 | 34 #ifdef CONFIG_FRIBIDI |
9635
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
35 #include <fribidi/fribidi.h> |
13680 | 36 char *fribidi_charset = NULL; ///character set that will be passed to FriBiDi |
37 int flip_hebrew = 1; ///flip subtitles using fribidi | |
38 int fribidi_flip_commas = 0; ///flip comma when fribidi is used | |
9635
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
39 #endif |
258 | 40 |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
41 extern char* dvdsub_lang; |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
42 |
2912 | 43 /* Maximal length of line of a subtitle */ |
44 #define LINE_LEN 1000 | |
2178 | 45 static float mpsub_position=0; |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
46 static float mpsub_multiplier=1.; |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
47 static int sub_slacktime = 20000; //20 sec |
2177 | 48 |
9126
7a06258271d6
Add a command line option (-sub-no-text-pp) to disable subtitles
arpi
parents:
9056
diff
changeset
|
49 int sub_no_text_pp=0; // 1 => do not apply text post-processing |
7a06258271d6
Add a command line option (-sub-no-text-pp) to disable subtitles
arpi
parents:
9056
diff
changeset
|
50 // like {\...} elimination in SSA format. |
2912 | 51 |
9893 | 52 int sub_match_fuzziness=0; // level of sub name matching fuzziness |
9884
d7b86f7d1406
turn most of the subtitle matching fuzziness off by default
henry
parents:
9872
diff
changeset
|
53 |
2912 | 54 /* Use the SUB_* constant defined in the header file */ |
55 int sub_format=SUB_INVALID; | |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
26889
diff
changeset
|
56 #ifdef CONFIG_SORTSUB |
29251 | 57 /* |
8362
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
58 Some subtitling formats, namely AQT and Subrip09, define the end of a |
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
59 subtitle as the beginning of the following. Since currently we read one |
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
60 subtitle at time, for these format we keep two global *subtitle, |
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
61 previous_aqt_sub and previous_subrip09_sub, pointing to previous subtitle, |
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
62 so we can change its end when we read current subtitle starting time. |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
26889
diff
changeset
|
63 When CONFIG_SORTSUB is defined, we use a single global unsigned long, |
8362
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
64 previous_sub_end, for both (and even future) formats, to store the end of |
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
65 the previous sub: it is initialized to 0 in sub_read_file and eventually |
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
66 modified by sub_read_aqt_line or sub_read_subrip09_line. |
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
67 */ |
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
68 unsigned long previous_sub_end; |
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
69 #endif |
624 | 70 |
18870
391faf2c1474
this unrelated and erroneus change was applied on my previous commit, reverted
reynaldo
parents:
18869
diff
changeset
|
71 static int eol(char p) { |
26759
8eff880f638c
cosmetics: Remove useless parentheses from return statements.
diego
parents:
26377
diff
changeset
|
72 return p=='\r' || p=='\n' || p=='\0'; |
18870
391faf2c1474
this unrelated and erroneus change was applied on my previous commit, reverted
reynaldo
parents:
18869
diff
changeset
|
73 } |
391faf2c1474
this unrelated and erroneus change was applied on my previous commit, reverted
reynaldo
parents:
18869
diff
changeset
|
74 |
3701 | 75 /* Remove leading and trailing space */ |
76 static void trail_space(char *s) { | |
77 int i = 0; | |
3924
9f18722fafe9
tail_space infinite loop fix by jeon_goon@lycos.co.kr
arpi
parents:
3735
diff
changeset
|
78 while (isspace(s[i])) ++i; |
3701 | 79 if (i) strcpy(s, s + i); |
706
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
80 i = strlen(s) - 1; |
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
81 while (i > 0 && isspace(s[i])) s[i--] = '\0'; |
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
82 } |
624 | 83 |
10692
7cb48ef05b02
Support for case insensitive string matching in SAMI subtitle files. Patch by Bruno Lecointre.
mosu
parents:
10649
diff
changeset
|
84 static char *stristr(const char *haystack, const char *needle) { |
7cb48ef05b02
Support for case insensitive string matching in SAMI subtitle files. Patch by Bruno Lecointre.
mosu
parents:
10649
diff
changeset
|
85 int len = 0; |
7cb48ef05b02
Support for case insensitive string matching in SAMI subtitle files. Patch by Bruno Lecointre.
mosu
parents:
10649
diff
changeset
|
86 const char *p = haystack; |
7cb48ef05b02
Support for case insensitive string matching in SAMI subtitle files. Patch by Bruno Lecointre.
mosu
parents:
10649
diff
changeset
|
87 |
7cb48ef05b02
Support for case insensitive string matching in SAMI subtitle files. Patch by Bruno Lecointre.
mosu
parents:
10649
diff
changeset
|
88 if (!(haystack && needle)) return NULL; |
7cb48ef05b02
Support for case insensitive string matching in SAMI subtitle files. Patch by Bruno Lecointre.
mosu
parents:
10649
diff
changeset
|
89 |
7cb48ef05b02
Support for case insensitive string matching in SAMI subtitle files. Patch by Bruno Lecointre.
mosu
parents:
10649
diff
changeset
|
90 len=strlen(needle); |
7cb48ef05b02
Support for case insensitive string matching in SAMI subtitle files. Patch by Bruno Lecointre.
mosu
parents:
10649
diff
changeset
|
91 while (*p != '\0') { |
7cb48ef05b02
Support for case insensitive string matching in SAMI subtitle files. Patch by Bruno Lecointre.
mosu
parents:
10649
diff
changeset
|
92 if (strncasecmp(p, needle, len) == 0) return (char*)p; |
7cb48ef05b02
Support for case insensitive string matching in SAMI subtitle files. Patch by Bruno Lecointre.
mosu
parents:
10649
diff
changeset
|
93 p++; |
7cb48ef05b02
Support for case insensitive string matching in SAMI subtitle files. Patch by Bruno Lecointre.
mosu
parents:
10649
diff
changeset
|
94 } |
7cb48ef05b02
Support for case insensitive string matching in SAMI subtitle files. Patch by Bruno Lecointre.
mosu
parents:
10649
diff
changeset
|
95 |
7cb48ef05b02
Support for case insensitive string matching in SAMI subtitle files. Patch by Bruno Lecointre.
mosu
parents:
10649
diff
changeset
|
96 return NULL; |
7cb48ef05b02
Support for case insensitive string matching in SAMI subtitle files. Patch by Bruno Lecointre.
mosu
parents:
10649
diff
changeset
|
97 } |
2343 | 98 |
19066
26a30496ec96
marks several function without a prototype which arent used outside its sourcefile as static, Patch by Stefan Huehner - stefan AT huehner-org
reynaldo
parents:
18980
diff
changeset
|
99 static subtitle *sub_read_line_sami(stream_t* st, subtitle *current) { |
2912 | 100 static char line[LINE_LEN+1]; |
3235
0cf593b6bab0
patch fixes the showing last line of subtitles and support of SAMI Slacktime option by Evgeny Chukreev <codedj@echo.ru>
arpi
parents:
2915
diff
changeset
|
101 static char *s = NULL, *slacktime_s; |
7472
c4434bdf6e51
tons of warning fixes, also some 10l bugfixes, including Dominik's PVA bug
arpi
parents:
7460
diff
changeset
|
102 char text[LINE_LEN+1], *p=NULL, *q; |
706
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
103 int state; |
624 | 104 |
706
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
105 current->lines = current->start = current->end = 0; |
13343
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
106 current->alignment = SUB_ALIGNMENT_BOTTOMCENTER; |
706
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
107 state = 0; |
624 | 108 |
706
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
109 /* read the first line */ |
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
110 if (!s) |
17879 | 111 if (!(s = stream_read_line(st, line, LINE_LEN))) return 0; |
706
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
112 |
624 | 113 do { |
706
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
114 switch (state) { |
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
115 |
3235
0cf593b6bab0
patch fixes the showing last line of subtitles and support of SAMI Slacktime option by Evgeny Chukreev <codedj@echo.ru>
arpi
parents:
2915
diff
changeset
|
116 case 0: /* find "START=" or "Slacktime:" */ |
10692
7cb48ef05b02
Support for case insensitive string matching in SAMI subtitle files. Patch by Bruno Lecointre.
mosu
parents:
10649
diff
changeset
|
117 slacktime_s = stristr (s, "Slacktime:"); |
29251 | 118 if (slacktime_s) |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
119 sub_slacktime = strtol (slacktime_s+10, NULL, 0) / 10; |
3235
0cf593b6bab0
patch fixes the showing last line of subtitles and support of SAMI Slacktime option by Evgeny Chukreev <codedj@echo.ru>
arpi
parents:
2915
diff
changeset
|
120 |
10692
7cb48ef05b02
Support for case insensitive string matching in SAMI subtitle files. Patch by Bruno Lecointre.
mosu
parents:
10649
diff
changeset
|
121 s = stristr (s, "Start="); |
706
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
122 if (s) { |
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
123 current->start = strtol (s + 6, &s, 0) / 10; |
11838
b4f1df0c1e3a
prevent subreader from segfaulting when sami subs dont have
attila
parents:
11496
diff
changeset
|
124 /* eat '>' */ |
b4f1df0c1e3a
prevent subreader from segfaulting when sami subs dont have
attila
parents:
11496
diff
changeset
|
125 for (; *s != '>' && *s != '\0'; s++); |
b4f1df0c1e3a
prevent subreader from segfaulting when sami subs dont have
attila
parents:
11496
diff
changeset
|
126 s++; |
706
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
127 state = 1; continue; |
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
128 } |
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
129 break; |
29251 | 130 |
11838
b4f1df0c1e3a
prevent subreader from segfaulting when sami subs dont have
attila
parents:
11496
diff
changeset
|
131 case 1: /* find (optionnal) "<P", skip other TAGs */ |
b4f1df0c1e3a
prevent subreader from segfaulting when sami subs dont have
attila
parents:
11496
diff
changeset
|
132 for (; *s == ' ' || *s == '\t'; s++); /* strip blanks, if any */ |
b4f1df0c1e3a
prevent subreader from segfaulting when sami subs dont have
attila
parents:
11496
diff
changeset
|
133 if (*s == '\0') break; |
b4f1df0c1e3a
prevent subreader from segfaulting when sami subs dont have
attila
parents:
11496
diff
changeset
|
134 if (*s != '<') { state = 3; p = text; continue; } /* not a TAG */ |
b4f1df0c1e3a
prevent subreader from segfaulting when sami subs dont have
attila
parents:
11496
diff
changeset
|
135 s++; |
b4f1df0c1e3a
prevent subreader from segfaulting when sami subs dont have
attila
parents:
11496
diff
changeset
|
136 if (*s == 'P' || *s == 'p') { s++; state = 2; continue; } /* found '<P' */ |
b4f1df0c1e3a
prevent subreader from segfaulting when sami subs dont have
attila
parents:
11496
diff
changeset
|
137 for (; *s != '>' && *s != '\0'; s++); /* skip remains of non-<P> TAG */ |
b4f1df0c1e3a
prevent subreader from segfaulting when sami subs dont have
attila
parents:
11496
diff
changeset
|
138 if (s == '\0') |
b4f1df0c1e3a
prevent subreader from segfaulting when sami subs dont have
attila
parents:
11496
diff
changeset
|
139 break; |
b4f1df0c1e3a
prevent subreader from segfaulting when sami subs dont have
attila
parents:
11496
diff
changeset
|
140 s++; |
b4f1df0c1e3a
prevent subreader from segfaulting when sami subs dont have
attila
parents:
11496
diff
changeset
|
141 continue; |
29251 | 142 |
706
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
143 case 2: /* find ">" */ |
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
144 if ((s = strchr (s, '>'))) { s++; state = 3; p = text; continue; } |
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
145 break; |
29251 | 146 |
706
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
147 case 3: /* get all text until '<' appears */ |
3235
0cf593b6bab0
patch fixes the showing last line of subtitles and support of SAMI Slacktime option by Evgeny Chukreev <codedj@echo.ru>
arpi
parents:
2915
diff
changeset
|
148 if (*s == '\0') break; |
2836
ec672ea5ac2c
Applied SAMI patch by Evgeny Chukreev <codedj at echo dot ru>
atmos4
parents:
2495
diff
changeset
|
149 else if (!strncasecmp (s, "<br>", 4)) { |
706
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
150 *p = '\0'; p = text; trail_space (text); |
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
151 if (text[0] != '\0') |
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
152 current->text[current->lines++] = strdup (text); |
2836
ec672ea5ac2c
Applied SAMI patch by Evgeny Chukreev <codedj at echo dot ru>
atmos4
parents:
2495
diff
changeset
|
153 s += 4; |
706
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
154 } |
12136
8f2e47faee88
skip {...} parts in SAME subs, patch by Salvatore Falco
alex
parents:
11873
diff
changeset
|
155 else if ((*s == '{') && !sub_no_text_pp) { state = 5; ++s; continue; } |
2836
ec672ea5ac2c
Applied SAMI patch by Evgeny Chukreev <codedj at echo dot ru>
atmos4
parents:
2495
diff
changeset
|
156 else if (*s == '<') { state = 4; } |
ec672ea5ac2c
Applied SAMI patch by Evgeny Chukreev <codedj at echo dot ru>
atmos4
parents:
2495
diff
changeset
|
157 else if (!strncasecmp (s, " ", 6)) { *p++ = ' '; s += 6; } |
ec672ea5ac2c
Applied SAMI patch by Evgeny Chukreev <codedj at echo dot ru>
atmos4
parents:
2495
diff
changeset
|
158 else if (*s == '\t') { *p++ = ' '; s++; } |
ec672ea5ac2c
Applied SAMI patch by Evgeny Chukreev <codedj at echo dot ru>
atmos4
parents:
2495
diff
changeset
|
159 else if (*s == '\r' || *s == '\n') { s++; } |
706
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
160 else *p++ = *s++; |
2836
ec672ea5ac2c
Applied SAMI patch by Evgeny Chukreev <codedj at echo dot ru>
atmos4
parents:
2495
diff
changeset
|
161 |
ec672ea5ac2c
Applied SAMI patch by Evgeny Chukreev <codedj at echo dot ru>
atmos4
parents:
2495
diff
changeset
|
162 /* skip duplicated space */ |
ec672ea5ac2c
Applied SAMI patch by Evgeny Chukreev <codedj at echo dot ru>
atmos4
parents:
2495
diff
changeset
|
163 if (p > text + 2) if (*(p-1) == ' ' && *(p-2) == ' ') p--; |
29251 | 164 |
624 | 165 continue; |
706
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
166 |
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
167 case 4: /* get current->end or skip <TAG> */ |
10692
7cb48ef05b02
Support for case insensitive string matching in SAMI subtitle files. Patch by Bruno Lecointre.
mosu
parents:
10649
diff
changeset
|
168 q = stristr (s, "Start="); |
706
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
169 if (q) { |
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
170 current->end = strtol (q + 6, &q, 0) / 10 - 1; |
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
171 *p = '\0'; trail_space (text); |
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
172 if (text[0] != '\0') |
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
173 current->text[current->lines++] = strdup (text); |
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
174 if (current->lines > 0) { state = 99; break; } |
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
175 state = 0; continue; |
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
176 } |
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
177 s = strchr (s, '>'); |
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
178 if (s) { s++; state = 3; continue; } |
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
179 break; |
13343
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
180 case 5: /* get rid of {...} text, but read the alignment code */ |
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
181 if ((*s == '\\') && (*(s + 1) == 'a') && !sub_no_text_pp) { |
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
182 if (stristr(s, "\\a1") != NULL) { |
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
183 current->alignment = SUB_ALIGNMENT_BOTTOMLEFT; |
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
184 s = s + 3; |
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
185 } |
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
186 if (stristr(s, "\\a2") != NULL) { |
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
187 current->alignment = SUB_ALIGNMENT_BOTTOMCENTER; |
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
188 s = s + 3; |
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
189 } else if (stristr(s, "\\a3") != NULL) { |
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
190 current->alignment = SUB_ALIGNMENT_BOTTOMRIGHT; |
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
191 s = s + 3; |
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
192 } else if ((stristr(s, "\\a4") != NULL) || (stristr(s, "\\a5") != NULL) || (stristr(s, "\\a8") != NULL)) { |
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
193 current->alignment = SUB_ALIGNMENT_TOPLEFT; |
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
194 s = s + 3; |
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
195 } else if (stristr(s, "\\a6") != NULL) { |
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
196 current->alignment = SUB_ALIGNMENT_TOPCENTER; |
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
197 s = s + 3; |
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
198 } else if (stristr(s, "\\a7") != NULL) { |
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
199 current->alignment = SUB_ALIGNMENT_TOPRIGHT; |
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
200 s = s + 3; |
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
201 } else if (stristr(s, "\\a9") != NULL) { |
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
202 current->alignment = SUB_ALIGNMENT_MIDDLELEFT; |
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
203 s = s + 3; |
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
204 } else if (stristr(s, "\\a10") != NULL) { |
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
205 current->alignment = SUB_ALIGNMENT_MIDDLECENTER; |
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
206 s = s + 4; |
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
207 } else if (stristr(s, "\\a11") != NULL) { |
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
208 current->alignment = SUB_ALIGNMENT_MIDDLERIGHT; |
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
209 s = s + 4; |
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
210 } |
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
211 } |
12136
8f2e47faee88
skip {...} parts in SAME subs, patch by Salvatore Falco
alex
parents:
11873
diff
changeset
|
212 if (*s == '}') state = 3; |
8f2e47faee88
skip {...} parts in SAME subs, patch by Salvatore Falco
alex
parents:
11873
diff
changeset
|
213 ++s; |
8f2e47faee88
skip {...} parts in SAME subs, patch by Salvatore Falco
alex
parents:
11873
diff
changeset
|
214 continue; |
624 | 215 } |
216 | |
706
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
217 /* read next line */ |
17879 | 218 if (state != 99 && !(s = stream_read_line (st, line, LINE_LEN))) { |
3735 | 219 if (current->start > 0) { |
220 break; // if it is the last subtitle | |
221 } else { | |
222 return 0; | |
223 } | |
224 } | |
29251 | 225 |
706
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
678
diff
changeset
|
226 } while (state != 99); |
624 | 227 |
3235
0cf593b6bab0
patch fixes the showing last line of subtitles and support of SAMI Slacktime option by Evgeny Chukreev <codedj@echo.ru>
arpi
parents:
2915
diff
changeset
|
228 // For the last subtitle |
0cf593b6bab0
patch fixes the showing last line of subtitles and support of SAMI Slacktime option by Evgeny Chukreev <codedj@echo.ru>
arpi
parents:
2915
diff
changeset
|
229 if (current->end <= 0) { |
0cf593b6bab0
patch fixes the showing last line of subtitles and support of SAMI Slacktime option by Evgeny Chukreev <codedj@echo.ru>
arpi
parents:
2915
diff
changeset
|
230 current->end = current->start + sub_slacktime; |
0cf593b6bab0
patch fixes the showing last line of subtitles and support of SAMI Slacktime option by Evgeny Chukreev <codedj@echo.ru>
arpi
parents:
2915
diff
changeset
|
231 *p = '\0'; trail_space (text); |
0cf593b6bab0
patch fixes the showing last line of subtitles and support of SAMI Slacktime option by Evgeny Chukreev <codedj@echo.ru>
arpi
parents:
2915
diff
changeset
|
232 if (text[0] != '\0') |
0cf593b6bab0
patch fixes the showing last line of subtitles and support of SAMI Slacktime option by Evgeny Chukreev <codedj@echo.ru>
arpi
parents:
2915
diff
changeset
|
233 current->text[current->lines++] = strdup (text); |
0cf593b6bab0
patch fixes the showing last line of subtitles and support of SAMI Slacktime option by Evgeny Chukreev <codedj@echo.ru>
arpi
parents:
2915
diff
changeset
|
234 } |
29251 | 235 |
624 | 236 return current; |
237 } | |
258 | 238 |
239 | |
19066
26a30496ec96
marks several function without a prototype which arent used outside its sourcefile as static, Patch by Stefan Huehner - stefan AT huehner-org
reynaldo
parents:
18980
diff
changeset
|
240 static char *sub_readtext(char *source, char **dest) { |
258 | 241 int len=0; |
932 | 242 char *p=source; |
29251 | 243 |
6242
9c8c3b5e6658
possible sig11 fixed in .rt parser (weisskreuzova.zip)
arpi
parents:
6208
diff
changeset
|
244 // printf("src=%p dest=%p \n",source,dest); |
9c8c3b5e6658
possible sig11 fixed in .rt parser (weisskreuzova.zip)
arpi
parents:
6208
diff
changeset
|
245 |
932 | 246 while ( !eol(*p) && *p!= '|' ) { |
247 p++,len++; | |
248 } | |
29251 | 249 |
18869 | 250 *dest= malloc (len+1); |
258 | 251 if (!dest) {return ERR;} |
29251 | 252 |
258 | 253 strncpy(*dest, source, len); |
254 (*dest)[len]=0; | |
29251 | 255 |
258 | 256 while (*p=='\r' || *p=='\n' || *p=='|') p++; |
29251 | 257 |
258 | 258 if (*p) return p; // not-last text field |
259 else return NULL; // last text field | |
260 } | |
261 | |
19066
26a30496ec96
marks several function without a prototype which arent used outside its sourcefile as static, Patch by Stefan Huehner - stefan AT huehner-org
reynaldo
parents:
18980
diff
changeset
|
262 static subtitle *sub_read_line_microdvd(stream_t *st,subtitle *current) { |
2912 | 263 char line[LINE_LEN+1]; |
264 char line2[LINE_LEN+1]; | |
258 | 265 char *p, *next; |
266 int i; | |
267 | |
268 do { | |
17879 | 269 if (!stream_read_line (st, line, LINE_LEN)) return NULL; |
4048
654419a9a228
changed subreader.c to read microdvd lines in form "{%ld}{}[^\r\n]" too
atlka
parents:
3924
diff
changeset
|
270 } while ((sscanf (line, |
654419a9a228
changed subreader.c to read microdvd lines in form "{%ld}{}[^\r\n]" too
atlka
parents:
3924
diff
changeset
|
271 "{%ld}{}%[^\r\n]", |
654419a9a228
changed subreader.c to read microdvd lines in form "{%ld}{}[^\r\n]" too
atlka
parents:
3924
diff
changeset
|
272 &(current->start), line2) < 2) && |
654419a9a228
changed subreader.c to read microdvd lines in form "{%ld}{}[^\r\n]" too
atlka
parents:
3924
diff
changeset
|
273 (sscanf (line, |
654419a9a228
changed subreader.c to read microdvd lines in form "{%ld}{}[^\r\n]" too
atlka
parents:
3924
diff
changeset
|
274 "{%ld}{%ld}%[^\r\n]", |
654419a9a228
changed subreader.c to read microdvd lines in form "{%ld}{}[^\r\n]" too
atlka
parents:
3924
diff
changeset
|
275 &(current->start), &(current->end), line2) < 3)); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29251
diff
changeset
|
276 |
932 | 277 p=line2; |
258 | 278 |
279 next=p, i=0; | |
1081 | 280 while ((next =sub_readtext (next, &(current->text[i])))) { |
270 | 281 if (current->text[i]==ERR) {return ERR;} |
258 | 282 i++; |
6296 | 283 if (i>=SUB_MAX_TEXT) { mp_msg(MSGT_SUBREADER,MSGL_WARN,"Too many lines in a subtitle\n");current->lines=i;return current;} |
258 | 284 } |
932 | 285 current->lines= ++i; |
258 | 286 |
287 return current; | |
288 } | |
289 | |
19066
26a30496ec96
marks several function without a prototype which arent used outside its sourcefile as static, Patch by Stefan Huehner - stefan AT huehner-org
reynaldo
parents:
18980
diff
changeset
|
290 static subtitle *sub_read_line_mpl2(stream_t *st,subtitle *current) { |
12138
eb3ad04675e1
MPL2 subreader, patch by Cezary Jackiewicz (cjackiewicz@poczta.onet.pl)
alex
parents:
12136
diff
changeset
|
291 char line[LINE_LEN+1]; |
eb3ad04675e1
MPL2 subreader, patch by Cezary Jackiewicz (cjackiewicz@poczta.onet.pl)
alex
parents:
12136
diff
changeset
|
292 char line2[LINE_LEN+1]; |
eb3ad04675e1
MPL2 subreader, patch by Cezary Jackiewicz (cjackiewicz@poczta.onet.pl)
alex
parents:
12136
diff
changeset
|
293 char *p, *next; |
eb3ad04675e1
MPL2 subreader, patch by Cezary Jackiewicz (cjackiewicz@poczta.onet.pl)
alex
parents:
12136
diff
changeset
|
294 int i; |
eb3ad04675e1
MPL2 subreader, patch by Cezary Jackiewicz (cjackiewicz@poczta.onet.pl)
alex
parents:
12136
diff
changeset
|
295 |
eb3ad04675e1
MPL2 subreader, patch by Cezary Jackiewicz (cjackiewicz@poczta.onet.pl)
alex
parents:
12136
diff
changeset
|
296 do { |
17879 | 297 if (!stream_read_line (st, line, LINE_LEN)) return NULL; |
12138
eb3ad04675e1
MPL2 subreader, patch by Cezary Jackiewicz (cjackiewicz@poczta.onet.pl)
alex
parents:
12136
diff
changeset
|
298 } while ((sscanf (line, |
eb3ad04675e1
MPL2 subreader, patch by Cezary Jackiewicz (cjackiewicz@poczta.onet.pl)
alex
parents:
12136
diff
changeset
|
299 "[%ld][%ld]%[^\r\n]", |
eb3ad04675e1
MPL2 subreader, patch by Cezary Jackiewicz (cjackiewicz@poczta.onet.pl)
alex
parents:
12136
diff
changeset
|
300 &(current->start), &(current->end), line2) < 3)); |
eb3ad04675e1
MPL2 subreader, patch by Cezary Jackiewicz (cjackiewicz@poczta.onet.pl)
alex
parents:
12136
diff
changeset
|
301 current->start *= 10; |
eb3ad04675e1
MPL2 subreader, patch by Cezary Jackiewicz (cjackiewicz@poczta.onet.pl)
alex
parents:
12136
diff
changeset
|
302 current->end *= 10; |
eb3ad04675e1
MPL2 subreader, patch by Cezary Jackiewicz (cjackiewicz@poczta.onet.pl)
alex
parents:
12136
diff
changeset
|
303 p=line2; |
eb3ad04675e1
MPL2 subreader, patch by Cezary Jackiewicz (cjackiewicz@poczta.onet.pl)
alex
parents:
12136
diff
changeset
|
304 |
eb3ad04675e1
MPL2 subreader, patch by Cezary Jackiewicz (cjackiewicz@poczta.onet.pl)
alex
parents:
12136
diff
changeset
|
305 next=p, i=0; |
eb3ad04675e1
MPL2 subreader, patch by Cezary Jackiewicz (cjackiewicz@poczta.onet.pl)
alex
parents:
12136
diff
changeset
|
306 while ((next =sub_readtext (next, &(current->text[i])))) { |
eb3ad04675e1
MPL2 subreader, patch by Cezary Jackiewicz (cjackiewicz@poczta.onet.pl)
alex
parents:
12136
diff
changeset
|
307 if (current->text[i]==ERR) {return ERR;} |
eb3ad04675e1
MPL2 subreader, patch by Cezary Jackiewicz (cjackiewicz@poczta.onet.pl)
alex
parents:
12136
diff
changeset
|
308 i++; |
eb3ad04675e1
MPL2 subreader, patch by Cezary Jackiewicz (cjackiewicz@poczta.onet.pl)
alex
parents:
12136
diff
changeset
|
309 if (i>=SUB_MAX_TEXT) { mp_msg(MSGT_SUBREADER,MSGL_WARN,"Too many lines in a subtitle\n");current->lines=i;return current;} |
eb3ad04675e1
MPL2 subreader, patch by Cezary Jackiewicz (cjackiewicz@poczta.onet.pl)
alex
parents:
12136
diff
changeset
|
310 } |
eb3ad04675e1
MPL2 subreader, patch by Cezary Jackiewicz (cjackiewicz@poczta.onet.pl)
alex
parents:
12136
diff
changeset
|
311 current->lines= ++i; |
eb3ad04675e1
MPL2 subreader, patch by Cezary Jackiewicz (cjackiewicz@poczta.onet.pl)
alex
parents:
12136
diff
changeset
|
312 |
eb3ad04675e1
MPL2 subreader, patch by Cezary Jackiewicz (cjackiewicz@poczta.onet.pl)
alex
parents:
12136
diff
changeset
|
313 return current; |
eb3ad04675e1
MPL2 subreader, patch by Cezary Jackiewicz (cjackiewicz@poczta.onet.pl)
alex
parents:
12136
diff
changeset
|
314 } |
eb3ad04675e1
MPL2 subreader, patch by Cezary Jackiewicz (cjackiewicz@poczta.onet.pl)
alex
parents:
12136
diff
changeset
|
315 |
19066
26a30496ec96
marks several function without a prototype which arent used outside its sourcefile as static, Patch by Stefan Huehner - stefan AT huehner-org
reynaldo
parents:
18980
diff
changeset
|
316 static subtitle *sub_read_line_subrip(stream_t* st, subtitle *current) { |
2912 | 317 char line[LINE_LEN+1]; |
258 | 318 int a1,a2,a3,a4,b1,b2,b3,b4; |
319 char *p=NULL, *q=NULL; | |
320 int len; | |
29251 | 321 |
1764 | 322 while (1) { |
17879 | 323 if (!stream_read_line (st, line, LINE_LEN)) return NULL; |
269 | 324 if (sscanf (line, "%d:%d:%d.%d,%d:%d:%d.%d",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4) < 8) continue; |
258 | 325 current->start = a1*360000+a2*6000+a3*100+a4; |
326 current->end = b1*360000+b2*6000+b3*100+b4; | |
327 | |
17879 | 328 if (!stream_read_line (st, line, LINE_LEN)) return NULL; |
258 | 329 |
330 p=q=line; | |
331 for (current->lines=1; current->lines < SUB_MAX_TEXT; current->lines++) { | |
6657
766b6fb28ebf
subrip sometimes uses pipe as newline separator - patch by MOLNAR Andor <dolphy@inf.elte.hu>
arpi
parents:
6597
diff
changeset
|
332 for (q=p,len=0; *p && *p!='\r' && *p!='\n' && *p!='|' && strncmp(p,"[br]",4); p++,len++); |
18869 | 333 current->text[current->lines-1]=malloc (len+1); |
258 | 334 if (!current->text[current->lines-1]) return ERR; |
335 strncpy (current->text[current->lines-1], q, len); | |
270 | 336 current->text[current->lines-1][len]='\0'; |
258 | 337 if (!*p || *p=='\r' || *p=='\n') break; |
6657
766b6fb28ebf
subrip sometimes uses pipe as newline separator - patch by MOLNAR Andor <dolphy@inf.elte.hu>
arpi
parents:
6597
diff
changeset
|
338 if (*p=='|') p++; |
766b6fb28ebf
subrip sometimes uses pipe as newline separator - patch by MOLNAR Andor <dolphy@inf.elte.hu>
arpi
parents:
6597
diff
changeset
|
339 else while (*p++!=']'); |
258 | 340 } |
1764 | 341 break; |
258 | 342 } |
343 return current; | |
344 } | |
345 | |
19066
26a30496ec96
marks several function without a prototype which arent used outside its sourcefile as static, Patch by Stefan Huehner - stefan AT huehner-org
reynaldo
parents:
18980
diff
changeset
|
346 static subtitle *sub_read_line_subviewer(stream_t *st,subtitle *current) { |
2912 | 347 char line[LINE_LEN+1]; |
258 | 348 int a1,a2,a3,a4,b1,b2,b3,b4; |
349 char *p=NULL; | |
350 int i,len; | |
29251 | 351 |
258 | 352 while (!current->text[0]) { |
17879 | 353 if (!stream_read_line (st, line, LINE_LEN)) return NULL; |
9217
420e2b2f8e5a
compiler warning fixes patch by Dominik Mierzejewski <dominik@rangers.eu.org>
arpi
parents:
9145
diff
changeset
|
354 if ((len=sscanf (line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d",&a1,&a2,&a3,(char *)&i,&a4,&b1,&b2,&b3,(char *)&i,&b4)) < 10) |
258 | 355 continue; |
356 current->start = a1*360000+a2*6000+a3*100+a4/10; | |
357 current->end = b1*360000+b2*6000+b3*100+b4/10; | |
358 for (i=0; i<SUB_MAX_TEXT;) { | |
21939
2992c0eda0ec
In .srt, any line containing only spaces and tabs marks the end of the
eugeni
parents:
21833
diff
changeset
|
359 int blank = 1; |
17879 | 360 if (!stream_read_line (st, line, LINE_LEN)) break; |
258 | 361 len=0; |
21939
2992c0eda0ec
In .srt, any line containing only spaces and tabs marks the end of the
eugeni
parents:
21833
diff
changeset
|
362 for (p=line; *p!='\n' && *p!='\r' && *p; p++,len++) |
2992c0eda0ec
In .srt, any line containing only spaces and tabs marks the end of the
eugeni
parents:
21833
diff
changeset
|
363 if (*p != ' ' && *p != '\t') |
2992c0eda0ec
In .srt, any line containing only spaces and tabs marks the end of the
eugeni
parents:
21833
diff
changeset
|
364 blank = 0; |
2992c0eda0ec
In .srt, any line containing only spaces and tabs marks the end of the
eugeni
parents:
21833
diff
changeset
|
365 if (len && !blank) { |
7608
e1962f1bb326
Skip html tags (like <i>) inside subviewer subtitles.
atmos4
parents:
7472
diff
changeset
|
366 int j=0,skip=0; |
18869 | 367 char *curptr=current->text[i]=malloc (len+1); |
258 | 368 if (!current->text[i]) return ERR; |
7608
e1962f1bb326
Skip html tags (like <i>) inside subviewer subtitles.
atmos4
parents:
7472
diff
changeset
|
369 //strncpy (current->text[i], line, len); current->text[i][len]='\0'; |
8123
9fc45fe0d444
*HUGE* set of compiler warning fixes, unused variables removal
arpi
parents:
7983
diff
changeset
|
370 for(; j<len; j++) { |
7608
e1962f1bb326
Skip html tags (like <i>) inside subviewer subtitles.
atmos4
parents:
7472
diff
changeset
|
371 /* let's filter html tags ::atmos */ |
e1962f1bb326
Skip html tags (like <i>) inside subviewer subtitles.
atmos4
parents:
7472
diff
changeset
|
372 if(line[j]=='>') { |
e1962f1bb326
Skip html tags (like <i>) inside subviewer subtitles.
atmos4
parents:
7472
diff
changeset
|
373 skip=0; |
e1962f1bb326
Skip html tags (like <i>) inside subviewer subtitles.
atmos4
parents:
7472
diff
changeset
|
374 continue; |
e1962f1bb326
Skip html tags (like <i>) inside subviewer subtitles.
atmos4
parents:
7472
diff
changeset
|
375 } |
e1962f1bb326
Skip html tags (like <i>) inside subviewer subtitles.
atmos4
parents:
7472
diff
changeset
|
376 if(line[j]=='<') { |
e1962f1bb326
Skip html tags (like <i>) inside subviewer subtitles.
atmos4
parents:
7472
diff
changeset
|
377 skip=1; |
e1962f1bb326
Skip html tags (like <i>) inside subviewer subtitles.
atmos4
parents:
7472
diff
changeset
|
378 continue; |
e1962f1bb326
Skip html tags (like <i>) inside subviewer subtitles.
atmos4
parents:
7472
diff
changeset
|
379 } |
e1962f1bb326
Skip html tags (like <i>) inside subviewer subtitles.
atmos4
parents:
7472
diff
changeset
|
380 if(skip) { |
e1962f1bb326
Skip html tags (like <i>) inside subviewer subtitles.
atmos4
parents:
7472
diff
changeset
|
381 continue; |
e1962f1bb326
Skip html tags (like <i>) inside subviewer subtitles.
atmos4
parents:
7472
diff
changeset
|
382 } |
e1962f1bb326
Skip html tags (like <i>) inside subviewer subtitles.
atmos4
parents:
7472
diff
changeset
|
383 *curptr=line[j]; |
e1962f1bb326
Skip html tags (like <i>) inside subviewer subtitles.
atmos4
parents:
7472
diff
changeset
|
384 curptr++; |
e1962f1bb326
Skip html tags (like <i>) inside subviewer subtitles.
atmos4
parents:
7472
diff
changeset
|
385 } |
e1962f1bb326
Skip html tags (like <i>) inside subviewer subtitles.
atmos4
parents:
7472
diff
changeset
|
386 *curptr='\0'; |
e1962f1bb326
Skip html tags (like <i>) inside subviewer subtitles.
atmos4
parents:
7472
diff
changeset
|
387 |
258 | 388 i++; |
389 } else { | |
390 break; | |
391 } | |
392 } | |
393 current->lines=i; | |
394 } | |
395 return current; | |
396 } | |
397 | |
19066
26a30496ec96
marks several function without a prototype which arent used outside its sourcefile as static, Patch by Stefan Huehner - stefan AT huehner-org
reynaldo
parents:
18980
diff
changeset
|
398 static subtitle *sub_read_line_subviewer2(stream_t *st,subtitle *current) { |
6012 | 399 char line[LINE_LEN+1]; |
400 int a1,a2,a3,a4; | |
401 char *p=NULL; | |
402 int i,len; | |
29251 | 403 |
6012 | 404 while (!current->text[0]) { |
17879 | 405 if (!stream_read_line (st, line, LINE_LEN)) return NULL; |
6012 | 406 if (line[0]!='{') |
407 continue; | |
408 if ((len=sscanf (line, "{T %d:%d:%d:%d",&a1,&a2,&a3,&a4)) < 4) | |
409 continue; | |
410 current->start = a1*360000+a2*6000+a3*100+a4/10; | |
411 for (i=0; i<SUB_MAX_TEXT;) { | |
17879 | 412 if (!stream_read_line (st, line, LINE_LEN)) break; |
6012 | 413 if (line[0]=='}') break; |
414 len=0; | |
415 for (p=line; *p!='\n' && *p!='\r' && *p; ++p,++len); | |
416 if (len) { | |
18869 | 417 current->text[i]=malloc (len+1); |
6012 | 418 if (!current->text[i]) return ERR; |
419 strncpy (current->text[i], line, len); current->text[i][len]='\0'; | |
420 ++i; | |
421 } else { | |
422 break; | |
423 } | |
424 } | |
425 current->lines=i; | |
426 } | |
427 return current; | |
428 } | |
429 | |
430 | |
19066
26a30496ec96
marks several function without a prototype which arent used outside its sourcefile as static, Patch by Stefan Huehner - stefan AT huehner-org
reynaldo
parents:
18980
diff
changeset
|
431 static subtitle *sub_read_line_vplayer(stream_t *st,subtitle *current) { |
2912 | 432 char line[LINE_LEN+1]; |
4064
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
433 int a1,a2,a3; |
3735 | 434 char *p=NULL, *next,separator; |
4064
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
435 int i,len,plen; |
818 | 436 |
437 while (!current->text[0]) { | |
17879 | 438 if (!stream_read_line (st, line, LINE_LEN)) return NULL; |
3724
a2325883c46c
vplayer format - no longer crashes on slightly broken subs.
eyck
parents:
3701
diff
changeset
|
439 if ((len=sscanf (line, "%d:%d:%d%c%n",&a1,&a2,&a3,&separator,&plen)) < 4) |
818 | 440 continue; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29251
diff
changeset
|
441 |
4064
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
442 if (!(current->start = a1*360000+a2*6000+a3*100)) |
818 | 443 continue; |
5363
1f068f4bb6e7
vplayer sub fix by Arkadiusz Podgorski <wodzu@softomat.com.pl>
arpi
parents:
4886
diff
changeset
|
444 /* removed by wodzu |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29251
diff
changeset
|
445 p=line; |
1640
cbedcfab877b
Fixup to vplayer subtitle submitted to sourceforge by Igor Wojnicki
eyck
parents:
1501
diff
changeset
|
446 // finds the body of the subtitle |
29251 | 447 for (i=0; i<3; i++){ |
3433 | 448 p=strchr(p,':'); |
449 if (p==NULL) break; | |
450 ++p; | |
29251 | 451 } |
3433 | 452 if (p==NULL) { |
453 printf("SUB: Skipping incorrect subtitle line!\n"); | |
454 continue; | |
455 } | |
5363
1f068f4bb6e7
vplayer sub fix by Arkadiusz Podgorski <wodzu@softomat.com.pl>
arpi
parents:
4886
diff
changeset
|
456 */ |
1f068f4bb6e7
vplayer sub fix by Arkadiusz Podgorski <wodzu@softomat.com.pl>
arpi
parents:
4886
diff
changeset
|
457 // by wodzu: hey! this time we know what length it has! what is |
1f068f4bb6e7
vplayer sub fix by Arkadiusz Podgorski <wodzu@softomat.com.pl>
arpi
parents:
4886
diff
changeset
|
458 // that magic for? it can't deal with space instead of third |
1f068f4bb6e7
vplayer sub fix by Arkadiusz Podgorski <wodzu@softomat.com.pl>
arpi
parents:
4886
diff
changeset
|
459 // colon! look, what simple it can be: |
1f068f4bb6e7
vplayer sub fix by Arkadiusz Podgorski <wodzu@softomat.com.pl>
arpi
parents:
4886
diff
changeset
|
460 p = &line[ plen ]; |
4064
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
461 |
1640
cbedcfab877b
Fixup to vplayer subtitle submitted to sourceforge by Igor Wojnicki
eyck
parents:
1501
diff
changeset
|
462 i=0; |
818 | 463 if (*p!='|') { |
464 // | |
465 next = p,i=0; | |
466 while ((next =sub_readtext (next, &(current->text[i])))) { | |
467 if (current->text[i]==ERR) {return ERR;} | |
468 i++; | |
6296 | 469 if (i>=SUB_MAX_TEXT) { mp_msg(MSGT_SUBREADER,MSGL_WARN,"Too many lines in a subtitle\n");current->lines=i;return current;} |
818 | 470 } |
471 current->lines=i+1; | |
472 } | |
473 } | |
474 return current; | |
475 } | |
476 | |
19066
26a30496ec96
marks several function without a prototype which arent used outside its sourcefile as static, Patch by Stefan Huehner - stefan AT huehner-org
reynaldo
parents:
18980
diff
changeset
|
477 static subtitle *sub_read_line_rt(stream_t *st,subtitle *current) { |
29251 | 478 //TODO: This format uses quite rich (sub/super)set of xhtml |
850 | 479 // I couldn't check it since DTD is not included. |
29251 | 480 // WARNING: full XML parses can be required for proper parsing |
2912 | 481 char line[LINE_LEN+1]; |
850 | 482 int a1,a2,a3,a4,b1,b2,b3,b4; |
483 char *p=NULL,*next=NULL; | |
484 int i,len,plen; | |
29251 | 485 |
850 | 486 while (!current->text[0]) { |
17879 | 487 if (!stream_read_line (st, line, LINE_LEN)) return NULL; |
850 | 488 //TODO: it seems that format of time is not easily determined, it may be 1:12, 1:12.0 or 0:1:12.0 |
489 //to describe the same moment in time. Maybe there are even more formats in use. | |
490 //if ((len=sscanf (line, "<Time Begin=\"%d:%d:%d.%d\" End=\"%d:%d:%d.%d\"",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4)) < 8) | |
491 plen=a1=a2=a3=a4=b1=b2=b3=b4=0; | |
492 if ( | |
9322 | 493 ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d.%d\" %*[Ee]nd=\"%d.%d\"%*[^<]<clear/>%n",&a3,&a4,&b3,&b4,&plen)) < 4) && |
494 ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d.%d\" %*[Ee]nd=\"%d:%d.%d\"%*[^<]<clear/>%n",&a3,&a4,&b2,&b3,&b4,&plen)) < 5) && | |
850 | 495 ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d:%d\" %*[Ee]nd=\"%d:%d\"%*[^<]<clear/>%n",&a2,&a3,&b2,&b3,&plen)) < 4) && |
496 ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d:%d\" %*[Ee]nd=\"%d:%d.%d\"%*[^<]<clear/>%n",&a2,&a3,&b2,&b3,&b4,&plen)) < 5) && | |
497 // ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d:%d.%d\" %*[Ee]nd=\"%d:%d\"%*[^<]<clear/>%n",&a2,&a3,&a4,&b2,&b3,&plen)) < 5) && | |
498 ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d:%d.%d\" %*[Ee]nd=\"%d:%d.%d\"%*[^<]<clear/>%n",&a2,&a3,&a4,&b2,&b3,&b4,&plen)) < 6) && | |
9322 | 499 ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d:%d:%d.%d\" %*[Ee]nd=\"%d:%d:%d.%d\"%*[^<]<clear/>%n",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4,&plen)) < 8) && |
500 //now try it without end time | |
501 ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d.%d\"%*[^<]<clear/>%n",&a3,&a4,&plen)) < 2) && | |
502 ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d:%d\"%*[^<]<clear/>%n",&a2,&a3,&plen)) < 2) && | |
503 ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d:%d.%d\"%*[^<]<clear/>%n",&a2,&a3,&a4,&plen)) < 3) && | |
29251 | 504 ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d:%d:%d.%d\"%*[^<]<clear/>%n",&a1,&a2,&a3,&a4,&plen)) < 4) |
850 | 505 ) |
506 continue; | |
507 current->start = a1*360000+a2*6000+a3*100+a4/10; | |
508 current->end = b1*360000+b2*6000+b3*100+b4/10; | |
9322 | 509 if (b1 == 0 && b2 == 0 && b3 == 0 && b4 == 0) |
510 current->end = current->start+200; | |
850 | 511 p=line; p+=plen;i=0; |
512 // TODO: I don't know what kind of convention is here for marking multiline subs, maybe <br/> like in xml? | |
6242
9c8c3b5e6658
possible sig11 fixed in .rt parser (weisskreuzova.zip)
arpi
parents:
6208
diff
changeset
|
513 next = strstr(line,"<clear/>"); |
9c8c3b5e6658
possible sig11 fixed in .rt parser (weisskreuzova.zip)
arpi
parents:
6208
diff
changeset
|
514 if(next && strlen(next)>8){ |
9c8c3b5e6658
possible sig11 fixed in .rt parser (weisskreuzova.zip)
arpi
parents:
6208
diff
changeset
|
515 next+=8;i=0; |
9c8c3b5e6658
possible sig11 fixed in .rt parser (weisskreuzova.zip)
arpi
parents:
6208
diff
changeset
|
516 while ((next =sub_readtext (next, &(current->text[i])))) { |
850 | 517 if (current->text[i]==ERR) {return ERR;} |
518 i++; | |
6296 | 519 if (i>=SUB_MAX_TEXT) { mp_msg(MSGT_SUBREADER,MSGL_WARN,"Too many lines in a subtitle\n");current->lines=i;return current;} |
6242
9c8c3b5e6658
possible sig11 fixed in .rt parser (weisskreuzova.zip)
arpi
parents:
6208
diff
changeset
|
520 } |
850 | 521 } |
522 current->lines=i+1; | |
523 } | |
524 return current; | |
525 } | |
526 | |
19066
26a30496ec96
marks several function without a prototype which arent used outside its sourcefile as static, Patch by Stefan Huehner - stefan AT huehner-org
reynaldo
parents:
18980
diff
changeset
|
527 static subtitle *sub_read_line_ssa(stream_t *st,subtitle *current) { |
6597 | 528 /* |
529 * Sub Station Alpha v4 (and v2?) scripts have 9 commas before subtitle | |
530 * other Sub Station Alpha scripts have only 8 commas before subtitle | |
531 * Reading the "ScriptType:" field is not reliable since many scripts appear | |
532 * w/o it | |
533 * | |
534 * http://www.scriptclub.org is a good place to find more examples | |
535 * http://www.eswat.demon.co.uk is where the SSA specs can be found | |
536 */ | |
537 int comma; | |
538 static int max_comma = 32; /* let's use 32 for the case that the */ | |
539 /* amount of commas increase with newer SSA versions */ | |
540 | |
921 | 541 int hour1, min1, sec1, hunsec1, |
542 hour2, min2, sec2, hunsec2, nothing; | |
2141 | 543 int num; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29251
diff
changeset
|
544 |
2912 | 545 char line[LINE_LEN+1], |
546 line3[LINE_LEN+1], | |
9009
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
547 *line2; |
2141 | 548 char *tmp; |
549 | |
921 | 550 do { |
17879 | 551 if (!stream_read_line (st, line, LINE_LEN)) return NULL; |
921 | 552 } while (sscanf (line, "Dialogue: Marked=%d,%d:%d:%d.%d,%d:%d:%d.%d," |
2140 | 553 "%[^\n\r]", ¬hing, |
29251 | 554 &hour1, &min1, &sec1, &hunsec1, |
2140 | 555 &hour2, &min2, &sec2, &hunsec2, |
10450 | 556 line3) < 9 |
557 && | |
558 sscanf (line, "Dialogue: %d,%d:%d:%d.%d,%d:%d:%d.%d," | |
559 "%[^\n\r]", ¬hing, | |
29251 | 560 &hour1, &min1, &sec1, &hunsec1, |
10450 | 561 &hour2, &min2, &sec2, &hunsec2, |
562 line3) < 9 ); | |
6597 | 563 |
564 line2=strchr(line3, ','); | |
565 | |
566 for (comma = 4; comma < max_comma; comma ++) | |
567 { | |
568 tmp = line2; | |
569 if(!(tmp=strchr(++tmp, ','))) break; | |
29251 | 570 if(*(++tmp) == ' ') break; |
6597 | 571 /* a space after a comma means we're already in a sentence */ |
572 line2 = tmp; | |
573 } | |
574 | |
575 if(comma < max_comma)max_comma = comma; | |
8602
36d5c7137876
Attached is a small patch to fix a couple of problems I found when using
arpi
parents:
8363
diff
changeset
|
576 /* eliminate the trailing comma */ |
36d5c7137876
Attached is a small patch to fix a couple of problems I found when using
arpi
parents:
8363
diff
changeset
|
577 if(*line2 == ',') line2++; |
2140 | 578 |
6247
0b8660d79efe
sub_read_line_ssa sig11 fix by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>
arpi
parents:
6242
diff
changeset
|
579 current->lines=0;num=0; |
921 | 580 current->start = 360000*hour1 + 6000*min1 + 100*sec1 + hunsec1; |
581 current->end = 360000*hour2 + 6000*min2 + 100*sec2 + hunsec2; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29251
diff
changeset
|
582 |
5990
e5b3385775b3
accept \N too, patch by Reinder <r.cuperus@student.utwente.nl>
arpi
parents:
5828
diff
changeset
|
583 while (((tmp=strstr(line2, "\\n")) != NULL) || ((tmp=strstr(line2, "\\N")) != NULL) ){ |
18869 | 584 current->text[num]=malloc(tmp-line2+1); |
2141 | 585 strncpy (current->text[num], line2, tmp-line2); |
586 current->text[num][tmp-line2]='\0'; | |
587 line2=tmp+2; | |
588 num++; | |
589 current->lines++; | |
590 if (current->lines >= SUB_MAX_TEXT) return current; | |
591 } | |
592 | |
3701 | 593 current->text[num]=strdup(line2); |
6247
0b8660d79efe
sub_read_line_ssa sig11 fix by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>
arpi
parents:
6242
diff
changeset
|
594 current->lines++; |
818 | 595 |
921 | 596 return current; |
597 } | |
258 | 598 |
19066
26a30496ec96
marks several function without a prototype which arent used outside its sourcefile as static, Patch by Stefan Huehner - stefan AT huehner-org
reynaldo
parents:
18980
diff
changeset
|
599 static void sub_pp_ssa(subtitle *sub) { |
9009
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
600 int l=sub->lines; |
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
601 char *so,*de,*start; |
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
602 |
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
603 while (l){ |
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
604 /* eliminate any text enclosed with {}, they are font and color settings */ |
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
605 so=de=sub->text[--l]; |
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
606 while (*so) { |
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
607 if(*so == '{' && so[1]=='\\') { |
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
608 for (start=so; *so && *so!='}'; so++); |
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
609 if(*so) so++; else so=start; |
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
610 } |
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
611 if(*so) { |
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
612 *de=*so; |
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
613 so++; de++; |
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
614 } |
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
615 } |
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
616 *de=*so; |
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
617 } |
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
618 } |
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
619 |
11873 | 620 /* |
621 * PJS subtitles reader. | |
622 * That's the "Phoenix Japanimation Society" format. | |
623 * I found some of them in http://www.scriptsclub.org/ (used for anime). | |
624 * The time is in tenths of second. | |
625 * | |
626 * by set, based on code by szabi (dunnowhat sub format ;-) | |
627 */ | |
19066
26a30496ec96
marks several function without a prototype which arent used outside its sourcefile as static, Patch by Stefan Huehner - stefan AT huehner-org
reynaldo
parents:
18980
diff
changeset
|
628 static subtitle *sub_read_line_pjs(stream_t *st,subtitle *current) { |
2912 | 629 char line[LINE_LEN+1]; |
11873 | 630 char text[LINE_LEN+1], *s, *d; |
1081 | 631 |
17879 | 632 if (!stream_read_line (st, line, LINE_LEN)) |
1081 | 633 return NULL; |
11873 | 634 /* skip spaces */ |
635 for (s=line; *s && isspace(*s); s++); | |
636 /* allow empty lines at the end of the file */ | |
637 if (*s==0) | |
638 return NULL; | |
639 /* get the time */ | |
640 if (sscanf (s, "%ld,%ld,", &(current->start), | |
641 &(current->end)) <2) { | |
1081 | 642 return ERR; |
11873 | 643 } |
644 /* the files I have are in tenths of second */ | |
645 current->start *= 10; | |
646 current->end *= 10; | |
647 /* walk to the beggining of the string */ | |
648 for (; *s; s++) if (*s==',') break; | |
649 if (*s) { | |
650 for (s++; *s; s++) if (*s==',') break; | |
651 if (*s) s++; | |
652 } | |
653 if (*s!='"') { | |
654 return ERR; | |
655 } | |
656 /* copy the string to the text buffer */ | |
657 for (s++, d=text; *s && *s!='"'; s++, d++) | |
658 *d=*s; | |
659 *d=0; | |
1081 | 660 current->text[0] = strdup(text); |
661 current->lines = 1; | |
662 | |
663 return current; | |
664 } | |
665 | |
19066
26a30496ec96
marks several function without a prototype which arent used outside its sourcefile as static, Patch by Stefan Huehner - stefan AT huehner-org
reynaldo
parents:
18980
diff
changeset
|
666 static subtitle *sub_read_line_mpsub(stream_t *st, subtitle *current) { |
2912 | 667 char line[LINE_LEN+1]; |
2178 | 668 float a,b; |
669 int num=0; | |
2177 | 670 char *p, *q; |
671 | |
672 do | |
673 { | |
17879 | 674 if (!stream_read_line(st, line, LINE_LEN)) return NULL; |
2178 | 675 } while (sscanf (line, "%f %f", &a, &b) !=2); |
2177 | 676 |
29251 | 677 mpsub_position += a*mpsub_multiplier; |
2178 | 678 current->start=(int) mpsub_position; |
29251 | 679 mpsub_position += b*mpsub_multiplier; |
2178 | 680 current->end=(int) mpsub_position; |
2177 | 681 |
682 while (num < SUB_MAX_TEXT) { | |
17879 | 683 if (!stream_read_line (st, line, LINE_LEN)) { |
4098 | 684 if (num == 0) return NULL; |
685 else return current; | |
686 } | |
2177 | 687 p=line; |
688 while (isspace(*p)) p++; | |
689 if (eol(*p) && num > 0) return current; | |
690 if (eol(*p)) return NULL; | |
691 | |
692 for (q=p; !eol(*q); q++); | |
693 *q='\0'; | |
694 if (strlen(p)) { | |
695 current->text[num]=strdup(p); | |
4098 | 696 // printf (">%s<\n",p); |
2177 | 697 current->lines = ++num; |
698 } else { | |
699 if (num) return current; | |
700 else return NULL; | |
701 } | |
702 } | |
3735 | 703 return NULL; // we should have returned before if it's OK |
2177 | 704 } |
705 | |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
26889
diff
changeset
|
706 #ifndef CONFIG_SORTSUB |
8362
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
707 //we don't need this if we use previous_sub_end |
2343 | 708 subtitle *previous_aqt_sub = NULL; |
8362
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
709 #endif |
2343 | 710 |
19066
26a30496ec96
marks several function without a prototype which arent used outside its sourcefile as static, Patch by Stefan Huehner - stefan AT huehner-org
reynaldo
parents:
18980
diff
changeset
|
711 static subtitle *sub_read_line_aqt(stream_t *st,subtitle *current) { |
2912 | 712 char line[LINE_LEN+1]; |
6076
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
713 char *next; |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
714 int i; |
2343 | 715 |
716 while (1) { | |
717 // try to locate next subtitle | |
17879 | 718 if (!stream_read_line (st, line, LINE_LEN)) |
2343 | 719 return NULL; |
720 if (!(sscanf (line, "-->> %ld", &(current->start)) <1)) | |
721 break; | |
722 } | |
29251 | 723 |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
26889
diff
changeset
|
724 #ifdef CONFIG_SORTSUB |
29251 | 725 previous_sub_end = (current->start) ? current->start - 1 : 0; |
8362
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
726 #else |
29251 | 727 if (previous_aqt_sub != NULL) |
2343 | 728 previous_aqt_sub->end = current->start-1; |
29251 | 729 |
2343 | 730 previous_aqt_sub = current; |
8362
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
731 #endif |
2343 | 732 |
17879 | 733 if (!stream_read_line (st, line, LINE_LEN)) |
2343 | 734 return NULL; |
735 | |
2468 | 736 sub_readtext((char *) &line,¤t->text[0]); |
2343 | 737 current->lines = 1; |
738 current->end = current->start; // will be corrected by next subtitle | |
739 | |
17879 | 740 if (!stream_read_line (st, line, LINE_LEN)) |
8862
356534b9e7d4
Since version 2.7 the file extension for JACOsub changed from
arpi
parents:
8789
diff
changeset
|
741 return current; |
2343 | 742 |
6076
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
743 next = line,i=1; |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
744 while ((next =sub_readtext (next, &(current->text[i])))) { |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
745 if (current->text[i]==ERR) {return ERR;} |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
746 i++; |
6296 | 747 if (i>=SUB_MAX_TEXT) { mp_msg(MSGT_SUBREADER,MSGL_WARN,"Too many lines in a subtitle\n");current->lines=i;return current;} |
6076
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
748 } |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
749 current->lines=i+1; |
2343 | 750 |
22256
3a30fc845a9c
10l: comparison of char* ptrs with string literals
faust3
parents:
22141
diff
changeset
|
751 if (!strlen(current->text[0]) && !strlen(current->text[1])) { |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
26889
diff
changeset
|
752 #ifdef CONFIG_SORTSUB |
8362
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
753 previous_sub_end = 0; |
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
754 #else |
2343 | 755 // void subtitle -> end of previous marked and exit |
756 previous_aqt_sub = NULL; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29251
diff
changeset
|
757 #endif |
2343 | 758 return NULL; |
759 } | |
760 | |
761 return current; | |
762 } | |
2177 | 763 |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
26889
diff
changeset
|
764 #ifndef CONFIG_SORTSUB |
6076
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
765 subtitle *previous_subrip09_sub = NULL; |
8362
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
766 #endif |
6076
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
767 |
19066
26a30496ec96
marks several function without a prototype which arent used outside its sourcefile as static, Patch by Stefan Huehner - stefan AT huehner-org
reynaldo
parents:
18980
diff
changeset
|
768 static subtitle *sub_read_line_subrip09(stream_t *st,subtitle *current) { |
6076
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
769 char line[LINE_LEN+1]; |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
770 int a1,a2,a3; |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
771 char * next=NULL; |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
772 int i,len; |
29251 | 773 |
6076
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
774 while (1) { |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
775 // try to locate next subtitle |
17879 | 776 if (!stream_read_line (st, line, LINE_LEN)) |
6076
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
777 return NULL; |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
778 if (!((len=sscanf (line, "[%d:%d:%d]",&a1,&a2,&a3)) < 3)) |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
779 break; |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
780 } |
8362
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
781 |
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
782 current->start = a1*360000+a2*6000+a3*100; |
29251 | 783 |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
26889
diff
changeset
|
784 #ifdef CONFIG_SORTSUB |
29251 | 785 previous_sub_end = (current->start) ? current->start - 1 : 0; |
8362
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
786 #else |
29251 | 787 if (previous_subrip09_sub != NULL) |
6076
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
788 previous_subrip09_sub->end = current->start-1; |
29251 | 789 |
6076
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
790 previous_subrip09_sub = current; |
8362
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
791 #endif |
6076
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
792 |
17879 | 793 if (!stream_read_line (st, line, LINE_LEN)) |
6076
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
794 return NULL; |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
795 |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
796 next = line,i=0; |
29251 | 797 |
7472
c4434bdf6e51
tons of warning fixes, also some 10l bugfixes, including Dominik's PVA bug
arpi
parents:
7460
diff
changeset
|
798 current->text[0]=""; // just to be sure that string is clear |
29251 | 799 |
6076
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
800 while ((next =sub_readtext (next, &(current->text[i])))) { |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
801 if (current->text[i]==ERR) {return ERR;} |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
802 i++; |
6296 | 803 if (i>=SUB_MAX_TEXT) { mp_msg(MSGT_SUBREADER,MSGL_WARN,"Too many lines in a subtitle\n");current->lines=i;return current;} |
6076
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
804 } |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
805 current->lines=i+1; |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
806 |
22256
3a30fc845a9c
10l: comparison of char* ptrs with string literals
faust3
parents:
22141
diff
changeset
|
807 if (!strlen(current->text[0]) && (i==0)) { |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
26889
diff
changeset
|
808 #ifdef CONFIG_SORTSUB |
8362
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
809 previous_sub_end = 0; |
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
810 #else |
6076
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
811 // void subtitle -> end of previous marked and exit |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
812 previous_subrip09_sub = NULL; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29251
diff
changeset
|
813 #endif |
6076
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
814 return NULL; |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
815 } |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
816 |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
817 return current; |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
818 } |
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
819 |
19066
26a30496ec96
marks several function without a prototype which arent used outside its sourcefile as static, Patch by Stefan Huehner - stefan AT huehner-org
reynaldo
parents:
18980
diff
changeset
|
820 static subtitle *sub_read_line_jacosub(stream_t* st, subtitle * current) |
7982
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
821 { |
8207
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
822 char line1[LINE_LEN], line2[LINE_LEN], directive[LINE_LEN], *p, *q; |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
823 unsigned a1, a2, a3, a4, b1, b2, b3, b4, comment = 0; |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
824 static unsigned jacoTimeres = 30; |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
825 static int jacoShift = 0; |
7982
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
826 |
14642
38572280e8e7
bzero is deprecated patch by Gianluigi Tiesi <mplayer at netfarm.it>
faust3
parents:
13680
diff
changeset
|
827 memset(current, 0, sizeof(subtitle)); |
38572280e8e7
bzero is deprecated patch by Gianluigi Tiesi <mplayer at netfarm.it>
faust3
parents:
13680
diff
changeset
|
828 memset(line1, 0, LINE_LEN); |
38572280e8e7
bzero is deprecated patch by Gianluigi Tiesi <mplayer at netfarm.it>
faust3
parents:
13680
diff
changeset
|
829 memset(line2, 0, LINE_LEN); |
38572280e8e7
bzero is deprecated patch by Gianluigi Tiesi <mplayer at netfarm.it>
faust3
parents:
13680
diff
changeset
|
830 memset(directive, 0, LINE_LEN); |
7982
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
831 while (!current->text[0]) { |
17879 | 832 if (!stream_read_line(st, line1, LINE_LEN)) { |
7982
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
833 return NULL; |
8207
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
834 } |
7982
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
835 if (sscanf |
8207
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
836 (line1, "%u:%u:%u.%u %u:%u:%u.%u %[^\n\r]", &a1, &a2, &a3, &a4, |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
837 &b1, &b2, &b3, &b4, line2) < 9) { |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
838 if (sscanf(line1, "@%u @%u %[^\n\r]", &a4, &b4, line2) < 3) { |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
839 if (line1[0] == '#') { |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
840 int hours = 0, minutes = 0, seconds, delta, inverter = |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
841 1; |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
842 unsigned units = jacoShift; |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
843 switch (toupper(line1[1])) { |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
844 case 'S': |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
845 if (isalpha(line1[2])) { |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
846 delta = 6; |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
847 } else { |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
848 delta = 2; |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
849 } |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
850 if (sscanf(&line1[delta], "%d", &hours)) { |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
851 if (hours < 0) { |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
852 hours *= -1; |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
853 inverter = -1; |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
854 } |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
855 if (sscanf(&line1[delta], "%*d:%d", &minutes)) { |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
856 if (sscanf |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
857 (&line1[delta], "%*d:%*d:%d", |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
858 &seconds)) { |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
859 sscanf(&line1[delta], "%*d:%*d:%*d.%d", |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
860 &units); |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
861 } else { |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
862 hours = 0; |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
863 sscanf(&line1[delta], "%d:%d.%d", |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
864 &minutes, &seconds, &units); |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
865 minutes *= inverter; |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
866 } |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
867 } else { |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
868 hours = minutes = 0; |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
869 sscanf(&line1[delta], "%d.%d", &seconds, |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
870 &units); |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
871 seconds *= inverter; |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
872 } |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
873 jacoShift = |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
874 ((hours * 3600 + minutes * 60 + |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
875 seconds) * jacoTimeres + |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
876 units) * inverter; |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
877 } |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
878 break; |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
879 case 'T': |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
880 if (isalpha(line1[2])) { |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
881 delta = 8; |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
882 } else { |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
883 delta = 2; |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
884 } |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
885 sscanf(&line1[delta], "%u", &jacoTimeres); |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
886 break; |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
887 } |
7982
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
888 } |
8207
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
889 continue; |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
890 } else { |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
891 current->start = |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
892 (unsigned long) ((a4 + jacoShift) * 100.0 / |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
893 jacoTimeres); |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
894 current->end = |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
895 (unsigned long) ((b4 + jacoShift) * 100.0 / |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
896 jacoTimeres); |
7982
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
897 } |
8207
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
898 } else { |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
899 current->start = |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
900 (unsigned |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
901 long) (((a1 * 3600 + a2 * 60 + a3) * jacoTimeres + a4 + |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
902 jacoShift) * 100.0 / jacoTimeres); |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
903 current->end = |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
904 (unsigned |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
905 long) (((b1 * 3600 + b2 * 60 + b3) * jacoTimeres + b4 + |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
906 jacoShift) * 100.0 / jacoTimeres); |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
907 } |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
908 current->lines = 0; |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
909 p = line2; |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
910 while ((*p == ' ') || (*p == '\t')) { |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
911 ++p; |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
912 } |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
913 if (isalpha(*p)||*p == '[') { |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
914 int cont, jLength; |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
915 |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
916 if (sscanf(p, "%s %[^\n\r]", directive, line1) < 2) |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
917 return (subtitle *) ERR; |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
918 jLength = strlen(directive); |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
919 for (cont = 0; cont < jLength; ++cont) { |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
920 if (isalpha(*(directive + cont))) |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
921 *(directive + cont) = toupper(*(directive + cont)); |
7982
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
922 } |
8207
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
923 if ((strstr(directive, "RDB") != NULL) |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
924 || (strstr(directive, "RDC") != NULL) |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
925 || (strstr(directive, "RLB") != NULL) |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
926 || (strstr(directive, "RLG") != NULL)) { |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
927 continue; |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
928 } |
10916
c36db88bfbc4
Subtitle alignment & smart splitting by Salvatore Falco
henry
parents:
10801
diff
changeset
|
929 if (strstr(directive, "JL") != NULL) { |
13343
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
930 current->alignment = SUB_ALIGNMENT_BOTTOMLEFT; |
10916
c36db88bfbc4
Subtitle alignment & smart splitting by Salvatore Falco
henry
parents:
10801
diff
changeset
|
931 } else if (strstr(directive, "JR") != NULL) { |
13343
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
932 current->alignment = SUB_ALIGNMENT_BOTTOMRIGHT; |
10916
c36db88bfbc4
Subtitle alignment & smart splitting by Salvatore Falco
henry
parents:
10801
diff
changeset
|
933 } else { |
13343
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
934 current->alignment = SUB_ALIGNMENT_BOTTOMCENTER; |
10916
c36db88bfbc4
Subtitle alignment & smart splitting by Salvatore Falco
henry
parents:
10801
diff
changeset
|
935 } |
8207
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
936 strcpy(line2, line1); |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
937 p = line2; |
7982
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
938 } |
10916
c36db88bfbc4
Subtitle alignment & smart splitting by Salvatore Falco
henry
parents:
10801
diff
changeset
|
939 for (q = line1; (!eol(*p)) && (current->lines < SUB_MAX_TEXT); ++p) { |
7982
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
940 switch (*p) { |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
941 case '{': |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
942 comment++; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
943 break; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
944 case '}': |
8207
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
945 if (comment) { |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
946 --comment; |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
947 //the next line to get rid of a blank after the comment |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
948 if ((*(p + 1)) == ' ') |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
949 p++; |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
950 } |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
951 break; |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
952 case '~': |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
953 if (!comment) { |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
954 *q = ' '; |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
955 ++q; |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
956 } |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
957 break; |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
958 case ' ': |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
959 case '\t': |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
960 if ((*(p + 1) == ' ') || (*(p + 1) == '\t')) |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
961 break; |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
962 if (!comment) { |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
963 *q = ' '; |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
964 ++q; |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
965 } |
7982
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
966 break; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
967 case '\\': |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
968 if (*(p + 1) == 'n') { |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
969 *q = '\0'; |
8207
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
970 q = line1; |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
971 current->text[current->lines++] = strdup(line1); |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
972 ++p; |
7982
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
973 break; |
8207
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
974 } |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
975 if ((toupper(*(p + 1)) == 'C') |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
976 || (toupper(*(p + 1)) == 'F')) { |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
977 ++p,++p; |
7982
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
978 break; |
8207
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
979 } |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
980 if ((*(p + 1) == 'B') || (*(p + 1) == 'b') || (*(p + 1) == 'D') || //actually this means "insert current date here" |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
981 (*(p + 1) == 'I') || (*(p + 1) == 'i') || (*(p + 1) == 'N') || (*(p + 1) == 'T') || //actually this means "insert current time here" |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
982 (*(p + 1) == 'U') || (*(p + 1) == 'u')) { |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
983 ++p; |
7982
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
984 break; |
8207
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
985 } |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
986 if ((*(p + 1) == '\\') || |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
987 (*(p + 1) == '~') || (*(p + 1) == '{')) { |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
988 ++p; |
7982
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
989 } else if (eol(*(p + 1))) { |
17879 | 990 if (!stream_read_line(st, directive, LINE_LEN)) |
7982
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
991 return NULL; |
8207
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
992 trail_space(directive); |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
993 strncat(line2, directive, |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
994 (LINE_LEN > 511) ? LINE_LEN : 511); |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
995 break; |
7982
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
996 } |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
997 default: |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
998 if (!comment) { |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
999 *q = *p; |
8207
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
1000 ++q; |
7982
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
1001 } |
8207
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
1002 } //-- switch |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
1003 } //-- for |
7982
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
1004 *q = '\0'; |
8207
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
1005 current->text[current->lines] = strdup(line1); |
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
1006 } //-- while |
7982
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
1007 current->lines++; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
1008 return current; |
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
1009 } |
6076
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
1010 |
19066
26a30496ec96
marks several function without a prototype which arent used outside its sourcefile as static, Patch by Stefan Huehner - stefan AT huehner-org
reynaldo
parents:
18980
diff
changeset
|
1011 static int sub_autodetect (stream_t* st, int *uses_time) { |
2912 | 1012 char line[LINE_LEN+1]; |
258 | 1013 int i,j=0; |
2177 | 1014 char p; |
29251 | 1015 |
624 | 1016 while (j < 100) { |
258 | 1017 j++; |
17879 | 1018 if (!stream_read_line (st, line, LINE_LEN)) |
2912 | 1019 return SUB_INVALID; |
258 | 1020 |
624 | 1021 if (sscanf (line, "{%d}{%d}", &i, &i)==2) |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1022 {*uses_time=0;return SUB_MICRODVD;} |
4519 | 1023 if (sscanf (line, "{%d}{}", &i)==1) |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1024 {*uses_time=0;return SUB_MICRODVD;} |
12138
eb3ad04675e1
MPL2 subreader, patch by Cezary Jackiewicz (cjackiewicz@poczta.onet.pl)
alex
parents:
12136
diff
changeset
|
1025 if (sscanf (line, "[%d][%d]", &i, &i)==2) |
eb3ad04675e1
MPL2 subreader, patch by Cezary Jackiewicz (cjackiewicz@poczta.onet.pl)
alex
parents:
12136
diff
changeset
|
1026 {*uses_time=1;return SUB_MPL2;} |
269 | 1027 if (sscanf (line, "%d:%d:%d.%d,%d:%d:%d.%d", &i, &i, &i, &i, &i, &i, &i, &i)==8) |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1028 {*uses_time=1;return SUB_SUBRIP;} |
9217
420e2b2f8e5a
compiler warning fixes patch by Dominik Mierzejewski <dominik@rangers.eu.org>
arpi
parents:
9145
diff
changeset
|
1029 if (sscanf (line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d", &i, &i, &i, (char *)&i, &i, &i, &i, &i, (char *)&i, &i)==10) |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1030 {*uses_time=1;return SUB_SUBVIEWER;} |
11496 | 1031 if (sscanf (line, "{T %d:%d:%d:%d",&i, &i, &i, &i)==4) |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1032 {*uses_time=1;return SUB_SUBVIEWER2;} |
624 | 1033 if (strstr (line, "<SAMI>")) |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1034 {*uses_time=1; return SUB_SAMI;} |
7982
eac680483e6c
JACOSub is another subtitling format, whose specifications are at:
arpi
parents:
7775
diff
changeset
|
1035 if (sscanf(line, "%d:%d:%d.%d %d:%d:%d.%d", &i, &i, &i, &i, &i, &i, &i, &i) == 8) |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1036 {*uses_time = 1; return SUB_JACOSUB;} |
8207
467ffae428b0
I recently sent a patch for a new subtitles format, JACOsub. Since then I
arpi
parents:
8206
diff
changeset
|
1037 if (sscanf(line, "@%d @%d", &i, &i) == 2) |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1038 {*uses_time = 1; return SUB_JACOSUB;} |
818 | 1039 if (sscanf (line, "%d:%d:%d:", &i, &i, &i )==3) |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1040 {*uses_time=1;return SUB_VPLAYER;} |
5363
1f068f4bb6e7
vplayer sub fix by Arkadiusz Podgorski <wodzu@softomat.com.pl>
arpi
parents:
4886
diff
changeset
|
1041 if (sscanf (line, "%d:%d:%d ", &i, &i, &i )==3) |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1042 {*uses_time=1;return SUB_VPLAYER;} |
850 | 1043 //TODO: just checking if first line of sub starts with "<" is WAY |
913
18c43d261c35
corrected strcmp() bug, now it works again with every subs (it was broken)
laaz
parents:
896
diff
changeset
|
1044 // too weak test for RT |
18c43d261c35
corrected strcmp() bug, now it works again with every subs (it was broken)
laaz
parents:
896
diff
changeset
|
1045 // Please someone who knows the format of RT... FIX IT!!! |
921 | 1046 // It may conflict with other sub formats in the future (actually it doesn't) |
913
18c43d261c35
corrected strcmp() bug, now it works again with every subs (it was broken)
laaz
parents:
896
diff
changeset
|
1047 if ( *line == '<' ) |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1048 {*uses_time=1;return SUB_RT;} |
921 | 1049 |
1050 if (!memcmp(line, "Dialogue: Marked", 16)) | |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1051 {*uses_time=1; return SUB_SSA;} |
10450 | 1052 if (!memcmp(line, "Dialogue: ", 10)) |
1053 {*uses_time=1; return SUB_SSA;} | |
1081 | 1054 if (sscanf (line, "%d,%d,\"%c", &i, &i, (char *) &i) == 3) |
11873 | 1055 {*uses_time=1;return SUB_PJS;} |
2177 | 1056 if (sscanf (line, "FORMAT=%d", &i) == 1) |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1057 {*uses_time=0; return SUB_MPSUB;} |
2177 | 1058 if (sscanf (line, "FORMAT=TIM%c", &p)==1 && p=='E') |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1059 {*uses_time=1; return SUB_MPSUB;} |
2343 | 1060 if (strstr (line, "-->>")) |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1061 {*uses_time=0; return SUB_AQTITLE;} |
6076
eff64fb1ffea
patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz
arpi
parents:
6012
diff
changeset
|
1062 if (sscanf (line, "[%d:%d:%d]", &i, &i, &i)==3) |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1063 {*uses_time=1;return SUB_SUBRIP09;} |
258 | 1064 } |
624 | 1065 |
2912 | 1066 return SUB_INVALID; // too many bad lines |
258 | 1067 } |
2449
7ef89d9b06ed
added DUMPSUBS recognition if we need compile only subreader.c alone
atlka
parents:
2358
diff
changeset
|
1068 |
2151
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1069 extern int sub_utf8; |
9056 | 1070 int sub_utf8_prev=0; |
258 | 1071 |
4886 | 1072 extern float sub_delay; |
1073 extern float sub_fps; | |
1074 | |
27393 | 1075 #ifdef CONFIG_ICONV |
10354 | 1076 static iconv_t icdsc = (iconv_t)(-1); |
2151
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1077 |
17879 | 1078 void subcp_open (stream_t *st) |
2151
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1079 { |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1080 char *tocp = "UTF-8"; |
9056 | 1081 |
12909
dc8eba991005
fixes a crash and unchecked string-handling in ENCA code.
reimar
parents:
12646
diff
changeset
|
1082 if (sub_cp){ |
24851
e36efda34616
Our enca code uses strdup() on the input encoding name, as we don't modify it we can use the original constant string.
iive
parents:
24571
diff
changeset
|
1083 const char *cp_tmp = sub_cp; |
27393 | 1084 #ifdef CONFIG_ENCA |
12909
dc8eba991005
fixes a crash and unchecked string-handling in ENCA code.
reimar
parents:
12646
diff
changeset
|
1085 char enca_lang[3], enca_fallback[100]; |
dc8eba991005
fixes a crash and unchecked string-handling in ENCA code.
reimar
parents:
12646
diff
changeset
|
1086 if (sscanf(sub_cp, "enca:%2s:%99s", enca_lang, enca_fallback) == 2 |
dc8eba991005
fixes a crash and unchecked string-handling in ENCA code.
reimar
parents:
12646
diff
changeset
|
1087 || sscanf(sub_cp, "ENCA:%2s:%99s", enca_lang, enca_fallback) == 2) { |
29920
4f740437ed2b
Finally rename the STREAM_SEEK define to MP_STREAM_SEEK, there are just too many
reimar
parents:
29910
diff
changeset
|
1088 if (st && st->flags & MP_STREAM_SEEK ) { |
17879 | 1089 cp_tmp = guess_cp(st, enca_lang, enca_fallback); |
12909
dc8eba991005
fixes a crash and unchecked string-handling in ENCA code.
reimar
parents:
12646
diff
changeset
|
1090 } else { |
dc8eba991005
fixes a crash and unchecked string-handling in ENCA code.
reimar
parents:
12646
diff
changeset
|
1091 cp_tmp = enca_fallback; |
19877
f16afec4c9c0
Fix missleading msg printed when subcp_open is given NULL as parameter (like as demux_ogg and demux_mkv do)
gpoirier
parents:
19271
diff
changeset
|
1092 if (st) |
29251 | 1093 mp_msg(MSGT_SUBREADER,MSGL_WARN,"SUB: enca failed, stream must be seekable.\n"); |
12909
dc8eba991005
fixes a crash and unchecked string-handling in ENCA code.
reimar
parents:
12646
diff
changeset
|
1094 } |
dc8eba991005
fixes a crash and unchecked string-handling in ENCA code.
reimar
parents:
12646
diff
changeset
|
1095 } |
dc8eba991005
fixes a crash and unchecked string-handling in ENCA code.
reimar
parents:
12646
diff
changeset
|
1096 #endif |
dc8eba991005
fixes a crash and unchecked string-handling in ENCA code.
reimar
parents:
12646
diff
changeset
|
1097 if ((icdsc = iconv_open (tocp, cp_tmp)) != (iconv_t)(-1)){ |
6296 | 1098 mp_msg(MSGT_SUBREADER,MSGL_V,"SUB: opened iconv descriptor.\n"); |
2151
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1099 sub_utf8 = 2; |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1100 } else |
6296 | 1101 mp_msg(MSGT_SUBREADER,MSGL_ERR,"SUB: error opening iconv descriptor.\n"); |
2151
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1102 } |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1103 } |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1104 |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1105 void subcp_close (void) |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1106 { |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1107 if (icdsc != (iconv_t)(-1)){ |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1108 (void) iconv_close (icdsc); |
9143 | 1109 icdsc = (iconv_t)(-1); |
6296 | 1110 mp_msg(MSGT_SUBREADER,MSGL_V,"SUB: closed iconv descriptor.\n"); |
2151
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1111 } |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1112 } |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1113 |
20292
4f5c3fbbbba5
redone subcp_recode: get rid of static buffer, skip lines that failed to
reimar
parents:
19877
diff
changeset
|
1114 subtitle* subcp_recode (subtitle *sub) |
2151
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1115 { |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1116 int l=sub->lines; |
7472
c4434bdf6e51
tons of warning fixes, also some 10l bugfixes, including Dominik's PVA bug
arpi
parents:
7460
diff
changeset
|
1117 size_t ileft, oleft; |
2151
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1118 char *op, *ip, *ot; |
20292
4f5c3fbbbba5
redone subcp_recode: get rid of static buffer, skip lines that failed to
reimar
parents:
19877
diff
changeset
|
1119 if(icdsc == (iconv_t)(-1)) return sub; |
2151
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1120 |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1121 while (l){ |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1122 ip = sub->text[--l]; |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1123 ileft = strlen(ip); |
20292
4f5c3fbbbba5
redone subcp_recode: get rid of static buffer, skip lines that failed to
reimar
parents:
19877
diff
changeset
|
1124 oleft = 4 * ileft; |
9056 | 1125 |
20292
4f5c3fbbbba5
redone subcp_recode: get rid of static buffer, skip lines that failed to
reimar
parents:
19877
diff
changeset
|
1126 if (!(ot = malloc(oleft + 1))){ |
4f5c3fbbbba5
redone subcp_recode: get rid of static buffer, skip lines that failed to
reimar
parents:
19877
diff
changeset
|
1127 mp_msg(MSGT_SUBREADER,MSGL_WARN,"SUB: error allocating mem.\n"); |
4f5c3fbbbba5
redone subcp_recode: get rid of static buffer, skip lines that failed to
reimar
parents:
19877
diff
changeset
|
1128 continue; |
4f5c3fbbbba5
redone subcp_recode: get rid of static buffer, skip lines that failed to
reimar
parents:
19877
diff
changeset
|
1129 } |
4f5c3fbbbba5
redone subcp_recode: get rid of static buffer, skip lines that failed to
reimar
parents:
19877
diff
changeset
|
1130 op = ot; |
6163
141a082e6da6
applied 64bit patch from Ulrich Hecht <uli at suse dot de>
alex
parents:
6076
diff
changeset
|
1131 if (iconv(icdsc, &ip, &ileft, |
2151
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1132 &op, &oleft) == (size_t)(-1)) { |
20292
4f5c3fbbbba5
redone subcp_recode: get rid of static buffer, skip lines that failed to
reimar
parents:
19877
diff
changeset
|
1133 mp_msg(MSGT_SUBREADER,MSGL_WARN,"SUB: error recoding line.\n"); |
4f5c3fbbbba5
redone subcp_recode: get rid of static buffer, skip lines that failed to
reimar
parents:
19877
diff
changeset
|
1134 free(ot); |
4f5c3fbbbba5
redone subcp_recode: get rid of static buffer, skip lines that failed to
reimar
parents:
19877
diff
changeset
|
1135 continue; |
2151
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1136 } |
26889
32ab01bb3404
Clear iconv conversion state after each subtitle line.
eugeni
parents:
26759
diff
changeset
|
1137 // In some stateful encodings, we must clear the state to handle the last character |
32ab01bb3404
Clear iconv conversion state after each subtitle line.
eugeni
parents:
26759
diff
changeset
|
1138 if (iconv(icdsc, NULL, NULL, |
32ab01bb3404
Clear iconv conversion state after each subtitle line.
eugeni
parents:
26759
diff
changeset
|
1139 &op, &oleft) == (size_t)(-1)) { |
32ab01bb3404
Clear iconv conversion state after each subtitle line.
eugeni
parents:
26759
diff
changeset
|
1140 mp_msg(MSGT_SUBREADER,MSGL_WARN,"SUB: error recoding line, can't clear encoding state.\n"); |
32ab01bb3404
Clear iconv conversion state after each subtitle line.
eugeni
parents:
26759
diff
changeset
|
1141 } |
2151
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1142 *op='\0' ; |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1143 free (sub->text[l]); |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1144 sub->text[l] = ot; |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1145 } |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1146 return sub; |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1147 } |
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1148 #endif |
258 | 1149 |
27393 | 1150 #ifdef CONFIG_FRIBIDI |
29908
0ebce433be9e
Make fribidi (i.e. right-to-left) support work with embedded subtitles.
reimar
parents:
29895
diff
changeset
|
1151 /** |
0ebce433be9e
Make fribidi (i.e. right-to-left) support work with embedded subtitles.
reimar
parents:
29895
diff
changeset
|
1152 * Do conversion necessary for right-to-left language support via fribidi. |
0ebce433be9e
Make fribidi (i.e. right-to-left) support work with embedded subtitles.
reimar
parents:
29895
diff
changeset
|
1153 * @param sub subtitle to convert |
0ebce433be9e
Make fribidi (i.e. right-to-left) support work with embedded subtitles.
reimar
parents:
29895
diff
changeset
|
1154 * @param sub_utf8 whether the subtitle is encoded in UTF-8 |
0ebce433be9e
Make fribidi (i.e. right-to-left) support work with embedded subtitles.
reimar
parents:
29895
diff
changeset
|
1155 * @param from first new subtitle, all lines before this are assumed to be already converted |
0ebce433be9e
Make fribidi (i.e. right-to-left) support work with embedded subtitles.
reimar
parents:
29895
diff
changeset
|
1156 */ |
0ebce433be9e
Make fribidi (i.e. right-to-left) support work with embedded subtitles.
reimar
parents:
29895
diff
changeset
|
1157 static subtitle* sub_fribidi (subtitle *sub, int sub_utf8, int from) |
9635
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1158 { |
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1159 FriBidiChar logical[LINE_LEN+1], visual[LINE_LEN+1]; // Hopefully these two won't smash the stack |
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1160 char *ip = NULL, *op = NULL; |
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1161 FriBidiCharType base; |
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1162 size_t len,orig_len; |
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1163 int l=sub->lines; |
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1164 int char_set_num; |
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1165 fribidi_boolean log2vis; |
29894
4c4552f547b3
Use early return instead of block over whole function.
reimar
parents:
29893
diff
changeset
|
1166 if (!flip_hebrew) |
4c4552f547b3
Use early return instead of block over whole function.
reimar
parents:
29893
diff
changeset
|
1167 return sub; |
18550
1b8c3861dbd3
Use 0 and 1 instead of FRIBIDI_FALSE and FRIBIDI_TRUE which are no
uau
parents:
18514
diff
changeset
|
1168 fribidi_set_mirroring(1); |
1b8c3861dbd3
Use 0 and 1 instead of FRIBIDI_FALSE and FRIBIDI_TRUE which are no
uau
parents:
18514
diff
changeset
|
1169 fribidi_set_reorder_nsm(0); |
29251 | 1170 |
9635
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1171 if( sub_utf8 == 0 ) { |
10649
857a34ff479d
Fixes FriBiDi support and extends it with configure options. Patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
10555
diff
changeset
|
1172 char_set_num = fribidi_parse_charset (fribidi_charset?fribidi_charset:"ISO8859-8"); |
9635
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1173 }else { |
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1174 char_set_num = fribidi_parse_charset ("UTF-8"); |
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1175 } |
29908
0ebce433be9e
Make fribidi (i.e. right-to-left) support work with embedded subtitles.
reimar
parents:
29895
diff
changeset
|
1176 while (l > from) { |
9635
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1177 ip = sub->text[--l]; |
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1178 orig_len = len = strlen( ip ); // We assume that we don't use full unicode, only UTF-8 or ISO8859-x |
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1179 if(len > LINE_LEN) { |
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1180 mp_msg(MSGT_SUBREADER,MSGL_WARN,"SUB: sub->text is longer than LINE_LEN.\n"); |
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1181 l++; |
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1182 break; |
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1183 } |
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1184 len = fribidi_charset_to_unicode (char_set_num, ip, len, logical); |
13679
59bb11213d11
correctly display the commas of most hebrew subtitles on the left side
faust3
parents:
13343
diff
changeset
|
1185 base = fribidi_flip_commas?FRIBIDI_TYPE_ON:FRIBIDI_TYPE_L; |
9635
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1186 log2vis = fribidi_log2vis (logical, len, &base, |
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1187 /* output */ |
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1188 visual, NULL, NULL, NULL); |
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1189 if(log2vis) { |
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1190 len = fribidi_remove_bidi_marks (visual, len, NULL, NULL, |
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1191 NULL); |
29893 | 1192 if((op = malloc((FFMAX(2*orig_len,2*len) + 1))) == NULL) { |
9635
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1193 mp_msg(MSGT_SUBREADER,MSGL_WARN,"SUB: error allocating mem.\n"); |
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1194 l++; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29251
diff
changeset
|
1195 break; |
9635
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1196 } |
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1197 fribidi_unicode_to_charset ( char_set_num, visual, len,op); |
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1198 free (ip); |
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1199 sub->text[l] = op; |
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1200 } |
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1201 } |
29910 | 1202 if (!from && l){ |
9635
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1203 for (l = sub->lines; l;) |
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1204 free (sub->text[--l]); |
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1205 return ERR; |
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1206 } |
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1207 return sub; |
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1208 } |
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1209 |
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1210 #endif |
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1211 |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1212 static void adjust_subs_time(subtitle* sub, float subtime, float fps, int block, |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1213 int sub_num, int sub_uses_time) { |
4064
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1214 int n,m; |
4052
505f206d80d1
corrections to adjust_subs_time function which now uses fps if needed
atlka
parents:
4051
diff
changeset
|
1215 subtitle* nextsub; |
4051
0e7c382bc53a
added adjust_subs_time function which corrects bad sub->end time
atlka
parents:
4048
diff
changeset
|
1216 int i = sub_num; |
4052
505f206d80d1
corrections to adjust_subs_time function which now uses fps if needed
atlka
parents:
4051
diff
changeset
|
1217 unsigned long subfms = (sub_uses_time ? 100 : fps) * subtime; |
8206 | 1218 unsigned long overlap = (sub_uses_time ? 100 : fps) / 5; // 0.2s |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29251
diff
changeset
|
1219 |
4064
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1220 n=m=0; |
7610 | 1221 if (i) for (;;){ |
4064
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1222 if (sub->end <= sub->start){ |
4052
505f206d80d1
corrections to adjust_subs_time function which now uses fps if needed
atlka
parents:
4051
diff
changeset
|
1223 sub->end = sub->start + subfms; |
4064
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1224 m++; |
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1225 n++; |
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1226 } |
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1227 if (!--i) break; |
4051
0e7c382bc53a
added adjust_subs_time function which corrects bad sub->end time
atlka
parents:
4048
diff
changeset
|
1228 nextsub = sub + 1; |
8882
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1229 if(block){ |
8206 | 1230 if ((sub->end > nextsub->start) && (sub->end <= nextsub->start + overlap)) { |
1231 // these subtitles overlap for less than 0.2 seconds | |
1232 // and would result in very short overlapping subtitle | |
1233 // so let's fix the problem here, before overlapping code | |
1234 // get its hands on them | |
1235 unsigned delta = sub->end - nextsub->start, half = delta / 2; | |
1236 sub->end -= half + 1; | |
1237 nextsub->start += delta - half; | |
1238 } | |
4051
0e7c382bc53a
added adjust_subs_time function which corrects bad sub->end time
atlka
parents:
4048
diff
changeset
|
1239 if (sub->end >= nextsub->start){ |
0e7c382bc53a
added adjust_subs_time function which corrects bad sub->end time
atlka
parents:
4048
diff
changeset
|
1240 sub->end = nextsub->start - 1; |
4052
505f206d80d1
corrections to adjust_subs_time function which now uses fps if needed
atlka
parents:
4051
diff
changeset
|
1241 if (sub->end - sub->start > subfms) |
505f206d80d1
corrections to adjust_subs_time function which now uses fps if needed
atlka
parents:
4051
diff
changeset
|
1242 sub->end = sub->start + subfms; |
4064
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1243 if (!m) |
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1244 n++; |
4051
0e7c382bc53a
added adjust_subs_time function which corrects bad sub->end time
atlka
parents:
4048
diff
changeset
|
1245 } |
8882
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1246 } |
7610 | 1247 |
1248 /* Theory: | |
1249 * Movies are often converted from FILM (24 fps) | |
1250 * to PAL (25) by simply speeding it up, so we | |
1251 * to multiply the original timestmaps by | |
1252 * (Movie's FPS / Subtitle's (guessed) FPS) | |
1253 * so eg. for 23.98 fps movie and PAL time based | |
1254 * subtitles we say -subfps 25 and we're fine! | |
1255 */ | |
1256 | |
1257 /* timed sub fps correction ::atmos */ | |
24571
402b68e1a3bb
Revert r24103, it was nonsense and add a comment that explains the code
reimar
parents:
24083
diff
changeset
|
1258 /* the frame-based case is handled in mpcommon.c |
402b68e1a3bb
Revert r24103, it was nonsense and add a comment that explains the code
reimar
parents:
24083
diff
changeset
|
1259 * where find_sub is called */ |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29251
diff
changeset
|
1260 if(sub_uses_time && sub_fps) { |
7610 | 1261 sub->start *= sub_fps/fps; |
1262 sub->end *= sub_fps/fps; | |
1263 } | |
1264 | |
4051
0e7c382bc53a
added adjust_subs_time function which corrects bad sub->end time
atlka
parents:
4048
diff
changeset
|
1265 sub = nextsub; |
4064
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1266 m = 0; |
4051
0e7c382bc53a
added adjust_subs_time function which corrects bad sub->end time
atlka
parents:
4048
diff
changeset
|
1267 } |
29132 | 1268 if (n) mp_msg(MSGT_SUBREADER,MSGL_V,"SUB: Adjusted %d subtitle(s).\n", n); |
4051
0e7c382bc53a
added adjust_subs_time function which corrects bad sub->end time
atlka
parents:
4048
diff
changeset
|
1269 } |
0e7c382bc53a
added adjust_subs_time function which corrects bad sub->end time
atlka
parents:
4048
diff
changeset
|
1270 |
9009
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
1271 struct subreader { |
17879 | 1272 subtitle * (*read)(stream_t *st,subtitle *dest); |
9009
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
1273 void (*post)(subtitle *dest); |
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
1274 const char *name; |
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
1275 }; |
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
1276 |
27393 | 1277 #ifdef CONFIG_ENCA |
25400
fb8ad8ae4dfd
The function parameter 'preferred_language' should be const char *.
ulion
parents:
24852
diff
changeset
|
1278 const char* guess_buffer_cp(unsigned char* buffer, int buflen, const char *preferred_language, const char *fallback) |
12443 | 1279 { |
1280 const char **languages; | |
18936 | 1281 size_t langcnt; |
12443 | 1282 EncaAnalyser analyser; |
1283 EncaEncoding encoding; | |
24851
e36efda34616
Our enca code uses strdup() on the input encoding name, as we don't modify it we can use the original constant string.
iive
parents:
24571
diff
changeset
|
1284 const char *detected_sub_cp = NULL; |
12443 | 1285 int i; |
1286 | |
1287 languages = enca_get_languages(&langcnt); | |
1288 mp_msg(MSGT_SUBREADER, MSGL_V, "ENCA supported languages: "); | |
1289 for (i = 0; i < langcnt; i++) { | |
1290 mp_msg(MSGT_SUBREADER, MSGL_V, "%s ", languages[i]); | |
1291 } | |
1292 mp_msg(MSGT_SUBREADER, MSGL_V, "\n"); | |
29251 | 1293 |
12443 | 1294 for (i = 0; i < langcnt; i++) { |
1295 if (strcasecmp(languages[i], preferred_language) != 0) continue; | |
1296 analyser = enca_analyser_alloc(languages[i]); | |
1297 encoding = enca_analyse_const(analyser, buffer, buflen); | |
24852
35902b734951
Cleanup guess_buffer_cp() a bit, remove tmp variable, break the loop on success.
iive
parents:
24851
diff
changeset
|
1298 enca_analyser_free(analyser); |
35902b734951
Cleanup guess_buffer_cp() a bit, remove tmp variable, break the loop on success.
iive
parents:
24851
diff
changeset
|
1299 if (encoding.charset != ENCA_CS_UNKNOWN) { |
35902b734951
Cleanup guess_buffer_cp() a bit, remove tmp variable, break the loop on success.
iive
parents:
24851
diff
changeset
|
1300 detected_sub_cp = enca_charset_name(encoding.charset, ENCA_NAME_STYLE_ICONV); |
35902b734951
Cleanup guess_buffer_cp() a bit, remove tmp variable, break the loop on success.
iive
parents:
24851
diff
changeset
|
1301 break; |
15382
ba07942279c5
strdup() of a NULL pointer, truckload of cola for me
henry
parents:
14642
diff
changeset
|
1302 } |
12443 | 1303 } |
29251 | 1304 |
12443 | 1305 free(languages); |
1306 | |
15382
ba07942279c5
strdup() of a NULL pointer, truckload of cola for me
henry
parents:
14642
diff
changeset
|
1307 if (!detected_sub_cp) { |
24851
e36efda34616
Our enca code uses strdup() on the input encoding name, as we don't modify it we can use the original constant string.
iive
parents:
24571
diff
changeset
|
1308 detected_sub_cp = fallback; |
15382
ba07942279c5
strdup() of a NULL pointer, truckload of cola for me
henry
parents:
14642
diff
changeset
|
1309 mp_msg(MSGT_SUBREADER, MSGL_INFO, "ENCA detection failed: fallback to %s\n", fallback); |
24852
35902b734951
Cleanup guess_buffer_cp() a bit, remove tmp variable, break the loop on success.
iive
parents:
24851
diff
changeset
|
1310 }else{ |
35902b734951
Cleanup guess_buffer_cp() a bit, remove tmp variable, break the loop on success.
iive
parents:
24851
diff
changeset
|
1311 mp_msg(MSGT_SUBREADER, MSGL_INFO, "ENCA detected charset: %s\n", detected_sub_cp); |
15382
ba07942279c5
strdup() of a NULL pointer, truckload of cola for me
henry
parents:
14642
diff
changeset
|
1312 } |
12443 | 1313 |
1314 return detected_sub_cp; | |
1315 } | |
18936 | 1316 |
1317 #define MAX_GUESS_BUFFER_SIZE (256*1024) | |
25400
fb8ad8ae4dfd
The function parameter 'preferred_language' should be const char *.
ulion
parents:
24852
diff
changeset
|
1318 const char* guess_cp(stream_t *st, const char *preferred_language, const char *fallback) |
18936 | 1319 { |
1320 size_t buflen; | |
1321 unsigned char *buffer; | |
24851
e36efda34616
Our enca code uses strdup() on the input encoding name, as we don't modify it we can use the original constant string.
iive
parents:
24571
diff
changeset
|
1322 const char *detected_sub_cp = NULL; |
18936 | 1323 |
1324 buffer = malloc(MAX_GUESS_BUFFER_SIZE); | |
1325 buflen = stream_read(st,buffer, MAX_GUESS_BUFFER_SIZE); | |
1326 | |
1327 detected_sub_cp = guess_buffer_cp(buffer, buflen, preferred_language, fallback); | |
29251 | 1328 |
18936 | 1329 free(buffer); |
1330 stream_reset(st); | |
1331 stream_seek(st,0); | |
1332 | |
1333 return detected_sub_cp; | |
1334 } | |
1335 #undef MAX_GUESS_BUFFER_SIZE | |
12443 | 1336 #endif |
1337 | |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1338 sub_data* sub_read_file (char *filename, float fps) { |
17879 | 1339 stream_t* fd; |
7983
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1340 int n_max, n_first, i, j, sub_first, sub_orig; |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1341 subtitle *first, *second, *sub, *return_sub; |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1342 sub_data *subt_data; |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1343 int uses_time = 0, sub_num = 0, sub_errs = 0; |
9009
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
1344 struct subreader sr[]= |
258 | 1345 { |
9009
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
1346 { sub_read_line_microdvd, NULL, "microdvd" }, |
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
1347 { sub_read_line_subrip, NULL, "subrip" }, |
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
1348 { sub_read_line_subviewer, NULL, "subviewer" }, |
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
1349 { sub_read_line_sami, NULL, "sami" }, |
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
1350 { sub_read_line_vplayer, NULL, "vplayer" }, |
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
1351 { sub_read_line_rt, NULL, "rt" }, |
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
1352 { sub_read_line_ssa, sub_pp_ssa, "ssa" }, |
11873 | 1353 { sub_read_line_pjs, NULL, "pjs" }, |
9009
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
1354 { sub_read_line_mpsub, NULL, "mpsub" }, |
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
1355 { sub_read_line_aqt, NULL, "aqt" }, |
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
1356 { sub_read_line_subviewer2, NULL, "subviewer 2.0" }, |
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
1357 { sub_read_line_subrip09, NULL, "subrip 0.9" }, |
12138
eb3ad04675e1
MPL2 subreader, patch by Cezary Jackiewicz (cjackiewicz@poczta.onet.pl)
alex
parents:
12136
diff
changeset
|
1358 { sub_read_line_jacosub, NULL, "jacosub" }, |
eb3ad04675e1
MPL2 subreader, patch by Cezary Jackiewicz (cjackiewicz@poczta.onet.pl)
alex
parents:
12136
diff
changeset
|
1359 { sub_read_line_mpl2, NULL, "mpl2" } |
258 | 1360 }; |
9009
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
1361 struct subreader *srp; |
29251 | 1362 |
2915 | 1363 if(filename==NULL) return NULL; //qnx segfault |
18703
c1ac0d17b6a2
fix uninitialized pointer value being passed to open_stream, where it is used in comparison.
gpoirier
parents:
18550
diff
changeset
|
1364 i = 0; |
23431
af3ae78477b3
Revert r23443, it breaks compilation without libass.
eugeni
parents:
23425
diff
changeset
|
1365 fd=open_stream (filename, NULL, &i); if (!fd) return NULL; |
29251 | 1366 |
10353
ee46cdf03028
small correction of sub_utf8 restoring between reading sub files
atlka
parents:
10340
diff
changeset
|
1367 sub_format=sub_autodetect (fd, &uses_time); |
ee46cdf03028
small correction of sub_utf8 restoring between reading sub files
atlka
parents:
10340
diff
changeset
|
1368 mpsub_multiplier = (uses_time ? 100.0 : 1.0); |
ee46cdf03028
small correction of sub_utf8 restoring between reading sub files
atlka
parents:
10340
diff
changeset
|
1369 if (sub_format==SUB_INVALID) {mp_msg(MSGT_SUBREADER,MSGL_WARN,"SUB: Could not determine file format\n");return NULL;} |
ee46cdf03028
small correction of sub_utf8 restoring between reading sub files
atlka
parents:
10340
diff
changeset
|
1370 srp=sr+sub_format; |
29132 | 1371 mp_msg(MSGT_SUBREADER, MSGL_V, "SUB: Detected subtitle file format: %s\n", srp->name); |
29251 | 1372 |
17884 | 1373 stream_reset(fd); |
17879 | 1374 stream_seek(fd,0); |
10353
ee46cdf03028
small correction of sub_utf8 restoring between reading sub files
atlka
parents:
10340
diff
changeset
|
1375 |
27393 | 1376 #ifdef CONFIG_ICONV |
10353
ee46cdf03028
small correction of sub_utf8 restoring between reading sub files
atlka
parents:
10340
diff
changeset
|
1377 sub_utf8_prev=sub_utf8; |
23431
af3ae78477b3
Revert r23443, it breaks compilation without libass.
eugeni
parents:
23425
diff
changeset
|
1378 { |
af3ae78477b3
Revert r23443, it breaks compilation without libass.
eugeni
parents:
23425
diff
changeset
|
1379 int l,k; |
af3ae78477b3
Revert r23443, it breaks compilation without libass.
eugeni
parents:
23425
diff
changeset
|
1380 k = -1; |
af3ae78477b3
Revert r23443, it breaks compilation without libass.
eugeni
parents:
23425
diff
changeset
|
1381 if ((l=strlen(filename))>4){ |
af3ae78477b3
Revert r23443, it breaks compilation without libass.
eugeni
parents:
23425
diff
changeset
|
1382 char *exts[] = {".utf", ".utf8", ".utf-8" }; |
af3ae78477b3
Revert r23443, it breaks compilation without libass.
eugeni
parents:
23425
diff
changeset
|
1383 for (k=3;--k>=0;) |
af3ae78477b3
Revert r23443, it breaks compilation without libass.
eugeni
parents:
23425
diff
changeset
|
1384 if (l >= strlen(exts[k]) && !strcasecmp(filename+(l - strlen(exts[k])), exts[k])){ |
af3ae78477b3
Revert r23443, it breaks compilation without libass.
eugeni
parents:
23425
diff
changeset
|
1385 sub_utf8 = 1; |
af3ae78477b3
Revert r23443, it breaks compilation without libass.
eugeni
parents:
23425
diff
changeset
|
1386 break; |
af3ae78477b3
Revert r23443, it breaks compilation without libass.
eugeni
parents:
23425
diff
changeset
|
1387 } |
af3ae78477b3
Revert r23443, it breaks compilation without libass.
eugeni
parents:
23425
diff
changeset
|
1388 } |
af3ae78477b3
Revert r23443, it breaks compilation without libass.
eugeni
parents:
23425
diff
changeset
|
1389 if (k<0) subcp_open(fd); |
af3ae78477b3
Revert r23443, it breaks compilation without libass.
eugeni
parents:
23425
diff
changeset
|
1390 } |
af3ae78477b3
Revert r23443, it breaks compilation without libass.
eugeni
parents:
23425
diff
changeset
|
1391 #endif |
2151
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1392 |
258 | 1393 sub_num=0;n_max=32; |
18869 | 1394 first=malloc(n_max*sizeof(subtitle)); |
10354 | 1395 if(!first){ |
27393 | 1396 #ifdef CONFIG_ICONV |
23431
af3ae78477b3
Revert r23443, it breaks compilation without libass.
eugeni
parents:
23425
diff
changeset
|
1397 subcp_close(); |
af3ae78477b3
Revert r23443, it breaks compilation without libass.
eugeni
parents:
23425
diff
changeset
|
1398 sub_utf8=sub_utf8_prev; |
af3ae78477b3
Revert r23443, it breaks compilation without libass.
eugeni
parents:
23425
diff
changeset
|
1399 #endif |
10354 | 1400 return NULL; |
1401 } | |
29251 | 1402 |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
26889
diff
changeset
|
1403 #ifdef CONFIG_SORTSUB |
18869 | 1404 sub = malloc(sizeof(subtitle)); |
8362
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1405 //This is to deal with those formats (AQT & Subrip) which define the end of a subtitle |
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1406 //as the beginning of the following |
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1407 previous_sub_end = 0; |
29251 | 1408 #endif |
258 | 1409 while(1){ |
1410 if(sub_num>=n_max){ | |
1411 n_max+=16; | |
1412 first=realloc(first,n_max*sizeof(subtitle)); | |
1413 } | |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
26889
diff
changeset
|
1414 #ifndef CONFIG_SORTSUB |
4064
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1415 sub = &first[sub_num]; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29251
diff
changeset
|
1416 #endif |
4064
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1417 memset(sub, '\0', sizeof(subtitle)); |
9009
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
1418 sub=srp->read(fd,sub); |
258 | 1419 if(!sub) break; // EOF |
27393 | 1420 #ifdef CONFIG_ICONV |
23431
af3ae78477b3
Revert r23443, it breaks compilation without libass.
eugeni
parents:
23425
diff
changeset
|
1421 if ((sub!=ERR) && (sub_utf8 & 2)) sub=subcp_recode(sub); |
af3ae78477b3
Revert r23443, it breaks compilation without libass.
eugeni
parents:
23425
diff
changeset
|
1422 #endif |
27393 | 1423 #ifdef CONFIG_FRIBIDI |
29908
0ebce433be9e
Make fribidi (i.e. right-to-left) support work with embedded subtitles.
reimar
parents:
29895
diff
changeset
|
1424 if (sub!=ERR) sub=sub_fribidi(sub,sub_utf8,0); |
9635
cc20a6dc9bc3
hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
9322
diff
changeset
|
1425 #endif |
9056 | 1426 if ( sub == ERR ) |
1427 { | |
27393 | 1428 #ifdef CONFIG_ICONV |
23431
af3ae78477b3
Revert r23443, it breaks compilation without libass.
eugeni
parents:
23425
diff
changeset
|
1429 subcp_close(); |
af3ae78477b3
Revert r23443, it breaks compilation without libass.
eugeni
parents:
23425
diff
changeset
|
1430 #endif |
9056 | 1431 if ( first ) free(first); |
29251 | 1432 return NULL; |
9056 | 1433 } |
9009
f2d4324561b2
1) Removed the code to remove {} from sub_read_line_ssa
arpi
parents:
8940
diff
changeset
|
1434 // Apply any post processing that needs recoding first |
9126
7a06258271d6
Add a command line option (-sub-no-text-pp) to disable subtitles
arpi
parents:
9056
diff
changeset
|
1435 if ((sub!=ERR) && !sub_no_text_pp && srp->post) srp->post(sub); |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
26889
diff
changeset
|
1436 #ifdef CONFIG_SORTSUB |
8362
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1437 if(!sub_num || (first[sub_num - 1].start <= sub->start)){ |
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1438 first[sub_num].start = sub->start; |
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1439 first[sub_num].end = sub->end; |
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1440 first[sub_num].lines = sub->lines; |
10916
c36db88bfbc4
Subtitle alignment & smart splitting by Salvatore Falco
henry
parents:
10801
diff
changeset
|
1441 first[sub_num].alignment = sub->alignment; |
8362
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1442 for(i = 0; i < sub->lines; ++i){ |
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1443 first[sub_num].text[i] = sub->text[i]; |
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1444 } |
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1445 if (previous_sub_end){ |
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1446 first[sub_num - 1].end = previous_sub_end; |
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1447 previous_sub_end = 0; |
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1448 } |
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1449 } else { |
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1450 for(j = sub_num - 1; j >= 0; --j){ |
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1451 first[j + 1].start = first[j].start; |
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1452 first[j + 1].end = first[j].end; |
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1453 first[j + 1].lines = first[j].lines; |
10916
c36db88bfbc4
Subtitle alignment & smart splitting by Salvatore Falco
henry
parents:
10801
diff
changeset
|
1454 first[j + 1].alignment = first[j].alignment; |
8362
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1455 for(i = 0; i < first[j].lines; ++i){ |
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1456 first[j + 1].text[i] = first[j].text[i]; |
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1457 } |
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1458 if(!j || (first[j - 1].start <= sub->start)){ |
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1459 first[j].start = sub->start; |
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1460 first[j].end = sub->end; |
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1461 first[j].lines = sub->lines; |
10916
c36db88bfbc4
Subtitle alignment & smart splitting by Salvatore Falco
henry
parents:
10801
diff
changeset
|
1462 first[j].alignment = sub->alignment; |
8362
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1463 for(i = 0; i < SUB_MAX_TEXT; ++i){ |
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1464 first[j].text[i] = sub->text[i]; |
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1465 } |
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1466 if (previous_sub_end){ |
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1467 first[j].end = first[j - 1].end; |
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1468 first[j - 1].end = previous_sub_end; |
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1469 previous_sub_end = 0; |
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1470 } |
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1471 break; |
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1472 } |
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1473 } |
b5478134c853
optional (compile-time switch) subtitles-sorting feature
arpi
parents:
8361
diff
changeset
|
1474 } |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29251
diff
changeset
|
1475 #endif |
258 | 1476 if(sub==ERR) ++sub_errs; else ++sub_num; // Error vs. Valid |
1477 } | |
29251 | 1478 |
17879 | 1479 free_stream(fd); |
23431
af3ae78477b3
Revert r23443, it breaks compilation without libass.
eugeni
parents:
23425
diff
changeset
|
1480 |
27393 | 1481 #ifdef CONFIG_ICONV |
23431
af3ae78477b3
Revert r23443, it breaks compilation without libass.
eugeni
parents:
23425
diff
changeset
|
1482 subcp_close(); |
af3ae78477b3
Revert r23443, it breaks compilation without libass.
eugeni
parents:
23425
diff
changeset
|
1483 #endif |
2151
a9d91476085a
modifications to use iconv(3) function to recode text of subs (autodetect)
atlka
parents:
2141
diff
changeset
|
1484 |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1485 // printf ("SUB: Subtitle format %s time.\n", uses_time?"uses":"doesn't use"); |
29132 | 1486 mp_msg(MSGT_SUBREADER, MSGL_V,"SUB: Read %i subtitles, %i bad line(s).\n", |
1487 sub_num, sub_errs); | |
258 | 1488 |
2880 | 1489 if(sub_num<=0){ |
1490 free(first); | |
1491 return NULL; | |
1492 } | |
1493 | |
8882
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1494 // we do overlap if the user forced it (suboverlap_enable == 2) or |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1495 // the user didn't forced no-overlapsub and the format is Jacosub or Ssa. |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1496 // this is because usually overlapping subtitles are found in these formats, |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1497 // while in others they are probably result of bad timing |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1498 if ((suboverlap_enabled == 2) || |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1499 ((suboverlap_enabled) && ((sub_format == SUB_JACOSUB) || (sub_format == SUB_SSA)))) { |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1500 adjust_subs_time(first, 6.0, fps, 0, sub_num, uses_time);/*~6 secs AST*/ |
7983
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1501 // here we manage overlapping subtitles |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1502 sub_orig = sub_num; |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1503 n_first = sub_num; |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1504 sub_num = 0; |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1505 second = NULL; |
8882
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1506 // for each subtitle in first[] we deal with its 'block' of |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1507 // bonded subtitles |
7983
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1508 for (sub_first = 0; sub_first < n_first; ++sub_first) { |
8882
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1509 unsigned long global_start = first[sub_first].start, |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1510 global_end = first[sub_first].end, local_start, local_end; |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1511 int lines_to_add = first[sub_first].lines, sub_to_add = 0, |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1512 **placeholder = NULL, higher_line = 0, counter, start_block_sub = sub_num; |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1513 char real_block = 1; |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1514 |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1515 // here we find the number of subtitles inside the 'block' |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1516 // and its span interval. this works well only with sorted |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1517 // subtitles |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1518 while ((sub_first + sub_to_add + 1 < n_first) && (first[sub_first + sub_to_add + 1].start < global_end)) { |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1519 ++sub_to_add; |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1520 lines_to_add += first[sub_first + sub_to_add].lines; |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1521 if (first[sub_first + sub_to_add].start < global_start) { |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1522 global_start = first[sub_first + sub_to_add].start; |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1523 } |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1524 if (first[sub_first + sub_to_add].end > global_end) { |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1525 global_end = first[sub_first + sub_to_add].end; |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1526 } |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1527 } |
7983
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1528 |
8882
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1529 // we need a structure to keep trace of the screen lines |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1530 // used by the subs, a 'placeholder' |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1531 counter = 2 * sub_to_add + 1; // the maximum number of subs derived |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1532 // from a block of sub_to_add+1 subs |
18869 | 1533 placeholder = malloc(sizeof(int *) * counter); |
8882
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1534 for (i = 0; i < counter; ++i) { |
18869 | 1535 placeholder[i] = malloc(sizeof(int) * lines_to_add); |
8882
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1536 for (j = 0; j < lines_to_add; ++j) { |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1537 placeholder[i][j] = -1; |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1538 } |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1539 } |
7983
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1540 |
8882
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1541 counter = 0; |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1542 local_end = global_start - 1; |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1543 do { |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1544 int ls; |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1545 |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1546 // here we find the beginning and the end of a new |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1547 // subtitle in the block |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1548 local_start = local_end + 1; |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1549 local_end = global_end; |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1550 for (j = 0; j <= sub_to_add; ++j) { |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1551 if ((first[sub_first + j].start - 1 > local_start) && (first[sub_first + j].start - 1 < local_end)) { |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1552 local_end = first[sub_first + j].start - 1; |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1553 } else if ((first[sub_first + j].end > local_start) && (first[sub_first + j].end < local_end)) { |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1554 local_end = first[sub_first + j].end; |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1555 } |
7983
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1556 } |
8882
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1557 // here we allocate the screen lines to subs we must |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1558 // display in current local_start-local_end interval. |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1559 // if the subs were yet presents in the previous interval |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1560 // they keep the same lines, otherside they get unused lines |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1561 for (j = 0; j <= sub_to_add; ++j) { |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1562 if ((first[sub_first + j].start <= local_end) && (first[sub_first + j].end > local_start)) { |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1563 unsigned long sub_lines = first[sub_first + j].lines, fragment_length = lines_to_add + 1, |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1564 tmp = 0; |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1565 char boolean = 0; |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1566 int fragment_position = -1; |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1567 |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1568 // if this is not the first new sub of the block |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1569 // we find if this sub was present in the previous |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1570 // new sub |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1571 if (counter) |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1572 for (i = 0; i < lines_to_add; ++i) { |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1573 if (placeholder[counter - 1][i] == sub_first + j) { |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1574 placeholder[counter][i] = sub_first + j; |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1575 boolean = 1; |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1576 } |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1577 } |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1578 if (boolean) |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1579 continue; |
7983
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1580 |
8882
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1581 // we are looking for the shortest among all groups of |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1582 // sequential blank lines whose length is greater than or |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1583 // equal to sub_lines. we store in fragment_position the |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1584 // position of the shortest group, in fragment_length its |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1585 // length, and in tmp the length of the group currently |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1586 // examinated |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1587 for (i = 0; i < lines_to_add; ++i) { |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1588 if (placeholder[counter][i] == -1) { |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1589 // placeholder[counter][i] is part of the current group |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1590 // of blank lines |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1591 ++tmp; |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1592 } else { |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1593 if (tmp == sub_lines) { |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1594 // current group's size fits exactly the one we |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1595 // need, so we stop looking |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1596 fragment_position = i - tmp; |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1597 tmp = 0; |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1598 break; |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1599 } |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1600 if ((tmp) && (tmp > sub_lines) && (tmp < fragment_length)) { |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1601 // current group is the best we found till here, |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1602 // but is still bigger than the one we are looking |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1603 // for, so we keep on looking |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1604 fragment_length = tmp; |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1605 fragment_position = i - tmp; |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1606 tmp = 0; |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1607 } else { |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1608 // current group doesn't fit at all, so we forget it |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1609 tmp = 0; |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1610 } |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1611 } |
7983
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1612 } |
8882
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1613 if (tmp) { |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1614 // last screen line is blank, a group ends with it |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1615 if ((tmp >= sub_lines) && (tmp < fragment_length)) { |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1616 fragment_position = i - tmp; |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1617 } |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1618 } |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1619 if (fragment_position == -1) { |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1620 // it was not possible to find free screen line(s) for a subtitle, |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1621 // usually this means a bug in the code; however we do not overlap |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1622 mp_msg(MSGT_SUBREADER, MSGL_WARN, "SUB: we could not find a suitable position for an overlapping subtitle\n"); |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1623 higher_line = SUB_MAX_TEXT + 1; |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1624 break; |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1625 } else { |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1626 for (tmp = 0; tmp < sub_lines; ++tmp) { |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1627 placeholder[counter][fragment_position + tmp] = sub_first + j; |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1628 } |
7983
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1629 } |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1630 } |
8882
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1631 } |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1632 for (j = higher_line + 1; j < lines_to_add; ++j) { |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1633 if (placeholder[counter][j] != -1) |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1634 higher_line = j; |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1635 else |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1636 break; |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1637 } |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1638 if (higher_line >= SUB_MAX_TEXT) { |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1639 // the 'block' has too much lines, so we don't overlap the |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1640 // subtitles |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1641 second = (subtitle *) realloc(second, (sub_num + sub_to_add + 1) * sizeof(subtitle)); |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1642 for (j = 0; j <= sub_to_add; ++j) { |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1643 int ls; |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1644 memset(&second[sub_num + j], '\0', sizeof(subtitle)); |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1645 second[sub_num + j].start = first[sub_first + j].start; |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1646 second[sub_num + j].end = first[sub_first + j].end; |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1647 second[sub_num + j].lines = first[sub_first + j].lines; |
10916
c36db88bfbc4
Subtitle alignment & smart splitting by Salvatore Falco
henry
parents:
10801
diff
changeset
|
1648 second[sub_num + j].alignment = first[sub_first + j].alignment; |
8882
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1649 for (ls = 0; ls < second[sub_num + j].lines; ls++) { |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1650 second[sub_num + j].text[ls] = strdup(first[sub_first + j].text[ls]); |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1651 } |
7983
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1652 } |
8882
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1653 sub_num += sub_to_add + 1; |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1654 sub_first += sub_to_add; |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1655 real_block = 0; |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1656 break; |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1657 } |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1658 |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1659 // we read the placeholder structure and create the new |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1660 // subs. |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1661 second = (subtitle *) realloc(second, (sub_num + 1) * sizeof(subtitle)); |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1662 memset(&second[sub_num], '\0', sizeof(subtitle)); |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1663 second[sub_num].start = local_start; |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1664 second[sub_num].end = local_end; |
13343
1a4b6e575484
This time is a patch to improve subtitle alignment management. It
faust3
parents:
13229
diff
changeset
|
1665 second[sub_num].alignment = first[sub_first].alignment; |
8882
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1666 n_max = (lines_to_add < SUB_MAX_TEXT) ? lines_to_add : SUB_MAX_TEXT; |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1667 for (i = 0, j = 0; j < n_max; ++j) { |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1668 if (placeholder[counter][j] != -1) { |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1669 int lines = first[placeholder[counter][j]].lines; |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1670 for (ls = 0; ls < lines; ++ls) { |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1671 second[sub_num].text[i++] = strdup(first[placeholder[counter][j]].text[ls]); |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1672 } |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1673 j += lines - 1; |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1674 } else { |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1675 second[sub_num].text[i++] = strdup(" "); |
7983
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1676 } |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1677 } |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1678 ++sub_num; |
8882
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1679 ++counter; |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1680 } while (local_end < global_end); |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1681 if (real_block) |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1682 for (i = 0; i < counter; ++i) |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1683 second[start_block_sub + i].lines = higher_line + 1; |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1684 |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1685 counter = 2 * sub_to_add + 1; |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1686 for (i = 0; i < counter; ++i) { |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1687 free(placeholder[i]); |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1688 } |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1689 free(placeholder); |
1c44c46ed57f
Overlapping subs are a feature mainly present in subtitling
arpi
parents:
8862
diff
changeset
|
1690 sub_first += sub_to_add; |
7983
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1691 } |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1692 |
8734 | 1693 for (j = sub_orig - 1; j >= 0; --j) { |
1694 for (i = first[j].lines - 1; i >= 0; --i) { | |
7983
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1695 free(first[j].text[i]); |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1696 } |
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1697 } |
8785 | 1698 free(first); |
7983
8344414c59cf
This patch is to add support for overlapping subtitles, that is
arpi
parents:
7982
diff
changeset
|
1699 |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1700 return_sub = second; |
8361
2202c00001e3
overlapping subtitles support is now optional, can be disabled (-nooverlapsub)
arpi
parents:
8360
diff
changeset
|
1701 } else { //if(suboverlap_enabled) |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1702 adjust_subs_time(first, 6.0, fps, 1, sub_num, uses_time);/*~6 secs AST*/ |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1703 return_sub = first; |
8361
2202c00001e3
overlapping subtitles support is now optional, can be disabled (-nooverlapsub)
arpi
parents:
8360
diff
changeset
|
1704 } |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1705 if (return_sub == NULL) return NULL; |
18869 | 1706 subt_data = malloc(sizeof(sub_data)); |
15603
2d1ad16b6021
strdup subtitle filename at a more appropriate place, fixing memleaks and
reimar
parents:
15562
diff
changeset
|
1707 subt_data->filename = strdup(filename); |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1708 subt_data->sub_uses_time = uses_time; |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1709 subt_data->sub_num = sub_num; |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1710 subt_data->sub_errs = sub_errs; |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1711 subt_data->subtitles = return_sub; |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1712 return subt_data; |
258 | 1713 } |
1714 | |
892 | 1715 #if 0 |
509 | 1716 char * strreplace( char * in,char * what,char * whereof ) |
1717 { | |
1718 int i; | |
1719 char * tmp; | |
29251 | 1720 |
509 | 1721 if ( ( in == NULL )||( what == NULL )||( whereof == NULL )||( ( tmp=strstr( in,what ) ) == NULL ) ) return NULL; |
1722 for( i=0;i<strlen( whereof );i++ ) tmp[i]=whereof[i]; | |
1723 if ( strlen( what ) > strlen( whereof ) ) tmp[i]=0; | |
1724 return in; | |
1725 } | |
892 | 1726 #endif |
509 | 1727 |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1728 |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1729 static void strcpy_trim(char *d, char *s) |
509 | 1730 { |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1731 // skip leading whitespace |
30216
30ac5dc10c44
Use !isspace() to replace isalnum() to avoid filename mismatch under MBCS
zuxy
parents:
29920
diff
changeset
|
1732 while (*s && isspace(*s)) { |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1733 s++; |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1734 } |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1735 for (;;) { |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1736 // copy word |
30216
30ac5dc10c44
Use !isspace() to replace isalnum() to avoid filename mismatch under MBCS
zuxy
parents:
29920
diff
changeset
|
1737 while (*s && !isspace(*s)) { |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1738 *d = tolower(*s); |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1739 s++; d++; |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1740 } |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1741 if (*s == 0) break; |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1742 // trim excess whitespace |
30216
30ac5dc10c44
Use !isspace() to replace isalnum() to avoid filename mismatch under MBCS
zuxy
parents:
29920
diff
changeset
|
1743 while (*s && isspace(*s)) { |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1744 s++; |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1745 } |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1746 if (*s == 0) break; |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1747 *d++ = ' '; |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1748 } |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1749 *d = 0; |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1750 } |
29251 | 1751 |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1752 static void strcpy_strip_ext(char *d, char *s) |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1753 { |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1754 char *tmp = strrchr(s,'.'); |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1755 if (!tmp) { |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1756 strcpy(d, s); |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1757 return; |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1758 } else { |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1759 strncpy(d, s, tmp-s); |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1760 d[tmp-s] = 0; |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1761 } |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1762 while (*d) { |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1763 *d = tolower(*d); |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1764 d++; |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1765 } |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1766 } |
29251 | 1767 |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1768 static void strcpy_get_ext(char *d, char *s) |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1769 { |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1770 char *tmp = strrchr(s,'.'); |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1771 if (!tmp) { |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1772 strcpy(d, ""); |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1773 return; |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1774 } else { |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1775 strcpy(d, tmp+1); |
892 | 1776 } |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1777 } |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1778 |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1779 static int whiteonly(char *s) |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1780 { |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1781 while (*s) { |
30216
30ac5dc10c44
Use !isspace() to replace isalnum() to avoid filename mismatch under MBCS
zuxy
parents:
29920
diff
changeset
|
1782 if (!isspace(*s)) return 0; |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1783 s++; |
509 | 1784 } |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1785 return 1; |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1786 } |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1787 |
25607
9d0b189ce1b2
Fix illegal identifiers: Names starting with __ or _ and uppercase are reserved
diego
parents:
25470
diff
changeset
|
1788 typedef struct subfn |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1789 { |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1790 int priority; |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1791 char *fname; |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1792 } subfn; |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1793 |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1794 static int compare_sub_priority(const void *a, const void *b) |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1795 { |
19198
b137cea2650e
corrects some casts that previously discarded the const qualifier. Patch by Stefan Huehner, stefan AT Huehner-org
reynaldo
parents:
19066
diff
changeset
|
1796 if (((const subfn*)a)->priority > ((const subfn*)b)->priority) { |
9895 | 1797 return -1; |
19198
b137cea2650e
corrects some casts that previously discarded the const qualifier. Patch by Stefan Huehner, stefan AT Huehner-org
reynaldo
parents:
19066
diff
changeset
|
1798 } else if (((const subfn*)a)->priority < ((const subfn*)b)->priority) { |
9895 | 1799 return 1; |
1800 } else { | |
19198
b137cea2650e
corrects some casts that previously discarded the const qualifier. Patch by Stefan Huehner, stefan AT Huehner-org
reynaldo
parents:
19066
diff
changeset
|
1801 return strcoll(((const subfn*)a)->fname, ((const subfn*)b)->fname); |
9895 | 1802 } |
509 | 1803 } |
1804 | |
18980
ed69754aa58d
Marks several string parameters as const when they are not modified in the function, Patch by Stefan Huehner, stefan AT huehner-org
reynaldo
parents:
18936
diff
changeset
|
1805 char** sub_filenames(const char* path, char *fname) |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1806 { |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1807 char *f_dir, *f_fname, *f_fname_noext, *f_fname_trim, *tmp, *tmp_sub_id; |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1808 char *tmp_fname_noext, *tmp_fname_trim, *tmp_fname_ext, *tmpresult; |
29251 | 1809 |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1810 int len, pos, found, i, j; |
10801
6c56b4aff706
Jacosub files can have the extension '.js' too. Patch by Vladimir Mosgalin <mosgalin@VM10124.spb.edu>
alex
parents:
10692
diff
changeset
|
1811 char * sub_exts[] = { "utf", "utf8", "utf-8", "sub", "srt", "smi", "rt", "txt", "ssa", "aqt", "jss", "js", "ass", NULL}; |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1812 subfn *result; |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1813 char **result2; |
29251 | 1814 |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1815 int subcnt; |
29251 | 1816 |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1817 FILE *f; |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1818 |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1819 DIR *d; |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1820 struct dirent *de; |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1821 |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1822 len = (strlen(fname) > 256 ? strlen(fname) : 256) |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1823 +(strlen(path) > 256 ? strlen(path) : 256)+2; |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1824 |
18869 | 1825 f_dir = malloc(len); |
1826 f_fname = malloc(len); | |
1827 f_fname_noext = malloc(len); | |
1828 f_fname_trim = malloc(len); | |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1829 |
18869 | 1830 tmp_fname_noext = malloc(len); |
1831 tmp_fname_trim = malloc(len); | |
1832 tmp_fname_ext = malloc(len); | |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1833 |
18869 | 1834 tmpresult = malloc(len); |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1835 |
18869 | 1836 result = malloc(sizeof(subfn)*MAX_SUBTITLE_FILES); |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1837 memset(result, 0, sizeof(subfn)*MAX_SUBTITLE_FILES); |
29251 | 1838 |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1839 subcnt = 0; |
29251 | 1840 |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1841 tmp = strrchr(fname,'/'); |
27727
48c1ae64255b
Replace preprocessor check for WIN32 with checks for __MINGW32__ and __CYGWIN__.
diego
parents:
27393
diff
changeset
|
1842 #if defined(__MINGW32__) || defined(__CYGWIN__) || defined(__OS2__) |
11062 | 1843 if(!tmp)tmp = strrchr(fname,'\\'); |
26055
d8e46fa37615
On Win32 and OS/2, 'x:filename' path style without '\' path separator
diego
parents:
25607
diff
changeset
|
1844 if(!tmp)tmp = strrchr(fname,':'); |
11062 | 1845 #endif |
29251 | 1846 |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1847 // extract filename & dirname from fname |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1848 if (tmp) { |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1849 strcpy(f_fname, tmp+1); |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1850 pos = tmp - fname; |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1851 strncpy(f_dir, fname, pos+1); |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1852 f_dir[pos+1] = 0; |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1853 } else { |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1854 strcpy(f_fname, fname); |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1855 strcpy(f_dir, "./"); |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1856 } |
29251 | 1857 |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1858 strcpy_strip_ext(f_fname_noext, f_fname); |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1859 strcpy_trim(f_fname_trim, f_fname_noext); |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1860 |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1861 tmp_sub_id = NULL; |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1862 if (dvdsub_lang && !whiteonly(dvdsub_lang)) { |
18869 | 1863 tmp_sub_id = malloc(strlen(dvdsub_lang)+1); |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1864 strcpy_trim(tmp_sub_id, dvdsub_lang); |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1865 } |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1866 |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1867 // 0 = nothing |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1868 // 1 = any subtitle file |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1869 // 2 = any sub file containing movie name |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1870 // 3 = sub file containing movie name and the lang extension |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1871 for (j = 0; j <= 1; j++) { |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1872 d = opendir(j == 0 ? f_dir : path); |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1873 if (d) { |
10236 | 1874 while ((de = readdir(d))) { |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1875 // retrieve various parts of the filename |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1876 strcpy_strip_ext(tmp_fname_noext, de->d_name); |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1877 strcpy_get_ext(tmp_fname_ext, de->d_name); |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1878 strcpy_trim(tmp_fname_trim, tmp_fname_noext); |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1879 |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1880 // does it end with a subtitle extension? |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1881 found = 0; |
27393 | 1882 #ifdef CONFIG_ICONV |
1883 #ifdef CONFIG_ENCA | |
12443 | 1884 for (i = ((sub_cp && strncasecmp(sub_cp, "enca", 4) != 0) ? 3 : 0); sub_exts[i]; i++) { |
1885 #else | |
10340
2eaabacd1429
prefer UTF-8 encoding subs and automatically recognize them by suffix
atlka
parents:
10336
diff
changeset
|
1886 for (i = (sub_cp ? 3 : 0); sub_exts[i]; i++) { |
12443 | 1887 #endif |
9872 | 1888 #else |
1889 for (i = 0; sub_exts[i]; i++) { | |
1890 #endif | |
13229
b1e482fcd919
subtitle autodetection regardles of case (bug #65), patches Michal Svec <rebel at atrey.karlin.mff.cuni.cz> and Reynaldo H. Verdejo Pinochet <reynaldo at opendot.cl>
faust3
parents:
12909
diff
changeset
|
1891 if (strcasecmp(sub_exts[i], tmp_fname_ext) == 0) { |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1892 found = 1; |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1893 break; |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1894 } |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1895 } |
29251 | 1896 |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1897 // we have a (likely) subtitle file |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1898 if (found) { |
9895 | 1899 int prio = 0; |
10551 | 1900 if (!prio && tmp_sub_id) |
10486
f3540688a9ec
fix against dummy solaris sprintf, bug reported by Gotz Waschk
alex
parents:
10450
diff
changeset
|
1901 { |
10551 | 1902 sprintf(tmpresult, "%s %s", f_fname_trim, tmp_sub_id); |
18212
996db4c000d7
Part 4 of otvos attila's oattila AT chello-hu mp_msg changes, no modifications this time
reynaldo
parents:
18045
diff
changeset
|
1903 mp_msg(MSGT_SUBREADER,MSGL_INFO,"dvdsublang...%s\n", tmpresult); |
10551 | 1904 if (strcmp(tmp_fname_trim, tmpresult) == 0 && sub_match_fuzziness >= 1) { |
1905 // matches the movie name + lang extension | |
1906 prio = 5; | |
29251 | 1907 } |
10551 | 1908 } |
1909 if (!prio && strcmp(tmp_fname_trim, f_fname_trim) == 0) { | |
9895 | 1910 // matches the movie name |
1911 prio = 4; | |
10551 | 1912 } |
1913 if (!prio && (tmp = strstr(tmp_fname_trim, f_fname_trim)) && (sub_match_fuzziness >= 1)) { | |
9895 | 1914 // contains the movie name |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1915 tmp += strlen(f_fname_trim); |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1916 if (tmp_sub_id && strstr(tmp, tmp_sub_id)) { |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1917 // with sub_id specified prefer localized subtitles |
9895 | 1918 prio = 3; |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1919 } else if ((tmp_sub_id == NULL) && whiteonly(tmp)) { |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1920 // without sub_id prefer "plain" name |
9895 | 1921 prio = 3; |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1922 } else { |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1923 // with no localized subs found, try any else instead |
9895 | 1924 prio = 2; |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1925 } |
10551 | 1926 } |
1927 if (!prio) { | |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1928 // doesn't contain the movie name |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1929 // don't try in the mplayer subtitle directory |
9893 | 1930 if ((j == 0) && (sub_match_fuzziness >= 2)) { |
9895 | 1931 prio = 1; |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1932 } |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1933 } |
9895 | 1934 |
1935 if (prio) { | |
10340
2eaabacd1429
prefer UTF-8 encoding subs and automatically recognize them by suffix
atlka
parents:
10336
diff
changeset
|
1936 prio += prio; |
27393 | 1937 #ifdef CONFIG_ICONV |
10932 | 1938 if (i<3){ // prefer UTF-8 coded |
10340
2eaabacd1429
prefer UTF-8 encoding subs and automatically recognize them by suffix
atlka
parents:
10336
diff
changeset
|
1939 prio++; |
10929 | 1940 } |
10494
db0bc96da95f
1, micro-speedup 2, fixed 10l: only prefer utf8 if iconv is present
alex
parents:
10486
diff
changeset
|
1941 #endif |
10336 | 1942 sprintf(tmpresult, "%s%s", j == 0 ? f_dir : path, de->d_name); |
9895 | 1943 // fprintf(stderr, "%s priority %d\n", tmpresult, prio); |
1944 if ((f = fopen(tmpresult, "rt"))) { | |
1945 fclose(f); | |
1946 result[subcnt].priority = prio; | |
1947 result[subcnt].fname = strdup(tmpresult); | |
1948 subcnt++; | |
1949 } | |
1950 } | |
1951 | |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1952 } |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1953 if (subcnt >= MAX_SUBTITLE_FILES) break; |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1954 } |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1955 closedir(d); |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1956 } |
29251 | 1957 |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1958 } |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1959 |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1960 if (tmp_sub_id) free(tmp_sub_id); |
29251 | 1961 |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1962 free(f_dir); |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1963 free(f_fname); |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1964 free(f_fname_noext); |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1965 free(f_fname_trim); |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1966 |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1967 free(tmp_fname_noext); |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1968 free(tmp_fname_trim); |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1969 free(tmp_fname_ext); |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1970 |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1971 free(tmpresult); |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1972 |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1973 qsort(result, subcnt, sizeof(subfn), compare_sub_priority); |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1974 |
18869 | 1975 result2 = malloc(sizeof(char*)*(subcnt+1)); |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1976 memset(result2, 0, sizeof(char*)*(subcnt+1)); |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1977 |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1978 for (i = 0; i < subcnt; i++) { |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1979 result2[i] = result[i].fname; |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1980 } |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1981 result2[subcnt] = NULL; |
29251 | 1982 |
10220 | 1983 free(result); |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1984 |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1985 return result2; |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1986 } |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1987 |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1988 void list_sub_file(sub_data* subd){ |
1761 | 1989 int i,j; |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1990 subtitle *subs = subd->subtitles; |
1761 | 1991 |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
1992 for(j=0; j < subd->sub_num; j++){ |
1761 | 1993 subtitle* egysub=&subs[j]; |
18212
996db4c000d7
Part 4 of otvos attila's oattila AT chello-hu mp_msg changes, no modifications this time
reynaldo
parents:
18045
diff
changeset
|
1994 mp_msg(MSGT_SUBREADER,MSGL_INFO,"%i line%c (%li-%li)\n", |
1761 | 1995 egysub->lines, |
1996 (1==egysub->lines)?' ':'s', | |
1997 egysub->start, | |
1998 egysub->end); | |
1999 for (i=0; i<egysub->lines; i++) { | |
18212
996db4c000d7
Part 4 of otvos attila's oattila AT chello-hu mp_msg changes, no modifications this time
reynaldo
parents:
18045
diff
changeset
|
2000 mp_msg(MSGT_SUBREADER,MSGL_INFO,"\t\t%d: %s%s", i,egysub->text[i], i==egysub->lines-1?"":" \n "); |
1761 | 2001 } |
18212
996db4c000d7
Part 4 of otvos attila's oattila AT chello-hu mp_msg changes, no modifications this time
reynaldo
parents:
18045
diff
changeset
|
2002 mp_msg(MSGT_SUBREADER,MSGL_INFO,"\n"); |
1761 | 2003 } |
2004 | |
29251 | 2005 mp_msg(MSGT_SUBREADER,MSGL_INFO,"Subtitle format %s time.\n", |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2006 subd->sub_uses_time ? "uses":"doesn't use"); |
18212
996db4c000d7
Part 4 of otvos attila's oattila AT chello-hu mp_msg changes, no modifications this time
reynaldo
parents:
18045
diff
changeset
|
2007 mp_msg(MSGT_SUBREADER,MSGL_INFO,"Read %i subtitles, %i errors.\n", subd->sub_num, subd->sub_errs); |
1761 | 2008 } |
6208 | 2009 |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2010 void dump_srt(sub_data* subd, float fps){ |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2011 int i,j; |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2012 int h,m,s,ms; |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2013 FILE * fd; |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2014 subtitle * onesub; |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2015 unsigned long temp; |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2016 subtitle *subs = subd->subtitles; |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2017 |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2018 if (!subd->sub_uses_time && sub_fps == 0) |
6792 | 2019 sub_fps = fps; |
6208 | 2020 fd=fopen("dumpsub.srt","w"); |
2021 if(!fd) | |
29251 | 2022 { |
6208 | 2023 perror("dump_srt: fopen"); |
2024 return; | |
2025 } | |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2026 for(i=0; i < subd->sub_num; i++) |
6208 | 2027 { |
2028 onesub=subs+i; //=&subs[i]; | |
2029 fprintf(fd,"%d\n",i+1);//line number | |
2030 | |
2031 temp=onesub->start; | |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2032 if (!subd->sub_uses_time) |
6792 | 2033 temp = temp * 100 / sub_fps; |
2034 temp -= sub_delay * 100; | |
6208 | 2035 h=temp/360000;temp%=360000; //h =1*100*60*60 |
2036 m=temp/6000; temp%=6000; //m =1*100*60 | |
2037 s=temp/100; temp%=100; //s =1*100 | |
6792 | 2038 ms=temp*10; //ms=1*10 |
6208 | 2039 fprintf(fd,"%02d:%02d:%02d,%03d --> ",h,m,s,ms); |
2040 | |
2041 temp=onesub->end; | |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2042 if (!subd->sub_uses_time) |
6792 | 2043 temp = temp * 100 / sub_fps; |
2044 temp -= sub_delay * 100; | |
6208 | 2045 h=temp/360000;temp%=360000; |
2046 m=temp/6000; temp%=6000; | |
2047 s=temp/100; temp%=100; | |
6792 | 2048 ms=temp*10; |
6208 | 2049 fprintf(fd,"%02d:%02d:%02d,%03d\n",h,m,s,ms); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29251
diff
changeset
|
2050 |
6208 | 2051 for(j=0;j<onesub->lines;j++) |
2052 fprintf(fd,"%s\n",onesub->text[j]); | |
2053 | |
2054 fprintf(fd,"\n"); | |
2055 } | |
2056 fclose(fd); | |
6296 | 2057 mp_msg(MSGT_SUBREADER,MSGL_INFO,"SUB: Subtitles dumped in \'dumpsub.srt\'.\n"); |
6208 | 2058 } |
1761 | 2059 |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2060 void dump_mpsub(sub_data* subd, float fps){ |
2178 | 2061 int i,j; |
2062 FILE *fd; | |
2063 float a,b; | |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2064 subtitle *subs = subd->subtitles; |
2178 | 2065 |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2066 mpsub_position = subd->sub_uses_time? (sub_delay*100) : (sub_delay*fps); |
4886 | 2067 if (sub_fps==0) sub_fps=fps; |
2178 | 2068 |
2069 fd=fopen ("dump.mpsub", "w"); | |
2070 if (!fd) { | |
2071 perror ("dump_mpsub: fopen"); | |
2072 return; | |
2073 } | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29251
diff
changeset
|
2074 |
2178 | 2075 |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2076 if (subd->sub_uses_time) fprintf (fd,"FORMAT=TIME\n\n"); |
4064
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
2077 else fprintf (fd, "FORMAT=%5.2f\n\n", fps); |
2178 | 2078 |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2079 for(j=0; j < subd->sub_num; j++){ |
2495 | 2080 subtitle* egysub=&subs[j]; |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2081 if (subd->sub_uses_time) { |
2495 | 2082 a=((egysub->start-mpsub_position)/100.0); |
2083 b=((egysub->end-egysub->start)/100.0); | |
2084 if ( (float)((int)a) == a) | |
2085 fprintf (fd, "%.0f",a); | |
2086 else | |
2087 fprintf (fd, "%.2f",a); | |
29251 | 2088 |
2495 | 2089 if ( (float)((int)b) == b) |
2090 fprintf (fd, " %.0f\n",b); | |
2091 else | |
2092 fprintf (fd, " %.2f\n",b); | |
2093 } else { | |
4886 | 2094 fprintf (fd, "%ld %ld\n", (long)((egysub->start*(fps/sub_fps))-((mpsub_position*(fps/sub_fps)))), |
2095 (long)(((egysub->end)-(egysub->start))*(fps/sub_fps))); | |
2495 | 2096 } |
2097 | |
2098 mpsub_position = egysub->end; | |
2099 for (i=0; i<egysub->lines; i++) { | |
2100 fprintf (fd, "%s\n",egysub->text[i]); | |
2101 } | |
2102 fprintf (fd, "\n"); | |
2178 | 2103 } |
2104 fclose (fd); | |
6296 | 2105 mp_msg(MSGT_SUBREADER,MSGL_INFO,"SUB: Subtitles dumped in \'dump.mpsub\'.\n"); |
2178 | 2106 } |
2107 | |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2108 void dump_microdvd(sub_data* subd, float fps) { |
7460 | 2109 int i, delay; |
2110 FILE *fd; | |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2111 subtitle *subs = subd->subtitles; |
7460 | 2112 if (sub_fps == 0) |
2113 sub_fps = fps; | |
18045
452996e2628c
Acording to manpage -dumpmicrodvdsub dumps to dumpsub.sub not dumpsub.txt
reynaldo
parents:
17885
diff
changeset
|
2114 fd = fopen("dumpsub.sub", "w"); |
7460 | 2115 if (!fd) { |
18045
452996e2628c
Acording to manpage -dumpmicrodvdsub dumps to dumpsub.sub not dumpsub.txt
reynaldo
parents:
17885
diff
changeset
|
2116 perror("dumpsub.sub: fopen"); |
7460 | 2117 return; |
2118 } | |
2119 delay = sub_delay * sub_fps; | |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2120 for (i = 0; i < subd->sub_num; ++i) { |
7460 | 2121 int j, start, end; |
2122 start = subs[i].start; | |
2123 end = subs[i].end; | |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2124 if (subd->sub_uses_time) { |
7460 | 2125 start = start * sub_fps / 100 ; |
2126 end = end * sub_fps / 100; | |
2127 } | |
2128 else { | |
2129 start = start * sub_fps / fps; | |
2130 end = end * sub_fps / fps; | |
2131 } | |
2132 start -= delay; | |
2133 end -= delay; | |
2134 fprintf(fd, "{%d}{%d}", start, end); | |
29251 | 2135 for (j = 0; j < subs[i].lines; ++j) |
7460 | 2136 fprintf(fd, "%s%s", j ? "|" : "", subs[i].text[j]); |
2137 fprintf(fd, "\n"); | |
2138 } | |
2139 fclose(fd); | |
18045
452996e2628c
Acording to manpage -dumpmicrodvdsub dumps to dumpsub.sub not dumpsub.txt
reynaldo
parents:
17885
diff
changeset
|
2140 mp_msg(MSGT_SUBREADER,MSGL_INFO,"SUB: Subtitles dumped in \'dumpsub.sub\'.\n"); |
7460 | 2141 } |
2142 | |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2143 void dump_jacosub(sub_data* subd, float fps) { |
8360 | 2144 int i,j; |
2145 int h,m,s,cs; | |
2146 FILE * fd; | |
2147 subtitle * onesub; | |
2148 unsigned long temp; | |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2149 subtitle *subs = subd->subtitles; |
8360 | 2150 |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2151 if (!subd->sub_uses_time && sub_fps == 0) |
8360 | 2152 sub_fps = fps; |
8862
356534b9e7d4
Since version 2.7 the file extension for JACOsub changed from
arpi
parents:
8789
diff
changeset
|
2153 fd=fopen("dumpsub.jss","w"); |
8360 | 2154 if(!fd) |
29251 | 2155 { |
8360 | 2156 perror("dump_jacosub: fopen"); |
2157 return; | |
2158 } | |
29251 | 2159 fprintf(fd, "#TIMERES %d\n", (subd->sub_uses_time) ? 100 : (int)sub_fps); |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2160 for(i=0; i < subd->sub_num; i++) |
8360 | 2161 { |
2162 onesub=subs+i; //=&subs[i]; | |
2163 | |
2164 temp=onesub->start; | |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2165 if (!subd->sub_uses_time) |
8360 | 2166 temp = temp * 100 / sub_fps; |
2167 temp -= sub_delay * 100; | |
2168 h=temp/360000;temp%=360000; //h =1*100*60*60 | |
2169 m=temp/6000; temp%=6000; //m =1*100*60 | |
2170 s=temp/100; temp%=100; //s =1*100 | |
2171 cs=temp; //cs=1*10 | |
2172 fprintf(fd,"%02d:%02d:%02d.%02d ",h,m,s,cs); | |
2173 | |
2174 temp=onesub->end; | |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2175 if (!subd->sub_uses_time) |
8360 | 2176 temp = temp * 100 / sub_fps; |
2177 temp -= sub_delay * 100; | |
2178 h=temp/360000;temp%=360000; | |
2179 m=temp/6000; temp%=6000; | |
2180 s=temp/100; temp%=100; | |
2181 cs=temp; | |
2182 fprintf(fd,"%02d:%02d:%02d.%02d {~} ",h,m,s,cs); | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29251
diff
changeset
|
2183 |
8360 | 2184 for(j=0;j<onesub->lines;j++) |
2185 fprintf(fd,"%s%s",j ? "\\n" : "", onesub->text[j]); | |
2186 | |
2187 fprintf(fd,"\n"); | |
2188 } | |
2189 fclose(fd); | |
2190 mp_msg(MSGT_SUBREADER,MSGL_INFO,"SUB: Subtitles dumped in \'dumpsub.js\'.\n"); | |
2191 } | |
2192 | |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2193 void dump_sami(sub_data* subd, float fps) { |
8363 | 2194 int i,j; |
2195 FILE * fd; | |
2196 subtitle * onesub; | |
2197 unsigned long temp; | |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2198 subtitle *subs = subd->subtitles; |
8363 | 2199 |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2200 if (!subd->sub_uses_time && sub_fps == 0) |
8363 | 2201 sub_fps = fps; |
2202 fd=fopen("dumpsub.smi","w"); | |
2203 if(!fd) | |
29251 | 2204 { |
8363 | 2205 perror("dump_jacosub: fopen"); |
2206 return; | |
2207 } | |
2208 fprintf(fd, "<SAMI>\n" | |
2209 "<HEAD>\n" | |
2210 " <STYLE TYPE=\"Text/css\">\n" | |
2211 " <!--\n" | |
2212 " P {margin-left: 29pt; margin-right: 29pt; font-size: 24pt; text-align: center; font-family: Tahoma; font-weight: bold; color: #FCDD03; background-color: #000000;}\n" | |
2213 " .SUBTTL {Name: 'Subtitles'; Lang: en-US; SAMIType: CC;}\n" | |
2214 " -->\n" | |
2215 " </STYLE>\n" | |
2216 "</HEAD>\n" | |
2217 "<BODY>\n"); | |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2218 for(i=0; i < subd->sub_num; i++) |
8363 | 2219 { |
2220 onesub=subs+i; //=&subs[i]; | |
2221 | |
2222 temp=onesub->start; | |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2223 if (!subd->sub_uses_time) |
8363 | 2224 temp = temp * 100 / sub_fps; |
2225 temp -= sub_delay * 100; | |
2226 fprintf(fd,"\t<SYNC Start=%lu>\n" | |
2227 "\t <P>", temp * 10); | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29251
diff
changeset
|
2228 |
8363 | 2229 for(j=0;j<onesub->lines;j++) |
2230 fprintf(fd,"%s%s",j ? "<br>" : "", onesub->text[j]); | |
2231 | |
2232 fprintf(fd,"\n"); | |
2233 | |
2234 temp=onesub->end; | |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2235 if (!subd->sub_uses_time) |
8363 | 2236 temp = temp * 100 / sub_fps; |
2237 temp -= sub_delay * 100; | |
2238 fprintf(fd,"\t<SYNC Start=%lu>\n" | |
2239 "\t <P> \n", temp * 10); | |
2240 } | |
2241 fprintf(fd, "</BODY>\n" | |
2242 "</SAMI>\n"); | |
2243 fclose(fd); | |
2244 mp_msg(MSGT_SUBREADER,MSGL_INFO,"SUB: Subtitles dumped in \'dumpsub.smi\'.\n"); | |
2245 } | |
2246 | |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2247 void sub_free( sub_data * subd ) |
3543 | 2248 { |
2249 int i; | |
29251 | 2250 |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2251 if ( !subd ) return; |
29251 | 2252 |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2253 if (subd->subtitles) { |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2254 for (i=0; i < subd->subtitles->lines; i++) free( subd->subtitles->text[i] ); |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2255 free( subd->subtitles ); |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2256 } |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2257 if (subd->filename) free( subd->filename ); |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9635
diff
changeset
|
2258 free( subd ); |
3543 | 2259 } |
2178 | 2260 |
21827
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2261 #define MAX_SUBLINE 512 |
21833 | 2262 /** |
2263 * \brief parse text and append it to subtitle in sub | |
2264 * \param sub subtitle struct to add text to | |
2265 * \param txt text to parse | |
2266 * \param len length of text in txt | |
2267 * \param endpts pts at which this subtitle text should be removed again | |
2268 * | |
2269 * <> and {} are interpreted as comment delimiters, "\n", "\N", '\n', '\r' | |
2270 * and '\0' are interpreted as newlines, duplicate, leading and trailing | |
2271 * newlines are ignored. | |
2272 */ | |
21827
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2273 void sub_add_text(subtitle *sub, const char *txt, int len, double endpts) { |
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2274 int comment = 0; |
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2275 int double_newline = 1; // ignore newlines at the beginning |
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2276 int i, pos; |
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2277 char *buf; |
29908
0ebce433be9e
Make fribidi (i.e. right-to-left) support work with embedded subtitles.
reimar
parents:
29895
diff
changeset
|
2278 int orig_lines = sub->lines; |
21827
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2279 if (sub->lines >= SUB_MAX_TEXT) return; |
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2280 pos = 0; |
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2281 buf = malloc(MAX_SUBLINE + 1); |
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2282 sub->text[sub->lines] = buf; |
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2283 sub->endpts[sub->lines] = endpts; |
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2284 for (i = 0; i < len && pos < MAX_SUBLINE; i++) { |
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2285 char c = txt[i]; |
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2286 if (c == '<') comment |= 1; |
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2287 if (c == '{') comment |= 2; |
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2288 if (comment) { |
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2289 if (c == '}') comment &= ~2; |
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2290 if (c == '>') comment &= ~1; |
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2291 continue; |
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2292 } |
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2293 if (pos == MAX_SUBLINE - 1) { |
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2294 i--; |
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2295 c = 0; |
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2296 } |
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2297 if (c == '\\' && i + 1 < len) { |
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2298 c = txt[++i]; |
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2299 if (c == 'n' || c == 'N') c = 0; |
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2300 } |
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2301 if (c == '\n' || c == '\r') c = 0; |
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2302 if (c) { |
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2303 double_newline = 0; |
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2304 buf[pos++] = c; |
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2305 } else if (!double_newline) { |
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2306 if (sub->lines >= SUB_MAX_TEXT - 1) { |
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2307 mp_msg(MSGT_VO, MSGL_WARN, "Too many subtitle lines\n"); |
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2308 break; |
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2309 } |
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2310 double_newline = 1; |
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2311 buf[pos] = 0; |
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2312 sub->lines++; |
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2313 pos = 0; |
29251 | 2314 buf = malloc(MAX_SUBLINE + 1); |
21827
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2315 sub->text[sub->lines] = buf; |
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2316 sub->endpts[sub->lines] = endpts; |
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2317 } |
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2318 } |
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2319 buf[pos] = 0; |
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2320 if (sub->lines < SUB_MAX_TEXT && |
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2321 strlen(sub->text[sub->lines])) |
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2322 sub->lines++; |
29908
0ebce433be9e
Make fribidi (i.e. right-to-left) support work with embedded subtitles.
reimar
parents:
29895
diff
changeset
|
2323 #ifdef CONFIG_FRIBIDI |
0ebce433be9e
Make fribidi (i.e. right-to-left) support work with embedded subtitles.
reimar
parents:
29895
diff
changeset
|
2324 sub = sub_fribidi(sub, sub_utf8, orig_lines); |
0ebce433be9e
Make fribidi (i.e. right-to-left) support work with embedded subtitles.
reimar
parents:
29895
diff
changeset
|
2325 #endif |
21827
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2326 } |
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2327 |
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2328 #define MP_NOPTS_VALUE (-1LL<<63) |
21833 | 2329 /** |
2330 * \brief remove outdated subtitle lines. | |
2331 * \param sub subtitle struct to modify | |
2332 * \param pts current pts. All lines with endpts <= this will be removed. | |
2333 * Use MP_NOPTS_VALUE to remove all lines | |
2334 * \return 1 if sub was modified, 0 otherwise. | |
2335 */ | |
21827
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2336 int sub_clear_text(subtitle *sub, double pts) { |
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2337 int i = 0; |
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2338 int changed = 0; |
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2339 while (i < sub->lines) { |
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2340 double endpts = sub->endpts[i]; |
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2341 if (pts == MP_NOPTS_VALUE || (endpts != MP_NOPTS_VALUE && pts >= endpts)) { |
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2342 int j; |
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2343 free(sub->text[i]); |
22141
ed81b9614148
Fix code updating subtitle array which only moved the text, not endpts.
uau
parents:
21939
diff
changeset
|
2344 for (j = i + 1; j < sub->lines; j++) { |
21827
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2345 sub->text[j - 1] = sub->text[j]; |
22141
ed81b9614148
Fix code updating subtitle array which only moved the text, not endpts.
uau
parents:
21939
diff
changeset
|
2346 sub->endpts[j - 1] = sub->endpts[j]; |
ed81b9614148
Fix code updating subtitle array which only moved the text, not endpts.
uau
parents:
21939
diff
changeset
|
2347 } |
21827
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2348 sub->lines--; |
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2349 changed = 1; |
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2350 } else |
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2351 i++; |
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2352 } |
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2353 return changed; |
b0bc0d81f91b
Subtitle handling cleanup: factor out code for parsing embedded subtitles
reimar
parents:
20292
diff
changeset
|
2354 } |