annotate vobsub.c @ 31721:f9eee489ab45

Only try to merge packets if we have a previous packet stored. Based on patch by 191919 [191919 gmail com].
author reimar
date Sat, 24 Jul 2010 17:18:46 +0000
parents 13ca93203358
children b2fb8e656eca
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
1 /*
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
2 * Some code freely inspired from VobSub <URL:http://vobsub.edensrising.com>,
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
3 * with kind permission from Gabest <gabest@freemail.hu>
30429
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 30094
diff changeset
4 *
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 30094
diff changeset
5 * This file is part of MPlayer.
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 30094
diff changeset
6 *
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 30094
diff changeset
7 * MPlayer is free software; you can redistribute it and/or modify
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 30094
diff changeset
8 * it under the terms of the GNU General Public License as published by
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 30094
diff changeset
9 * the Free Software Foundation; either version 2 of the License, or
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 30094
diff changeset
10 * (at your option) any later version.
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 30094
diff changeset
11 *
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 30094
diff changeset
12 * MPlayer is distributed in the hope that it will be useful,
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 30094
diff changeset
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 30094
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 30094
diff changeset
15 * GNU General Public License for more details.
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 30094
diff changeset
16 *
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 30094
diff changeset
17 * You should have received a copy of the GNU General Public License along
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 30094
diff changeset
18 * with MPlayer; if not, write to the Free Software Foundation, Inc.,
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 30094
diff changeset
19 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
20 */
30429
c1a3f1bbba26 Add license header to all top-level files missing them.
diego
parents: 30094
diff changeset
21
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
22 #include <ctype.h>
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
23 #include <errno.h>
7417
c477dae38383 Fix support for negative "delay:" directive in .idx file.
kmkaplan
parents: 6831
diff changeset
24 #include <limits.h>
7446
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
25 #include <stddef.h>
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
26 #include <stdio.h>
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
27 #include <stdlib.h>
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
28 #include <string.h>
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
29 #include <fcntl.h>
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
30 #include <unistd.h>
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
31 #include <sys/stat.h>
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
32 #include <sys/types.h>
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
33
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
34 #include "config.h"
31511
13ca93203358 Factorize MPlayer/MEncoder version string handling.
diego
parents: 31062
diff changeset
35 #include "mpcommon.h"
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
36 #include "vobsub.h"
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
37 #include "spudec.h"
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
38 #include "mp_msg.h"
25361
f95cd1391ea0 Support using unrar executable to access rar-compressed vobsub files.
ulion
parents: 25322
diff changeset
39 #include "unrar_exec.h"
22377
fd54975f9135 Use libavutil's av_clip* instead of unreadable MIN/MAX chaos.
reimar
parents: 21444
diff changeset
40 #include "libavutil/common.h"
6831
f628e5dca5b9 Use RGB for palette from .IDX file
kmkaplan
parents: 6829
diff changeset
41
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
42 extern int vobsub_id;
25251
80804f0631f4 Skip empty vobsub streams when selecting subtitles.
ulion
parents: 25249
diff changeset
43 // Record the original -vobsubid set by commandline, since vobsub_id will be
80804f0631f4 Skip empty vobsub streams when selecting subtitles.
ulion
parents: 25249
diff changeset
44 // overridden if slang match any of vobsub streams.
80804f0631f4 Skip empty vobsub streams when selecting subtitles.
ulion
parents: 25249
diff changeset
45 static int vobsubid = -2;
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
46
7446
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
47 /**********************************************************************
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
48 * RAR stream handling
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
49 * The RAR file must have the same basename as the file to open
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
50 **********************************************************************/
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 26733
diff changeset
51 #ifdef CONFIG_UNRAR_EXEC
7446
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
52 typedef struct {
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
53 FILE *file;
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
54 unsigned char *data;
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
55 unsigned long size;
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
56 unsigned long pos;
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
57 } rar_stream_t;
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
58
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
59 static rar_stream_t *rar_open(const char *const filename,
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
60 const char *const mode)
7446
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
61 {
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
62 rar_stream_t *stream;
25443
6ad285d014bf Fix comment from unrarlib to unrar_exec
ulion
parents: 25442
diff changeset
63 /* unrar_exec can only read */
7446
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
64 if (strcmp("r", mode) && strcmp("rb", mode)) {
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
65 errno = EINVAL;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
66 return NULL;
7446
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
67 }
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
68 stream = malloc(sizeof(rar_stream_t));
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
69 if (stream == NULL)
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
70 return NULL;
7446
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
71 /* first try normal access */
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
72 stream->file = fopen(filename, mode);
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
73 if (stream->file == NULL) {
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
74 char *rar_filename;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
75 const char *p;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
76 int rc;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
77 /* Guess the RAR archive filename */
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
78 rar_filename = NULL;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
79 p = strrchr(filename, '.');
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
80 if (p) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
81 ptrdiff_t l = p - filename;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
82 rar_filename = malloc(l + 5);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
83 if (rar_filename == NULL) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
84 free(stream);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
85 return NULL;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
86 }
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
87 strncpy(rar_filename, filename, l);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
88 strcpy(rar_filename + l, ".rar");
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
89 } else {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
90 rar_filename = malloc(strlen(filename) + 5);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
91 if (rar_filename == NULL) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
92 free(stream);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
93 return NULL;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
94 }
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
95 strcpy(rar_filename, filename);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
96 strcat(rar_filename, ".rar");
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
97 }
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
98 /* get rid of the path if there is any */
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
99 if ((p = strrchr(filename, '/')) == NULL) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
100 p = filename;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
101 } else {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
102 p++;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
103 }
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
104 rc = unrar_exec_get(&stream->data, &stream->size, p, rar_filename);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
105 if (!rc) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
106 /* There is no matching filename in the archive. However, sometimes
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
107 * the files we are looking for have been given arbitrary names in the archive.
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
108 * Let's look for a file with an exact match in the extension only. */
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
109 int i, num_files, name_len;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
110 ArchiveList_struct *list, *lp;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
111 num_files = unrar_exec_list(rar_filename, &list);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
112 if (num_files > 0) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
113 char *demanded_ext;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
114 demanded_ext = strrchr (p, '.');
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
115 if (demanded_ext) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
116 int demanded_ext_len = strlen (demanded_ext);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
117 for (i = 0, lp = list; i < num_files; i++, lp = lp->next) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
118 name_len = strlen (lp->item.Name);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
119 if (name_len >= demanded_ext_len && !strcasecmp (lp->item.Name + name_len - demanded_ext_len, demanded_ext)) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
120 rc = unrar_exec_get(&stream->data, &stream->size,
25361
f95cd1391ea0 Support using unrar executable to access rar-compressed vobsub files.
ulion
parents: 25322
diff changeset
121 lp->item.Name, rar_filename);
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
122 if (rc)
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
123 break;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
124 }
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
125 }
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
126 }
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
127 unrar_exec_freelist(list);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
128 }
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
129 if (!rc) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
130 free(rar_filename);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
131 free(stream);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
132 return NULL;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
133 }
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
134 }
11309
fa738ed513f9 Improved searching for VobSubs inside RAR archives even if the names do not match the movie name. Do not display VobSubs whose timecodes are < 0 which would make all VobSubs appear from the start on upon seeking. Patches by "Reder, Uwe" <Uwe.Reder@3SOFT.de>.
mosu
parents: 10917
diff changeset
135
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
136 free(rar_filename);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
137 stream->pos = 0;
7446
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
138 }
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
139 return stream;
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
140 }
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
141
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
142 static int rar_close(rar_stream_t *stream)
7446
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
143 {
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
144 if (stream->file)
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
145 return fclose(stream->file);
7446
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
146 free(stream->data);
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
147 return 0;
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
148 }
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
149
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
150 static int rar_eof(rar_stream_t *stream)
7446
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
151 {
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
152 if (stream->file)
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
153 return feof(stream->file);
7446
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
154 return stream->pos >= stream->size;
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
155 }
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
156
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
157 static long rar_tell(rar_stream_t *stream)
7446
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
158 {
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
159 if (stream->file)
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
160 return ftell(stream->file);
7446
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
161 return stream->pos;
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
162 }
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
163
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
164 static int rar_seek(rar_stream_t *stream, long offset, int whence)
7446
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
165 {
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
166 if (stream->file)
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
167 return fseek(stream->file, offset, whence);
7446
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
168 switch (whence) {
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
169 case SEEK_SET:
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
170 if (offset < 0) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
171 errno = EINVAL;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
172 return -1;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
173 }
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
174 stream->pos = offset;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
175 break;
7446
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
176 case SEEK_CUR:
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
177 if (offset < 0 && stream->pos < (unsigned long) -offset) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
178 errno = EINVAL;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
179 return -1;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
180 }
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
181 stream->pos += offset;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
182 break;
7446
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
183 case SEEK_END:
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
184 if (offset < 0 && stream->size < (unsigned long) -offset) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
185 errno = EINVAL;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
186 return -1;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
187 }
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
188 stream->pos = stream->size + offset;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
189 break;
7446
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
190 default:
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
191 errno = EINVAL;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
192 return -1;
7446
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
193 }
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
194 return 0;
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
195 }
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
196
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
197 static int rar_getc(rar_stream_t *stream)
7446
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
198 {
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
199 if (stream->file)
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
200 return getc(stream->file);
7446
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
201 if (rar_eof(stream))
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
202 return EOF;
7446
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
203 return stream->data[stream->pos++];
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
204 }
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
205
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
206 static size_t rar_read(void *ptr, size_t size, size_t nmemb,
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
207 rar_stream_t *stream)
7446
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
208 {
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
209 size_t res;
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
210 unsigned long remain;
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
211 if (stream->file)
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
212 return fread(ptr, size, nmemb, stream->file);
7446
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
213 if (rar_eof(stream))
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
214 return 0;
7446
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
215 res = size * nmemb;
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
216 remain = stream->size - stream->pos;
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
217 if (res > remain)
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
218 res = remain / size * size;
7446
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
219 memcpy(ptr, stream->data + stream->pos, res);
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
220 stream->pos += res;
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
221 res /= size;
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
222 return res;
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
223 }
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
224
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
225 #else
7446
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
226 typedef FILE rar_stream_t;
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
227 #define rar_open fopen
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
228 #define rar_close fclose
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
229 #define rar_eof feof
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
230 #define rar_tell ftell
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
231 #define rar_seek fseek
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
232 #define rar_getc getc
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
233 #define rar_read fread
7446
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
234 #endif
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
235
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
236 /**********************************************************************/
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
237
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
238 static ssize_t vobsub_getline(char **lineptr, size_t *n, rar_stream_t *stream)
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
239 {
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
240 size_t res = 0;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
241 int c;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
242 if (*lineptr == NULL) {
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
243 *lineptr = malloc(4096);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
244 if (*lineptr)
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
245 *n = 4096;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
246 } else if (*n == 0) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
247 char *tmp = realloc(*lineptr, 4096);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
248 if (tmp) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
249 *lineptr = tmp;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
250 *n = 4096;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
251 }
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
252 }
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
253 if (*lineptr == NULL || *n == 0)
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
254 return -1;
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
255
7446
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
256 for (c = rar_getc(stream); c != EOF; c = rar_getc(stream)) {
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
257 if (res + 1 >= *n) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
258 char *tmp = realloc(*lineptr, *n * 2);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
259 if (tmp == NULL)
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
260 return -1;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
261 *lineptr = tmp;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
262 *n *= 2;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
263 }
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
264 (*lineptr)[res++] = c;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
265 if (c == '\n') {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
266 (*lineptr)[res] = 0;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
267 return res;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
268 }
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
269 }
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
270 if (res == 0)
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
271 return -1;
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
272 (*lineptr)[res] = 0;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
273 return res;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
274 }
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
275
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
276 /**********************************************************************
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
277 * MPEG parsing
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
278 **********************************************************************/
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
279
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
280 typedef struct {
7446
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
281 rar_stream_t *stream;
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
282 unsigned int pts;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
283 int aid;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
284 unsigned char *packet;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
285 unsigned int packet_reserve;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
286 unsigned int packet_size;
31062
84800a0b2ba7 New hack for vobsub packet merging.
iive
parents: 30429
diff changeset
287 int padding_was_here;
84800a0b2ba7 New hack for vobsub packet merging.
iive
parents: 30429
diff changeset
288 int merge;
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
289 } mpeg_t;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
290
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
291 static mpeg_t *mpeg_open(const char *filename)
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
292 {
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
293 mpeg_t *res = malloc(sizeof(mpeg_t));
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
294 int err = res == NULL;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
295 if (!err) {
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
296 res->pts = 0;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
297 res->aid = -1;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
298 res->packet = NULL;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
299 res->packet_size = 0;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
300 res->packet_reserve = 0;
31062
84800a0b2ba7 New hack for vobsub packet merging.
iive
parents: 30429
diff changeset
301 res->padding_was_here = 1;
84800a0b2ba7 New hack for vobsub packet merging.
iive
parents: 30429
diff changeset
302 res->merge = 0;
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
303 res->stream = rar_open(filename, "rb");
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
304 err = res->stream == NULL;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
305 if (err)
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
306 perror("fopen Vobsub file failed");
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
307 if (err)
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
308 free(res);
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
309 }
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
310 return err ? NULL : res;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
311 }
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
312
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
313 static void mpeg_free(mpeg_t *mpeg)
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
314 {
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
315 if (mpeg->packet)
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
316 free(mpeg->packet);
6773
24f3276523af Remove depency on libmpdemux streams, use ANSI IO instead.
kmkaplan
parents: 6706
diff changeset
317 if (mpeg->stream)
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
318 rar_close(mpeg->stream);
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
319 free(mpeg);
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
320 }
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
321
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
322 static int mpeg_eof(mpeg_t *mpeg)
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
323 {
7446
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
324 return rar_eof(mpeg->stream);
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
325 }
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
326
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
327 static off_t mpeg_tell(mpeg_t *mpeg)
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
328 {
7446
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
329 return rar_tell(mpeg->stream);
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
330 }
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
331
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
332 static int mpeg_run(mpeg_t *mpeg)
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
333 {
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
334 unsigned int len, idx, version;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
335 int c;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
336 /* Goto start of a packet, it starts with 0x000001?? */
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
337 const unsigned char wanted[] = { 0, 0, 1 };
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
338 unsigned char buf[5];
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
339
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
340 mpeg->aid = -1;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
341 mpeg->packet_size = 0;
7446
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
342 if (rar_read(buf, 4, 1, mpeg->stream) != 1)
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
343 return -1;
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
344 while (memcmp(buf, wanted, sizeof(wanted)) != 0) {
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
345 c = rar_getc(mpeg->stream);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
346 if (c < 0)
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
347 return -1;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
348 memmove(buf, buf + 1, 3);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
349 buf[3] = c;
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
350 }
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
351 switch (buf[3]) {
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
352 case 0xb9: /* System End Code */
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
353 break;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
354 case 0xba: /* Packet start code */
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
355 c = rar_getc(mpeg->stream);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
356 if (c < 0)
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
357 return -1;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
358 if ((c & 0xc0) == 0x40)
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
359 version = 4;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
360 else if ((c & 0xf0) == 0x20)
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
361 version = 2;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
362 else {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
363 mp_msg(MSGT_VOBSUB, MSGL_ERR, "VobSub: Unsupported MPEG version: 0x%02x\n", c);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
364 return -1;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
365 }
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
366 if (version == 4) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
367 if (rar_seek(mpeg->stream, 9, SEEK_CUR))
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
368 return -1;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
369 } else if (version == 2) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
370 if (rar_seek(mpeg->stream, 7, SEEK_CUR))
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
371 return -1;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
372 } else
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
373 abort();
31062
84800a0b2ba7 New hack for vobsub packet merging.
iive
parents: 30429
diff changeset
374 if (!mpeg->padding_was_here)
84800a0b2ba7 New hack for vobsub packet merging.
iive
parents: 30429
diff changeset
375 mpeg->merge = 1;
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
376 break;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
377 case 0xbd: /* packet */
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
378 if (rar_read(buf, 2, 1, mpeg->stream) != 1)
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
379 return -1;
31062
84800a0b2ba7 New hack for vobsub packet merging.
iive
parents: 30429
diff changeset
380 mpeg->padding_was_here = 0;
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
381 len = buf[0] << 8 | buf[1];
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
382 idx = mpeg_tell(mpeg);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
383 c = rar_getc(mpeg->stream);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
384 if (c < 0)
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
385 return -1;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
386 if ((c & 0xC0) == 0x40) { /* skip STD scale & size */
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
387 if (rar_getc(mpeg->stream) < 0)
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
388 return -1;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
389 c = rar_getc(mpeg->stream);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
390 if (c < 0)
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
391 return -1;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
392 }
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
393 if ((c & 0xf0) == 0x20) { /* System-1 stream timestamp */
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
394 /* Do we need this? */
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
395 abort();
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
396 } else if ((c & 0xf0) == 0x30) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
397 /* Do we need this? */
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
398 abort();
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
399 } else if ((c & 0xc0) == 0x80) { /* System-2 (.VOB) stream */
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
400 unsigned int pts_flags, hdrlen, dataidx;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
401 c = rar_getc(mpeg->stream);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
402 if (c < 0)
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
403 return -1;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
404 pts_flags = c;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
405 c = rar_getc(mpeg->stream);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
406 if (c < 0)
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
407 return -1;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
408 hdrlen = c;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
409 dataidx = mpeg_tell(mpeg) + hdrlen;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
410 if (dataidx > idx + len) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
411 mp_msg(MSGT_VOBSUB, MSGL_ERR, "Invalid header length: %d (total length: %d, idx: %d, dataidx: %d)\n",
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
412 hdrlen, len, idx, dataidx);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
413 return -1;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
414 }
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
415 if ((pts_flags & 0xc0) == 0x80) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
416 if (rar_read(buf, 5, 1, mpeg->stream) != 1)
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
417 return -1;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
418 if (!(((buf[0] & 0xf0) == 0x20) && (buf[0] & 1) && (buf[2] & 1) && (buf[4] & 1))) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
419 mp_msg(MSGT_VOBSUB, MSGL_ERR, "vobsub PTS error: 0x%02x %02x%02x %02x%02x \n",
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
420 buf[0], buf[1], buf[2], buf[3], buf[4]);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
421 mpeg->pts = 0;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
422 } else
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
423 mpeg->pts = ((buf[0] & 0x0e) << 29 | buf[1] << 22 | (buf[2] & 0xfe) << 14
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
424 | buf[3] << 7 | (buf[4] >> 1));
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
425 } else /* if ((pts_flags & 0xc0) == 0xc0) */ {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
426 /* what's this? */
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
427 /* abort(); */
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
428 }
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
429 rar_seek(mpeg->stream, dataidx, SEEK_SET);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
430 mpeg->aid = rar_getc(mpeg->stream);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
431 if (mpeg->aid < 0) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
432 mp_msg(MSGT_VOBSUB, MSGL_ERR, "Bogus aid %d\n", mpeg->aid);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
433 return -1;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
434 }
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
435 mpeg->packet_size = len - ((unsigned int) mpeg_tell(mpeg) - idx);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
436 if (mpeg->packet_reserve < mpeg->packet_size) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
437 if (mpeg->packet)
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
438 free(mpeg->packet);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
439 mpeg->packet = malloc(mpeg->packet_size);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
440 if (mpeg->packet)
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
441 mpeg->packet_reserve = mpeg->packet_size;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
442 }
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
443 if (mpeg->packet == NULL) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
444 mp_msg(MSGT_VOBSUB, MSGL_FATAL, "malloc failure");
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
445 mpeg->packet_reserve = 0;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
446 mpeg->packet_size = 0;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
447 return -1;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
448 }
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
449 if (rar_read(mpeg->packet, mpeg->packet_size, 1, mpeg->stream) != 1) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
450 mp_msg(MSGT_VOBSUB, MSGL_ERR, "fread failure");
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
451 mpeg->packet_size = 0;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
452 return -1;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
453 }
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
454 idx = len;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
455 }
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
456 break;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
457 case 0xbe: /* Padding */
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
458 if (rar_read(buf, 2, 1, mpeg->stream) != 1)
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
459 return -1;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
460 len = buf[0] << 8 | buf[1];
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
461 if (len > 0 && rar_seek(mpeg->stream, len, SEEK_CUR))
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
462 return -1;
31062
84800a0b2ba7 New hack for vobsub packet merging.
iive
parents: 30429
diff changeset
463 mpeg->padding_was_here = 1;
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
464 break;
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
465 default:
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
466 if (0xc0 <= buf[3] && buf[3] < 0xf0) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
467 /* MPEG audio or video */
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
468 if (rar_read(buf, 2, 1, mpeg->stream) != 1)
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
469 return -1;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
470 len = buf[0] << 8 | buf[1];
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
471 if (len > 0 && rar_seek(mpeg->stream, len, SEEK_CUR))
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
472 return -1;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
473 } else {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
474 mp_msg(MSGT_VOBSUB, MSGL_ERR, "unknown header 0x%02X%02X%02X%02X\n",
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
475 buf[0], buf[1], buf[2], buf[3]);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
476 return -1;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
477 }
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
478 }
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
479 return 0;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
480 }
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
481
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
482 /**********************************************************************
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
483 * Packet queue
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
484 **********************************************************************/
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
485
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
486 typedef struct {
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
487 unsigned int pts100;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
488 off_t filepos;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
489 unsigned int size;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
490 unsigned char *data;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
491 } packet_t;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
492
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
493 typedef struct {
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
494 char *id;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
495 packet_t *packets;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
496 unsigned int packets_reserve;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
497 unsigned int packets_size;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
498 unsigned int current_index;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
499 } packet_queue_t;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
500
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
501 static void packet_construct(packet_t *pkt)
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
502 {
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
503 pkt->pts100 = 0;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
504 pkt->filepos = 0;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
505 pkt->size = 0;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
506 pkt->data = NULL;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
507 }
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
508
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
509 static void packet_destroy(packet_t *pkt)
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
510 {
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
511 if (pkt->data)
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
512 free(pkt->data);
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
513 }
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
514
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
515 static void packet_queue_construct(packet_queue_t *queue)
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
516 {
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
517 queue->id = NULL;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
518 queue->packets = NULL;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
519 queue->packets_reserve = 0;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
520 queue->packets_size = 0;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
521 queue->current_index = 0;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
522 }
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
523
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
524 static void packet_queue_destroy(packet_queue_t *queue)
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
525 {
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
526 if (queue->packets) {
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
527 while (queue->packets_size--)
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
528 packet_destroy(queue->packets + queue->packets_size);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
529 free(queue->packets);
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
530 }
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
531 return;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
532 }
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
533
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
534 /* Make sure there is enough room for needed_size packets in the
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
535 packet queue. */
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
536 static int packet_queue_ensure(packet_queue_t *queue, unsigned int needed_size)
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
537 {
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
538 if (queue->packets_reserve < needed_size) {
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
539 if (queue->packets) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
540 packet_t *tmp = realloc(queue->packets, 2 * queue->packets_reserve * sizeof(packet_t));
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
541 if (tmp == NULL) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
542 mp_msg(MSGT_VOBSUB, MSGL_FATAL, "realloc failure");
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
543 return -1;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
544 }
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
545 queue->packets = tmp;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
546 queue->packets_reserve *= 2;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
547 } else {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
548 queue->packets = malloc(sizeof(packet_t));
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
549 if (queue->packets == NULL) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
550 mp_msg(MSGT_VOBSUB, MSGL_FATAL, "malloc failure");
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
551 return -1;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
552 }
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
553 queue->packets_reserve = 1;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
554 }
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
555 }
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
556 return 0;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
557 }
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
558
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
559 /* add one more packet */
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
560 static int packet_queue_grow(packet_queue_t *queue)
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
561 {
29250
bc5115226204 Get rid of some more trailing whitespace
reynaldo
parents: 27840
diff changeset
562 if (packet_queue_ensure(queue, queue->packets_size + 1) < 0)
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
563 return -1;
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
564 packet_construct(queue->packets + queue->packets_size);
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
565 ++queue->packets_size;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
566 return 0;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
567 }
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
568
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
569 /* insert a new packet, duplicating pts from the current one */
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
570 static int packet_queue_insert(packet_queue_t *queue)
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
571 {
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
572 packet_t *pkts;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
573 if (packet_queue_ensure(queue, queue->packets_size + 1) < 0)
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
574 return -1;
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
575 /* XXX packet_size does not reflect the real thing here, it will be updated a bit later */
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
576 memmove(queue->packets + queue->current_index + 2,
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
577 queue->packets + queue->current_index + 1,
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
578 sizeof(packet_t) * (queue->packets_size - queue->current_index - 1));
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
579 pkts = queue->packets + queue->current_index;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
580 ++queue->packets_size;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
581 ++queue->current_index;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
582 packet_construct(pkts + 1);
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
583 pkts[1].pts100 = pkts[0].pts100;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
584 pkts[1].filepos = pkts[0].filepos;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
585 return 0;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
586 }
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
587
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
588 /**********************************************************************
6674
f8551f89dd48 MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents: 6163
diff changeset
589 * Vobsub
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
590 **********************************************************************/
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
591
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
592 typedef struct {
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
593 unsigned int palette[16];
5833
91d766389a5d VobSub updates, custom palette support and other stuff, can't write the name of the chinese(?) patch supplier.
atmos4
parents: 5563
diff changeset
594 int delay;
91d766389a5d VobSub updates, custom palette support and other stuff, can't write the name of the chinese(?) patch supplier.
atmos4
parents: 5563
diff changeset
595 unsigned int have_palette;
5388
3af2729c5c87 * New command line switch for mplayer & mencoder:
kmkaplan
parents: 4787
diff changeset
596 unsigned int orig_frame_width, orig_frame_height;
5563
71372b7125cf Sorry, fix vobsub duration the arpi way.
atmos4
parents: 5388
diff changeset
597 unsigned int origin_x, origin_y;
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
598 /* index */
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
599 packet_queue_t *spu_streams;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
600 unsigned int spu_streams_size;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
601 unsigned int spu_streams_current;
25251
80804f0631f4 Skip empty vobsub streams when selecting subtitles.
ulion
parents: 25249
diff changeset
602 unsigned int spu_valid_streams_size;
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
603 } vobsub_t;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
604
4085
dc0a91965b97 Support vobsub without index files.
kmkaplan
parents: 4080
diff changeset
605 /* Make sure that the spu stream idx exists. */
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
606 static int vobsub_ensure_spu_stream(vobsub_t *vob, unsigned int index)
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
607 {
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
608 if (index >= vob->spu_streams_size) {
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
609 /* This is a new stream */
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
610 if (vob->spu_streams) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
611 packet_queue_t *tmp = realloc(vob->spu_streams, (index + 1) * sizeof(packet_queue_t));
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
612 if (tmp == NULL) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
613 mp_msg(MSGT_VOBSUB, MSGL_ERR, "vobsub_ensure_spu_stream: realloc failure");
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
614 return -1;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
615 }
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
616 vob->spu_streams = tmp;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
617 } else {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
618 vob->spu_streams = malloc((index + 1) * sizeof(packet_queue_t));
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
619 if (vob->spu_streams == NULL) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
620 mp_msg(MSGT_VOBSUB, MSGL_ERR, "vobsub_ensure_spu_stream: malloc failure");
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
621 return -1;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
622 }
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
623 }
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
624 while (vob->spu_streams_size <= index) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
625 packet_queue_construct(vob->spu_streams + vob->spu_streams_size);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
626 ++vob->spu_streams_size;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
627 }
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
628 }
4085
dc0a91965b97 Support vobsub without index files.
kmkaplan
parents: 4080
diff changeset
629 return 0;
dc0a91965b97 Support vobsub without index files.
kmkaplan
parents: 4080
diff changeset
630 }
dc0a91965b97 Support vobsub without index files.
kmkaplan
parents: 4080
diff changeset
631
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
632 static int vobsub_add_id(vobsub_t *vob, const char *id, size_t idlen,
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
633 const unsigned int index)
4085
dc0a91965b97 Support vobsub without index files.
kmkaplan
parents: 4080
diff changeset
634 {
dc0a91965b97 Support vobsub without index files.
kmkaplan
parents: 4080
diff changeset
635 if (vobsub_ensure_spu_stream(vob, index) < 0)
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
636 return -1;
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
637 if (id && idlen) {
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
638 if (vob->spu_streams[index].id)
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
639 free(vob->spu_streams[index].id);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
640 vob->spu_streams[index].id = malloc(idlen + 1);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
641 if (vob->spu_streams[index].id == NULL) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
642 mp_msg(MSGT_VOBSUB, MSGL_FATAL, "vobsub_add_id: malloc failure");
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
643 return -1;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
644 }
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
645 vob->spu_streams[index].id[idlen] = 0;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
646 memcpy(vob->spu_streams[index].id, id, idlen);
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
647 }
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
648 vob->spu_streams_current = index;
18237
4231482179b6 Get ride of the several if(identify) messy lines and rearangment of some of the output, both patches by Kiriuja mplayer-patches AT en-directo_net, his changes are barely unrelated, nevertheless Im commiting them thogeter just for the sake of my mental healt, I had both patches already applied on my local three
reynaldo
parents: 17527
diff changeset
649 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VOBSUB_ID=%d\n", index);
4231482179b6 Get ride of the several if(identify) messy lines and rearangment of some of the output, both patches by Kiriuja mplayer-patches AT en-directo_net, his changes are barely unrelated, nevertheless Im commiting them thogeter just for the sake of my mental healt, I had both patches already applied on my local three
reynaldo
parents: 17527
diff changeset
650 if (id && idlen)
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
651 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VSID_%d_LANG=%s\n", index, vob->spu_streams[index].id);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
652 mp_msg(MSGT_VOBSUB, MSGL_V, "[vobsub] subtitle (vobsubid): %d language %s\n",
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
653 index, vob->spu_streams[index].id);
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
654 return 0;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
655 }
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
656
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
657 static int vobsub_add_timestamp(vobsub_t *vob, off_t filepos, int ms)
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
658 {
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
659 packet_queue_t *queue;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
660 packet_t *pkt;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
661 if (vob->spu_streams == 0) {
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
662 mp_msg(MSGT_VOBSUB, MSGL_WARN, "[vobsub] warning, binning some index entries. Check your index file\n");
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
663 return -1;
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
664 }
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
665 queue = vob->spu_streams + vob->spu_streams_current;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
666 if (packet_queue_grow(queue) >= 0) {
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
667 pkt = queue->packets + (queue->packets_size - 1);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
668 pkt->filepos = filepos;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
669 pkt->pts100 = ms < 0 ? UINT_MAX : (unsigned int)ms * 90;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
670 return 0;
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
671 }
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
672 return -1;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
673 }
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
674
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
675 static int vobsub_parse_id(vobsub_t *vob, const char *line)
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
676 {
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
677 // id: xx, index: n
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
678 size_t idlen;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
679 const char *p, *q;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
680 p = line;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
681 while (isspace(*p))
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
682 ++p;
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
683 q = p;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
684 while (isalpha(*q))
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
685 ++q;
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
686 idlen = q - p;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
687 if (idlen == 0)
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
688 return -1;
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
689 ++q;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
690 while (isspace(*q))
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
691 ++q;
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
692 if (strncmp("index:", q, 6))
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
693 return -1;
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
694 q += 6;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
695 while (isspace(*q))
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
696 ++q;
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
697 if (!isdigit(*q))
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
698 return -1;
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
699 return vobsub_add_id(vob, p, idlen, atoi(q));
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
700 }
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
701
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
702 static int vobsub_parse_timestamp(vobsub_t *vob, const char *line)
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
703 {
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
704 // timestamp: HH:MM:SS.mmm, filepos: 0nnnnnnnnn
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
705 const char *p;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
706 int h, m, s, ms;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
707 off_t filepos;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
708 while (isspace(*line))
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
709 ++line;
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
710 p = line;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
711 while (isdigit(*p))
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
712 ++p;
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
713 if (p - line != 2)
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
714 return -1;
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
715 h = atoi(line);
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
716 if (*p != ':')
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
717 return -1;
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
718 line = ++p;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
719 while (isdigit(*p))
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
720 ++p;
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
721 if (p - line != 2)
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
722 return -1;
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
723 m = atoi(line);
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
724 if (*p != ':')
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
725 return -1;
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
726 line = ++p;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
727 while (isdigit(*p))
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
728 ++p;
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
729 if (p - line != 2)
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
730 return -1;
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
731 s = atoi(line);
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
732 if (*p != ':')
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
733 return -1;
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
734 line = ++p;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
735 while (isdigit(*p))
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
736 ++p;
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
737 if (p - line != 3)
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
738 return -1;
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
739 ms = atoi(line);
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
740 if (*p != ',')
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
741 return -1;
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
742 line = p + 1;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
743 while (isspace(*line))
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
744 ++line;
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
745 if (strncmp("filepos:", line, 8))
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
746 return -1;
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
747 line += 8;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
748 while (isspace(*line))
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
749 ++line;
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
750 if (! isxdigit(*line))
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
751 return -1;
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
752 filepos = strtol(line, NULL, 16);
5833
91d766389a5d VobSub updates, custom palette support and other stuff, can't write the name of the chinese(?) patch supplier.
atmos4
parents: 5563
diff changeset
753 return vobsub_add_timestamp(vob, filepos, vob->delay + ms + 1000 * (s + 60 * (m + 60 * h)));
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
754 }
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
755
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
756 static int vobsub_parse_origin(vobsub_t *vob, const char *line)
5563
71372b7125cf Sorry, fix vobsub duration the arpi way.
atmos4
parents: 5388
diff changeset
757 {
71372b7125cf Sorry, fix vobsub duration the arpi way.
atmos4
parents: 5388
diff changeset
758 // org: X,Y
71372b7125cf Sorry, fix vobsub duration the arpi way.
atmos4
parents: 5388
diff changeset
759 char *p;
71372b7125cf Sorry, fix vobsub duration the arpi way.
atmos4
parents: 5388
diff changeset
760 while (isspace(*line))
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
761 ++line;
5563
71372b7125cf Sorry, fix vobsub duration the arpi way.
atmos4
parents: 5388
diff changeset
762 if (!isdigit(*line))
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
763 return -1;
5563
71372b7125cf Sorry, fix vobsub duration the arpi way.
atmos4
parents: 5388
diff changeset
764 vob->origin_x = strtoul(line, &p, 10);
71372b7125cf Sorry, fix vobsub duration the arpi way.
atmos4
parents: 5388
diff changeset
765 if (*p != ',')
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
766 return -1;
5563
71372b7125cf Sorry, fix vobsub duration the arpi way.
atmos4
parents: 5388
diff changeset
767 ++p;
71372b7125cf Sorry, fix vobsub duration the arpi way.
atmos4
parents: 5388
diff changeset
768 vob->origin_y = strtoul(p, NULL, 10);
71372b7125cf Sorry, fix vobsub duration the arpi way.
atmos4
parents: 5388
diff changeset
769 return 0;
71372b7125cf Sorry, fix vobsub duration the arpi way.
atmos4
parents: 5388
diff changeset
770 }
71372b7125cf Sorry, fix vobsub duration the arpi way.
atmos4
parents: 5388
diff changeset
771
25292
a6a49a7a4be0 Move vobsub palette->yuv convert code into a common function.
ulion
parents: 25289
diff changeset
772 unsigned int vobsub_palette_to_yuv(unsigned int pal)
a6a49a7a4be0 Move vobsub palette->yuv convert code into a common function.
ulion
parents: 25289
diff changeset
773 {
a6a49a7a4be0 Move vobsub palette->yuv convert code into a common function.
ulion
parents: 25289
diff changeset
774 int r, g, b, y, u, v;
27451
07ff0bdce52c Fix forumla -> formula in comment
reimar
parents: 27341
diff changeset
775 // Palette in idx file is not rgb value, it was calculated by wrong formula.
07ff0bdce52c Fix forumla -> formula in comment
reimar
parents: 27341
diff changeset
776 // Here's reversed formula of the one used to generate palette in idx file.
25292
a6a49a7a4be0 Move vobsub palette->yuv convert code into a common function.
ulion
parents: 25289
diff changeset
777 r = pal >> 16 & 0xff;
a6a49a7a4be0 Move vobsub palette->yuv convert code into a common function.
ulion
parents: 25289
diff changeset
778 g = pal >> 8 & 0xff;
a6a49a7a4be0 Move vobsub palette->yuv convert code into a common function.
ulion
parents: 25289
diff changeset
779 b = pal & 0xff;
a6a49a7a4be0 Move vobsub palette->yuv convert code into a common function.
ulion
parents: 25289
diff changeset
780 y = av_clip_uint8( 0.1494 * r + 0.6061 * g + 0.2445 * b);
a6a49a7a4be0 Move vobsub palette->yuv convert code into a common function.
ulion
parents: 25289
diff changeset
781 u = av_clip_uint8( 0.6066 * r - 0.4322 * g - 0.1744 * b + 128);
a6a49a7a4be0 Move vobsub palette->yuv convert code into a common function.
ulion
parents: 25289
diff changeset
782 v = av_clip_uint8(-0.08435 * r - 0.3422 * g + 0.4266 * b + 128);
a6a49a7a4be0 Move vobsub palette->yuv convert code into a common function.
ulion
parents: 25289
diff changeset
783 y = y * 219 / 255 + 16;
a6a49a7a4be0 Move vobsub palette->yuv convert code into a common function.
ulion
parents: 25289
diff changeset
784 return y << 16 | u << 8 | v;
a6a49a7a4be0 Move vobsub palette->yuv convert code into a common function.
ulion
parents: 25289
diff changeset
785 }
a6a49a7a4be0 Move vobsub palette->yuv convert code into a common function.
ulion
parents: 25289
diff changeset
786
25298
23894348d1e5 Convert vobsub custom colors from rgb to yuv using a common function.
ulion
parents: 25294
diff changeset
787 unsigned int vobsub_rgb_to_yuv(unsigned int rgb)
23894348d1e5 Convert vobsub custom colors from rgb to yuv using a common function.
ulion
parents: 25294
diff changeset
788 {
23894348d1e5 Convert vobsub custom colors from rgb to yuv using a common function.
ulion
parents: 25294
diff changeset
789 int r, g, b, y, u, v;
23894348d1e5 Convert vobsub custom colors from rgb to yuv using a common function.
ulion
parents: 25294
diff changeset
790 r = rgb >> 16 & 0xff;
23894348d1e5 Convert vobsub custom colors from rgb to yuv using a common function.
ulion
parents: 25294
diff changeset
791 g = rgb >> 8 & 0xff;
23894348d1e5 Convert vobsub custom colors from rgb to yuv using a common function.
ulion
parents: 25294
diff changeset
792 b = rgb & 0xff;
23894348d1e5 Convert vobsub custom colors from rgb to yuv using a common function.
ulion
parents: 25294
diff changeset
793 y = ( 0.299 * r + 0.587 * g + 0.114 * b) * 219 / 255 + 16.5;
23894348d1e5 Convert vobsub custom colors from rgb to yuv using a common function.
ulion
parents: 25294
diff changeset
794 u = (-0.16874 * r - 0.33126 * g + 0.5 * b) * 224 / 255 + 128.5;
23894348d1e5 Convert vobsub custom colors from rgb to yuv using a common function.
ulion
parents: 25294
diff changeset
795 v = ( 0.5 * r - 0.41869 * g - 0.08131 * b) * 224 / 255 + 128.5;
23894348d1e5 Convert vobsub custom colors from rgb to yuv using a common function.
ulion
parents: 25294
diff changeset
796 return y << 16 | u << 8 | v;
23894348d1e5 Convert vobsub custom colors from rgb to yuv using a common function.
ulion
parents: 25294
diff changeset
797 }
23894348d1e5 Convert vobsub custom colors from rgb to yuv using a common function.
ulion
parents: 25294
diff changeset
798
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
799 static int vobsub_parse_delay(vobsub_t *vob, const char *line)
5833
91d766389a5d VobSub updates, custom palette support and other stuff, can't write the name of the chinese(?) patch supplier.
atmos4
parents: 5563
diff changeset
800 {
91d766389a5d VobSub updates, custom palette support and other stuff, can't write the name of the chinese(?) patch supplier.
atmos4
parents: 5563
diff changeset
801 int h, m, s, ms;
91d766389a5d VobSub updates, custom palette support and other stuff, can't write the name of the chinese(?) patch supplier.
atmos4
parents: 5563
diff changeset
802 int forward = 1;
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
803 if (*(line + 7) == '+') {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
804 forward = 1;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
805 line++;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
806 } else if (*(line + 7) == '-') {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
807 forward = -1;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
808 line++;
5833
91d766389a5d VobSub updates, custom palette support and other stuff, can't write the name of the chinese(?) patch supplier.
atmos4
parents: 5563
diff changeset
809 }
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
810 mp_msg(MSGT_SPUDEC, MSGL_V, "forward=%d", forward);
5833
91d766389a5d VobSub updates, custom palette support and other stuff, can't write the name of the chinese(?) patch supplier.
atmos4
parents: 5563
diff changeset
811 h = atoi(line + 7);
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
812 mp_msg(MSGT_VOBSUB, MSGL_V, "h=%d,", h);
5833
91d766389a5d VobSub updates, custom palette support and other stuff, can't write the name of the chinese(?) patch supplier.
atmos4
parents: 5563
diff changeset
813 m = atoi(line + 10);
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
814 mp_msg(MSGT_VOBSUB, MSGL_V, "m=%d,", m);
5833
91d766389a5d VobSub updates, custom palette support and other stuff, can't write the name of the chinese(?) patch supplier.
atmos4
parents: 5563
diff changeset
815 s = atoi(line + 13);
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
816 mp_msg(MSGT_VOBSUB, MSGL_V, "s=%d,", s);
5833
91d766389a5d VobSub updates, custom palette support and other stuff, can't write the name of the chinese(?) patch supplier.
atmos4
parents: 5563
diff changeset
817 ms = atoi(line + 16);
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
818 mp_msg(MSGT_VOBSUB, MSGL_V, "ms=%d", ms);
7417
c477dae38383 Fix support for negative "delay:" directive in .idx file.
kmkaplan
parents: 6831
diff changeset
819 vob->delay = (ms + 1000 * (s + 60 * (m + 60 * h))) * forward;
5833
91d766389a5d VobSub updates, custom palette support and other stuff, can't write the name of the chinese(?) patch supplier.
atmos4
parents: 5563
diff changeset
820 return 0;
91d766389a5d VobSub updates, custom palette support and other stuff, can't write the name of the chinese(?) patch supplier.
atmos4
parents: 5563
diff changeset
821 }
91d766389a5d VobSub updates, custom palette support and other stuff, can't write the name of the chinese(?) patch supplier.
atmos4
parents: 5563
diff changeset
822
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
823 static int vobsub_set_lang(const char *line)
5833
91d766389a5d VobSub updates, custom palette support and other stuff, can't write the name of the chinese(?) patch supplier.
atmos4
parents: 5563
diff changeset
824 {
91d766389a5d VobSub updates, custom palette support and other stuff, can't write the name of the chinese(?) patch supplier.
atmos4
parents: 5563
diff changeset
825 if (vobsub_id == -1)
91d766389a5d VobSub updates, custom palette support and other stuff, can't write the name of the chinese(?) patch supplier.
atmos4
parents: 5563
diff changeset
826 vobsub_id = atoi(line + 8);
5388
3af2729c5c87 * New command line switch for mplayer & mencoder:
kmkaplan
parents: 4787
diff changeset
827 return 0;
3af2729c5c87 * New command line switch for mplayer & mencoder:
kmkaplan
parents: 4787
diff changeset
828 }
3af2729c5c87 * New command line switch for mplayer & mencoder:
kmkaplan
parents: 4787
diff changeset
829
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
830 static int vobsub_parse_one_line(vobsub_t *vob, rar_stream_t *fd,
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
831 unsigned char **extradata,
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
832 unsigned int *extradata_len)
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
833 {
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
834 ssize_t line_size;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
835 int res = -1;
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
836 size_t line_reserve = 0;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
837 char *line = NULL;
14237
cb14ee6b0944 fix memleak in idx parser. patch by elupus [elupus {at] ecce <dot) se]
reimar
parents: 14046
diff changeset
838 do {
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
839 line_size = vobsub_getline(&line, &line_reserve, fd);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
840 if (line_size < 0 || line_size > 1000000 ||
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
841 *extradata_len+line_size > 10000000) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
842 break;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
843 }
27807
3ac3d3a51934 Factorize vobsub idx/extradata handling.
aurel
parents: 27451
diff changeset
844
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
845 *extradata = realloc(*extradata, *extradata_len+line_size+1);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
846 memcpy(*extradata+*extradata_len, line, line_size);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
847 *extradata_len += line_size;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
848 (*extradata)[*extradata_len] = 0;
27807
3ac3d3a51934 Factorize vobsub idx/extradata handling.
aurel
parents: 27451
diff changeset
849
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
850 if (*line == 0 || *line == '\r' || *line == '\n' || *line == '#')
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
851 continue;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
852 else if (strncmp("langidx:", line, 8) == 0)
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
853 res = vobsub_set_lang(line);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
854 else if (strncmp("delay:", line, 6) == 0)
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
855 res = vobsub_parse_delay(vob, line);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
856 else if (strncmp("id:", line, 3) == 0)
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
857 res = vobsub_parse_id(vob, line + 3);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
858 else if (strncmp("org:", line, 4) == 0)
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
859 res = vobsub_parse_origin(vob, line + 4);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
860 else if (strncmp("timestamp:", line, 10) == 0)
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
861 res = vobsub_parse_timestamp(vob, line + 10);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
862 else {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
863 mp_msg(MSGT_VOBSUB, MSGL_V, "vobsub: ignoring %s", line);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
864 continue;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
865 }
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
866 if (res < 0)
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
867 mp_msg(MSGT_VOBSUB, MSGL_ERR, "ERROR in %s", line);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
868 break;
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
869 } while (1);
14237
cb14ee6b0944 fix memleak in idx parser. patch by elupus [elupus {at] ecce <dot) se]
reimar
parents: 14046
diff changeset
870 if (line)
cb14ee6b0944 fix memleak in idx parser. patch by elupus [elupus {at] ecce <dot) se]
reimar
parents: 14046
diff changeset
871 free(line);
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
872 return res;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
873 }
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
874
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
875 int vobsub_parse_ifo(void* this, const char *const name, unsigned int *palette,
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
876 unsigned int *width, unsigned int *height, int force,
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
877 int sid, char *langid)
5388
3af2729c5c87 * New command line switch for mplayer & mencoder:
kmkaplan
parents: 4787
diff changeset
878 {
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 5869
diff changeset
879 vobsub_t *vob = (vobsub_t*)this;
5388
3af2729c5c87 * New command line switch for mplayer & mencoder:
kmkaplan
parents: 4787
diff changeset
880 int res = -1;
7446
ad00ad5f25a9 Automatic unrar of vobsub. Does not work with rar v3
kmkaplan
parents: 7417
diff changeset
881 rar_stream_t *fd = rar_open(name, "rb");
5869
412ff784c971 Avoid bogus file not found message if vobsub isn'T forced (autodetect).
atmos4
parents: 5839
diff changeset
882 if (fd == NULL) {
412ff784c971 Avoid bogus file not found message if vobsub isn'T forced (autodetect).
atmos4
parents: 5839
diff changeset
883 if (force)
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
884 mp_msg(MSGT_VOBSUB, MSGL_WARN, "VobSub: Can't open IFO file\n");
5869
412ff784c971 Avoid bogus file not found message if vobsub isn'T forced (autodetect).
atmos4
parents: 5839
diff changeset
885 } else {
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
886 // parse IFO header
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
887 unsigned char block[0x800];
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
888 const char *const ifo_magic = "DVDVIDEO-VTS";
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
889 if (rar_read(block, sizeof(block), 1, fd) != 1) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
890 if (force)
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
891 mp_msg(MSGT_VOBSUB, MSGL_ERR, "VobSub: Can't read IFO header\n");
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
892 } else if (memcmp(block, ifo_magic, strlen(ifo_magic) + 1))
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
893 mp_msg(MSGT_VOBSUB, MSGL_ERR, "VobSub: Bad magic in IFO header\n");
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
894 else {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
895 unsigned long pgci_sector = block[0xcc] << 24 | block[0xcd] << 16
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
896 | block[0xce] << 8 | block[0xcf];
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
897 int standard = (block[0x200] & 0x30) >> 4;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
898 int resolution = (block[0x201] & 0x0c) >> 2;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
899 *height = standard ? 576 : 480;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
900 *width = 0;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
901 switch (resolution) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
902 case 0x0:
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
903 *width = 720;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
904 break;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
905 case 0x1:
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
906 *width = 704;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
907 break;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
908 case 0x2:
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
909 *width = 352;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
910 break;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
911 case 0x3:
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
912 *width = 352;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
913 *height /= 2;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
914 break;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
915 default:
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
916 mp_msg(MSGT_VOBSUB, MSGL_WARN, "Vobsub: Unknown resolution %d \n", resolution);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
917 }
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
918 if (langid && 0 <= sid && sid < 32) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
919 unsigned char *tmp = block + 0x256 + sid * 6 + 2;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
920 langid[0] = tmp[0];
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
921 langid[1] = tmp[1];
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
922 langid[2] = 0;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
923 }
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
924 if (rar_seek(fd, pgci_sector * sizeof(block), SEEK_SET)
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
925 || rar_read(block, sizeof(block), 1, fd) != 1)
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
926 mp_msg(MSGT_VOBSUB, MSGL_ERR, "VobSub: Can't read IFO PGCI\n");
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
927 else {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
928 unsigned long idx;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
929 unsigned long pgc_offset = block[0xc] << 24 | block[0xd] << 16
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
930 | block[0xe] << 8 | block[0xf];
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
931 for (idx = 0; idx < 16; ++idx) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
932 unsigned char *p = block + pgc_offset + 0xa4 + 4 * idx;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
933 palette[idx] = p[0] << 24 | p[1] << 16 | p[2] << 8 | p[3];
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
934 }
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
935 if (vob)
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
936 vob->have_palette = 1;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
937 res = 0;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
938 }
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
939 }
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
940 rar_close(fd);
5388
3af2729c5c87 * New command line switch for mplayer & mencoder:
kmkaplan
parents: 4787
diff changeset
941 }
3af2729c5c87 * New command line switch for mplayer & mencoder:
kmkaplan
parents: 4787
diff changeset
942 return res;
3af2729c5c87 * New command line switch for mplayer & mencoder:
kmkaplan
parents: 4787
diff changeset
943 }
3af2729c5c87 * New command line switch for mplayer & mencoder:
kmkaplan
parents: 4787
diff changeset
944
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
945 void *vobsub_open(const char *const name, const char *const ifo,
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
946 const int force, void** spu)
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
947 {
27840
0073bd183787 vobsub: move extradata out of vobsub_t struct
aurel
parents: 27839
diff changeset
948 unsigned char *extradata = NULL;
0073bd183787 vobsub: move extradata out of vobsub_t struct
aurel
parents: 27839
diff changeset
949 unsigned int extradata_len = 0;
25431
40bda123d2e7 Use calloc instead of malloc when allocate vobsub_t.
ulion
parents: 25361
diff changeset
950 vobsub_t *vob = calloc(1, sizeof(vobsub_t));
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
951 if (spu)
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
952 *spu = NULL;
25251
80804f0631f4 Skip empty vobsub streams when selecting subtitles.
ulion
parents: 25249
diff changeset
953 if (vobsubid == -2)
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
954 vobsubid = vobsub_id;
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
955 if (vob) {
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
956 char *buf;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
957 buf = malloc(strlen(name) + 5);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
958 if (buf) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
959 rar_stream_t *fd;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
960 mpeg_t *mpg;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
961 /* read in the info file */
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
962 if (!ifo) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
963 strcpy(buf, name);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
964 strcat(buf, ".ifo");
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
965 vobsub_parse_ifo(vob, buf, vob->palette, &vob->orig_frame_width, &vob->orig_frame_height, force, -1, NULL);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
966 } else
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
967 vobsub_parse_ifo(vob, ifo, vob->palette, &vob->orig_frame_width, &vob->orig_frame_height, force, -1, NULL);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
968 /* read in the index */
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
969 strcpy(buf, name);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
970 strcat(buf, ".idx");
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
971 fd = rar_open(buf, "rb");
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
972 if (fd == NULL) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
973 if (force)
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
974 mp_msg(MSGT_VOBSUB, MSGL_ERR, "VobSub: Can't open IDX file\n");
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
975 else {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
976 free(buf);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
977 free(vob);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
978 return NULL;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
979 }
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
980 } else {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
981 while (vobsub_parse_one_line(vob, fd, &extradata, &extradata_len) >= 0)
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
982 /* NOOP */ ;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
983 rar_close(fd);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
984 }
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
985 if (spu)
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
986 *spu = spudec_new_scaled(vob->palette, vob->orig_frame_width, vob->orig_frame_height, extradata, extradata_len);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
987 if (extradata)
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
988 free(extradata);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29250
diff changeset
989
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
990 /* read the indexed mpeg_stream */
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
991 strcpy(buf, name);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
992 strcat(buf, ".sub");
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
993 mpg = mpeg_open(buf);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
994 if (mpg == NULL) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
995 if (force)
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
996 mp_msg(MSGT_VOBSUB, MSGL_ERR, "VobSub: Can't open SUB file\n");
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
997 else {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
998 free(buf);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
999 free(vob);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1000 return NULL;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1001 }
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1002 } else {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1003 long last_pts_diff = 0;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1004 while (!mpeg_eof(mpg)) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1005 off_t pos = mpeg_tell(mpg);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1006 if (mpeg_run(mpg) < 0) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1007 if (!mpeg_eof(mpg))
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1008 mp_msg(MSGT_VOBSUB, MSGL_ERR, "VobSub: mpeg_run error\n");
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1009 break;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1010 }
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1011 if (mpg->packet_size) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1012 if ((mpg->aid & 0xe0) == 0x20) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1013 unsigned int sid = mpg->aid & 0x1f;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1014 if (vobsub_ensure_spu_stream(vob, sid) >= 0) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1015 packet_queue_t *queue = vob->spu_streams + sid;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1016 /* get the packet to fill */
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1017 if (queue->packets_size == 0 && packet_queue_grow(queue) < 0)
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1018 abort();
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1019 while (queue->current_index + 1 < queue->packets_size
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1020 && queue->packets[queue->current_index + 1].filepos <= pos)
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1021 ++queue->current_index;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1022 if (queue->current_index < queue->packets_size) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1023 packet_t *pkt;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1024 if (queue->packets[queue->current_index].data) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1025 /* insert a new packet and fix the PTS ! */
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1026 packet_queue_insert(queue);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1027 queue->packets[queue->current_index].pts100 =
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1028 mpg->pts + last_pts_diff;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1029 }
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1030 pkt = queue->packets + queue->current_index;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1031 if (pkt->pts100 != UINT_MAX) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1032 if (queue->packets_size > 1)
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1033 last_pts_diff = pkt->pts100 - mpg->pts;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1034 else
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1035 pkt->pts100 = mpg->pts;
31721
f9eee489ab45 Only try to merge packets if we have a previous packet stored.
reimar
parents: 31511
diff changeset
1036 if (mpg->merge && queue->current_index > 0) {
31062
84800a0b2ba7 New hack for vobsub packet merging.
iive
parents: 30429
diff changeset
1037 packet_t *last = &queue->packets[queue->current_index - 1];
84800a0b2ba7 New hack for vobsub packet merging.
iive
parents: 30429
diff changeset
1038 pkt->pts100 = last->pts100;
84800a0b2ba7 New hack for vobsub packet merging.
iive
parents: 30429
diff changeset
1039 }
31721
f9eee489ab45 Only try to merge packets if we have a previous packet stored.
reimar
parents: 31511
diff changeset
1040 mpg->merge = 0;
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1041 /* FIXME: should not use mpg_sub internal informations, make a copy */
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1042 pkt->data = mpg->packet;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1043 pkt->size = mpg->packet_size;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1044 mpg->packet = NULL;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1045 mpg->packet_reserve = 0;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1046 mpg->packet_size = 0;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1047 }
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1048 }
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1049 } else
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1050 mp_msg(MSGT_VOBSUB, MSGL_WARN, "don't know what to do with subtitle #%u\n", sid);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1051 }
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1052 }
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1053 }
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1054 vob->spu_streams_current = vob->spu_streams_size;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1055 while (vob->spu_streams_current-- > 0) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1056 vob->spu_streams[vob->spu_streams_current].current_index = 0;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1057 if (vobsubid == vob->spu_streams_current ||
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1058 vob->spu_streams[vob->spu_streams_current].packets_size > 0)
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1059 ++vob->spu_valid_streams_size;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1060 }
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1061 mpeg_free(mpg);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1062 }
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1063 free(buf);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1064 }
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
1065 }
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
1066 return vob;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
1067 }
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
1068
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1069 void vobsub_close(void *this)
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
1070 {
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
1071 vobsub_t *vob = (vobsub_t *)this;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
1072 if (vob->spu_streams) {
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1073 while (vob->spu_streams_size--)
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1074 packet_queue_destroy(vob->spu_streams + vob->spu_streams_size);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1075 free(vob->spu_streams);
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
1076 }
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
1077 free(vob);
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
1078 }
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
1079
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1080 unsigned int vobsub_get_indexes_count(void *vobhandle)
7780
9806d65986e4 Mplayer can switch between subtitles of different languages during
kmkaplan
parents: 7446
diff changeset
1081 {
9806d65986e4 Mplayer can switch between subtitles of different languages during
kmkaplan
parents: 7446
diff changeset
1082 vobsub_t *vob = (vobsub_t *) vobhandle;
25251
80804f0631f4 Skip empty vobsub streams when selecting subtitles.
ulion
parents: 25249
diff changeset
1083 return vob->spu_valid_streams_size;
7780
9806d65986e4 Mplayer can switch between subtitles of different languages during
kmkaplan
parents: 7446
diff changeset
1084 }
9806d65986e4 Mplayer can switch between subtitles of different languages during
kmkaplan
parents: 7446
diff changeset
1085
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1086 char *vobsub_get_id(void *vobhandle, unsigned int index)
7780
9806d65986e4 Mplayer can switch between subtitles of different languages during
kmkaplan
parents: 7446
diff changeset
1087 {
9806d65986e4 Mplayer can switch between subtitles of different languages during
kmkaplan
parents: 7446
diff changeset
1088 vobsub_t *vob = (vobsub_t *) vobhandle;
9806d65986e4 Mplayer can switch between subtitles of different languages during
kmkaplan
parents: 7446
diff changeset
1089 return (index < vob->spu_streams_size) ? vob->spu_streams[index].id : NULL;
9806d65986e4 Mplayer can switch between subtitles of different languages during
kmkaplan
parents: 7446
diff changeset
1090 }
9806d65986e4 Mplayer can switch between subtitles of different languages during
kmkaplan
parents: 7446
diff changeset
1091
25251
80804f0631f4 Skip empty vobsub streams when selecting subtitles.
ulion
parents: 25249
diff changeset
1092 int vobsub_get_id_by_index(void *vobhandle, unsigned int index)
80804f0631f4 Skip empty vobsub streams when selecting subtitles.
ulion
parents: 25249
diff changeset
1093 {
80804f0631f4 Skip empty vobsub streams when selecting subtitles.
ulion
parents: 25249
diff changeset
1094 vobsub_t *vob = vobhandle;
80804f0631f4 Skip empty vobsub streams when selecting subtitles.
ulion
parents: 25249
diff changeset
1095 int i, j;
80804f0631f4 Skip empty vobsub streams when selecting subtitles.
ulion
parents: 25249
diff changeset
1096 if (vob == NULL)
80804f0631f4 Skip empty vobsub streams when selecting subtitles.
ulion
parents: 25249
diff changeset
1097 return -1;
80804f0631f4 Skip empty vobsub streams when selecting subtitles.
ulion
parents: 25249
diff changeset
1098 for (i = 0, j = 0; i < vob->spu_streams_size; ++i)
80804f0631f4 Skip empty vobsub streams when selecting subtitles.
ulion
parents: 25249
diff changeset
1099 if (i == vobsubid || vob->spu_streams[i].packets_size > 0) {
80804f0631f4 Skip empty vobsub streams when selecting subtitles.
ulion
parents: 25249
diff changeset
1100 if (j == index)
80804f0631f4 Skip empty vobsub streams when selecting subtitles.
ulion
parents: 25249
diff changeset
1101 return i;
80804f0631f4 Skip empty vobsub streams when selecting subtitles.
ulion
parents: 25249
diff changeset
1102 ++j;
80804f0631f4 Skip empty vobsub streams when selecting subtitles.
ulion
parents: 25249
diff changeset
1103 }
80804f0631f4 Skip empty vobsub streams when selecting subtitles.
ulion
parents: 25249
diff changeset
1104 return -1;
80804f0631f4 Skip empty vobsub streams when selecting subtitles.
ulion
parents: 25249
diff changeset
1105 }
80804f0631f4 Skip empty vobsub streams when selecting subtitles.
ulion
parents: 25249
diff changeset
1106
80804f0631f4 Skip empty vobsub streams when selecting subtitles.
ulion
parents: 25249
diff changeset
1107 int vobsub_get_index_by_id(void *vobhandle, int id)
80804f0631f4 Skip empty vobsub streams when selecting subtitles.
ulion
parents: 25249
diff changeset
1108 {
80804f0631f4 Skip empty vobsub streams when selecting subtitles.
ulion
parents: 25249
diff changeset
1109 vobsub_t *vob = vobhandle;
80804f0631f4 Skip empty vobsub streams when selecting subtitles.
ulion
parents: 25249
diff changeset
1110 int i, j;
80804f0631f4 Skip empty vobsub streams when selecting subtitles.
ulion
parents: 25249
diff changeset
1111 if (vob == NULL || id < 0 || id >= vob->spu_streams_size)
80804f0631f4 Skip empty vobsub streams when selecting subtitles.
ulion
parents: 25249
diff changeset
1112 return -1;
80804f0631f4 Skip empty vobsub streams when selecting subtitles.
ulion
parents: 25249
diff changeset
1113 if (id != vobsubid && !vob->spu_streams[id].packets_size)
80804f0631f4 Skip empty vobsub streams when selecting subtitles.
ulion
parents: 25249
diff changeset
1114 return -1;
80804f0631f4 Skip empty vobsub streams when selecting subtitles.
ulion
parents: 25249
diff changeset
1115 for (i = 0, j = 0; i < id; ++i)
80804f0631f4 Skip empty vobsub streams when selecting subtitles.
ulion
parents: 25249
diff changeset
1116 if (i == vobsubid || vob->spu_streams[i].packets_size > 0)
80804f0631f4 Skip empty vobsub streams when selecting subtitles.
ulion
parents: 25249
diff changeset
1117 ++j;
80804f0631f4 Skip empty vobsub streams when selecting subtitles.
ulion
parents: 25249
diff changeset
1118 return j;
80804f0631f4 Skip empty vobsub streams when selecting subtitles.
ulion
parents: 25249
diff changeset
1119 }
80804f0631f4 Skip empty vobsub streams when selecting subtitles.
ulion
parents: 25249
diff changeset
1120
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1121 int vobsub_set_from_lang(void *vobhandle, unsigned char * lang)
8535
bc7bd163fff9 Here is the patch to make vobsub subtitle use -slang option, I have not made a
arpi
parents: 8203
diff changeset
1122 {
bc7bd163fff9 Here is the patch to make vobsub subtitle use -slang option, I have not made a
arpi
parents: 8203
diff changeset
1123 int i;
bc7bd163fff9 Here is the patch to make vobsub subtitle use -slang option, I have not made a
arpi
parents: 8203
diff changeset
1124 vobsub_t *vob= (vobsub_t *) vobhandle;
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1125 while (lang && strlen(lang) >= 2) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1126 for (i = 0; i < vob->spu_streams_size; i++)
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1127 if (vob->spu_streams[i].id)
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1128 if ((strncmp(vob->spu_streams[i].id, lang, 2) == 0)) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1129 vobsub_id = i;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1130 mp_msg(MSGT_VOBSUB, MSGL_INFO, "Selected VOBSUB language: %d language: %s\n", i, vob->spu_streams[i].id);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1131 return 0;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1132 }
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1133 lang+=2;while (lang[0]==',' || lang[0]==' ') ++lang;
8535
bc7bd163fff9 Here is the patch to make vobsub subtitle use -slang option, I have not made a
arpi
parents: 8203
diff changeset
1134 }
11695
d20be105e8f0 fix typo
nexus
parents: 11594
diff changeset
1135 mp_msg(MSGT_VOBSUB, MSGL_WARN, "No matching VOBSUB language found!\n");
8535
bc7bd163fff9 Here is the patch to make vobsub subtitle use -slang option, I have not made a
arpi
parents: 8203
diff changeset
1136 return -1;
bc7bd163fff9 Here is the patch to make vobsub subtitle use -slang option, I have not made a
arpi
parents: 8203
diff changeset
1137 }
25322
078bdfd44751 Fix spudec to display current vobsub immediately after a seek.
ulion
parents: 25298
diff changeset
1138
25791
5448bd27b954 Fix vobsub_seek use same reseek method as vobsub_get_packet did.
ulion
parents: 25746
diff changeset
1139 /// make sure we seek to the first packet of packets having same pts values.
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1140 static void vobsub_queue_reseek(packet_queue_t *queue, unsigned int pts100)
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1141 {
25322
078bdfd44751 Fix spudec to display current vobsub immediately after a seek.
ulion
parents: 25298
diff changeset
1142 int reseek_count = 0;
078bdfd44751 Fix spudec to display current vobsub immediately after a seek.
ulion
parents: 25298
diff changeset
1143 unsigned int lastpts = 0;
26733
99458e732ebd Add detection code for abnormal pts jump when seeking previous.
ulion
parents: 26732
diff changeset
1144
99458e732ebd Add detection code for abnormal pts jump when seeking previous.
ulion
parents: 26732
diff changeset
1145 if (queue->current_index > 0
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1146 && (queue->packets[queue->current_index].pts100 == UINT_MAX
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1147 || queue->packets[queue->current_index].pts100 > pts100)) {
26733
99458e732ebd Add detection code for abnormal pts jump when seeking previous.
ulion
parents: 26732
diff changeset
1148 // possible pts seek previous, try to check it.
99458e732ebd Add detection code for abnormal pts jump when seeking previous.
ulion
parents: 26732
diff changeset
1149 int i = 1;
99458e732ebd Add detection code for abnormal pts jump when seeking previous.
ulion
parents: 26732
diff changeset
1150 while (queue->current_index >= i
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1151 && queue->packets[queue->current_index-i].pts100 == UINT_MAX)
26733
99458e732ebd Add detection code for abnormal pts jump when seeking previous.
ulion
parents: 26732
diff changeset
1152 ++i;
99458e732ebd Add detection code for abnormal pts jump when seeking previous.
ulion
parents: 26732
diff changeset
1153 if (queue->current_index >= i
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1154 && queue->packets[queue->current_index-i].pts100 > pts100)
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1155 // pts seek previous confirmed, reseek from beginning
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1156 queue->current_index = 0;
26733
99458e732ebd Add detection code for abnormal pts jump when seeking previous.
ulion
parents: 26732
diff changeset
1157 }
25322
078bdfd44751 Fix spudec to display current vobsub immediately after a seek.
ulion
parents: 25298
diff changeset
1158 while (queue->current_index < queue->packets_size
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1159 && queue->packets[queue->current_index].pts100 <= pts100) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1160 lastpts = queue->packets[queue->current_index].pts100;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1161 ++queue->current_index;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1162 ++reseek_count;
25322
078bdfd44751 Fix spudec to display current vobsub immediately after a seek.
ulion
parents: 25298
diff changeset
1163 }
25746
330af0160c2d Fix code to prevent from accessing queue->packets[-1].pts that causes a crash.
ulion
parents: 25443
diff changeset
1164 while (reseek_count-- && --queue->current_index) {
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1165 if (queue->packets[queue->current_index-1].pts100 != UINT_MAX &&
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1166 queue->packets[queue->current_index-1].pts100 != lastpts)
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1167 break;
25322
078bdfd44751 Fix spudec to display current vobsub immediately after a seek.
ulion
parents: 25298
diff changeset
1168 }
25791
5448bd27b954 Fix vobsub_seek use same reseek method as vobsub_get_packet did.
ulion
parents: 25746
diff changeset
1169 }
5448bd27b954 Fix vobsub_seek use same reseek method as vobsub_get_packet did.
ulion
parents: 25746
diff changeset
1170
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1171 int vobsub_get_packet(void *vobhandle, float pts, void** data, int* timestamp)
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1172 {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1173 vobsub_t *vob = (vobsub_t *)vobhandle;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1174 unsigned int pts100 = 90000 * pts;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1175 if (vob->spu_streams && 0 <= vobsub_id && (unsigned) vobsub_id < vob->spu_streams_size) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1176 packet_queue_t *queue = vob->spu_streams + vobsub_id;
25791
5448bd27b954 Fix vobsub_seek use same reseek method as vobsub_get_packet did.
ulion
parents: 25746
diff changeset
1177
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1178 vobsub_queue_reseek(queue, pts100);
25322
078bdfd44751 Fix spudec to display current vobsub immediately after a seek.
ulion
parents: 25298
diff changeset
1179
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1180 while (queue->current_index < queue->packets_size) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1181 packet_t *pkt = queue->packets + queue->current_index;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1182 if (pkt->pts100 != UINT_MAX)
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1183 if (pkt->pts100 <= pts100) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1184 ++queue->current_index;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1185 *data = pkt->data;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1186 *timestamp = pkt->pts100;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1187 return pkt->size;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1188 } else
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1189 break;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1190 else
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1191 ++queue->current_index;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1192 }
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
1193 }
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1194 return -1;
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
1195 }
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
1196
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1197 int vobsub_get_next_packet(void *vobhandle, void** data, int* timestamp)
6829
d7db9f1b1d36 New function vobsub_get_next_packet for subrip.
kmkaplan
parents: 6827
diff changeset
1198 {
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1199 vobsub_t *vob = (vobsub_t *)vobhandle;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1200 if (vob->spu_streams && 0 <= vobsub_id && (unsigned) vobsub_id < vob->spu_streams_size) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1201 packet_queue_t *queue = vob->spu_streams + vobsub_id;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1202 if (queue->current_index < queue->packets_size) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1203 packet_t *pkt = queue->packets + queue->current_index;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1204 ++queue->current_index;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1205 *data = pkt->data;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1206 *timestamp = pkt->pts100;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1207 return pkt->size;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1208 }
6829
d7db9f1b1d36 New function vobsub_get_next_packet for subrip.
kmkaplan
parents: 6827
diff changeset
1209 }
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1210 return -1;
6829
d7db9f1b1d36 New function vobsub_get_next_packet for subrip.
kmkaplan
parents: 6827
diff changeset
1211 }
d7db9f1b1d36 New function vobsub_get_next_packet for subrip.
kmkaplan
parents: 6827
diff changeset
1212
11589
5cff0d11b47b vobsub seeking support by Lu Ran
alex
parents: 11309
diff changeset
1213 void vobsub_seek(void * vobhandle, float pts)
5cff0d11b47b vobsub seeking support by Lu Ran
alex
parents: 11309
diff changeset
1214 {
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1215 vobsub_t * vob = (vobsub_t *)vobhandle;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1216 packet_queue_t * queue;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1217 int seek_pts100 = pts * 90000;
11589
5cff0d11b47b vobsub seeking support by Lu Ran
alex
parents: 11309
diff changeset
1218
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1219 if (vob->spu_streams && 0 <= vobsub_id && (unsigned) vobsub_id < vob->spu_streams_size) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1220 /* do not seek if we don't know the id */
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1221 if (vobsub_get_id(vob, vobsub_id) == NULL)
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1222 return;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1223 queue = vob->spu_streams + vobsub_id;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1224 queue->current_index = 0;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1225 vobsub_queue_reseek(queue, seek_pts100);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1226 }
11589
5cff0d11b47b vobsub seeking support by Lu Ran
alex
parents: 11309
diff changeset
1227 }
5cff0d11b47b vobsub seeking support by Lu Ran
alex
parents: 11309
diff changeset
1228
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1229 void vobsub_reset(void *vobhandle)
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
1230 {
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
1231 vobsub_t *vob = (vobsub_t *)vobhandle;
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
1232 if (vob->spu_streams) {
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1233 unsigned int n = vob->spu_streams_size;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1234 while (n-- > 0)
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1235 vob->spu_streams[n].current_index = 0;
4080
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
1236 }
47bcafe1442e Add vobsub support.
kmkaplan
parents:
diff changeset
1237 }
6674
f8551f89dd48 MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents: 6163
diff changeset
1238
f8551f89dd48 MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents: 6163
diff changeset
1239 /**********************************************************************
f8551f89dd48 MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents: 6163
diff changeset
1240 * Vobsub output
f8551f89dd48 MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents: 6163
diff changeset
1241 **********************************************************************/
f8551f89dd48 MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents: 6163
diff changeset
1242
f8551f89dd48 MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents: 6163
diff changeset
1243 typedef struct {
f8551f89dd48 MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents: 6163
diff changeset
1244 FILE *fsub;
f8551f89dd48 MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents: 6163
diff changeset
1245 FILE *fidx;
f8551f89dd48 MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents: 6163
diff changeset
1246 unsigned int aid;
f8551f89dd48 MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents: 6163
diff changeset
1247 } vobsub_out_t;
f8551f89dd48 MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents: 6163
diff changeset
1248
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1249 static void create_idx(vobsub_out_t *me, const unsigned int *palette,
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1250 unsigned int orig_width, unsigned int orig_height)
6674
f8551f89dd48 MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents: 6163
diff changeset
1251 {
f8551f89dd48 MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents: 6163
diff changeset
1252 int i;
f8551f89dd48 MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents: 6163
diff changeset
1253 fprintf(me->fidx,
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1254 "# VobSub index file, v7 (do not modify this line!)\n"
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1255 "#\n"
31511
13ca93203358 Factorize MPlayer/MEncoder version string handling.
diego
parents: 31062
diff changeset
1256 "# Generated by %s\n"
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1257 "# See <URL:http://www.mplayerhq.hu/> for more information about MPlayer\n"
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1258 "# See <URL:http://wiki.multimedia.cx/index.php?title=VOBsub> for more information about Vobsub\n"
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1259 "#\n"
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1260 "size: %ux%u\n",
31511
13ca93203358 Factorize MPlayer/MEncoder version string handling.
diego
parents: 31062
diff changeset
1261 mplayer_version, orig_width, orig_height);
6674
f8551f89dd48 MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents: 6163
diff changeset
1262 if (palette) {
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1263 fputs("palette:", me->fidx);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1264 for (i = 0; i < 16; ++i) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1265 const double y = palette[i] >> 16 & 0xff,
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1266 u = (palette[i] >> 8 & 0xff) - 128.0,
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1267 v = (palette[i] & 0xff) - 128.0;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1268 if (i)
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1269 putc(',', me->fidx);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1270 fprintf(me->fidx, " %02x%02x%02x",
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1271 av_clip_uint8(y + 1.4022 * u),
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1272 av_clip_uint8(y - 0.3456 * u - 0.7145 * v),
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1273 av_clip_uint8(y + 1.7710 * v));
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1274 }
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1275 putc('\n', me->fidx);
6674
f8551f89dd48 MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents: 6163
diff changeset
1276 }
10917
d45870f67728 Forced subtitles patch by Arne Driescher <driescher@mpi-magdeburg.mpg.de>
attila
parents: 10893
diff changeset
1277
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1278 fprintf(me->fidx, "# ON: displays only forced subtitles, OFF: shows everything\n"
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1279 "forced subs: OFF\n");
6674
f8551f89dd48 MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents: 6163
diff changeset
1280 }
f8551f89dd48 MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents: 6163
diff changeset
1281
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1282 void *vobsub_out_open(const char *basename, const unsigned int *palette,
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1283 unsigned int orig_width, unsigned int orig_height,
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1284 const char *id, unsigned int index)
6674
f8551f89dd48 MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents: 6163
diff changeset
1285 {
f8551f89dd48 MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents: 6163
diff changeset
1286 vobsub_out_t *result = NULL;
f8551f89dd48 MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents: 6163
diff changeset
1287 char *filename;
f8551f89dd48 MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents: 6163
diff changeset
1288 filename = malloc(strlen(basename) + 5);
f8551f89dd48 MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents: 6163
diff changeset
1289 if (filename) {
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1290 result = malloc(sizeof(vobsub_out_t));
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1291 if (result) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1292 result->aid = index;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1293 strcpy(filename, basename);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1294 strcat(filename, ".sub");
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1295 result->fsub = fopen(filename, "ab");
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1296 if (result->fsub == NULL)
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1297 perror("Error: vobsub_out_open subtitle file open failed");
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1298 strcpy(filename, basename);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1299 strcat(filename, ".idx");
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1300 result->fidx = fopen(filename, "ab");
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1301 if (result->fidx) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1302 if (ftell(result->fidx) == 0) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1303 create_idx(result, palette, orig_width, orig_height);
8014
3d6904cee13e The first language ripped is set as the default language
arpi
parents: 7780
diff changeset
1304 /* Make the selected language the default language */
3d6904cee13e The first language ripped is set as the default language
arpi
parents: 7780
diff changeset
1305 fprintf(result->fidx, "\n# Language index in use\nlangidx: %u\n", index);
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1306 }
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1307 fprintf(result->fidx, "\nid: %s, index: %u\n", id ? id : "xx", index);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1308 /* So that we can check the file now */
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1309 fflush(result->fidx);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1310 } else
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1311 perror("Error: vobsub_out_open index file open failed");
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1312 free(filename);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1313 }
6674
f8551f89dd48 MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents: 6163
diff changeset
1314 }
f8551f89dd48 MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents: 6163
diff changeset
1315 return result;
f8551f89dd48 MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents: 6163
diff changeset
1316 }
f8551f89dd48 MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents: 6163
diff changeset
1317
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1318 void vobsub_out_close(void *me)
6674
f8551f89dd48 MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents: 6163
diff changeset
1319 {
f8551f89dd48 MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents: 6163
diff changeset
1320 vobsub_out_t *vob = (vobsub_out_t*)me;
f8551f89dd48 MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents: 6163
diff changeset
1321 if (vob->fidx)
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1322 fclose(vob->fidx);
6674
f8551f89dd48 MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents: 6163
diff changeset
1323 if (vob->fsub)
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1324 fclose(vob->fsub);
6674
f8551f89dd48 MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents: 6163
diff changeset
1325 free(vob);
f8551f89dd48 MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents: 6163
diff changeset
1326 }
f8551f89dd48 MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents: 6163
diff changeset
1327
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1328 void vobsub_out_output(void *me, const unsigned char *packet,
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1329 int len, double pts)
6674
f8551f89dd48 MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents: 6163
diff changeset
1330 {
6706
e1428c2c971f Lots of compatibility fixes for Windows' Vobsub reader.
kmkaplan
parents: 6674
diff changeset
1331 static double last_pts;
e1428c2c971f Lots of compatibility fixes for Windows' Vobsub reader.
kmkaplan
parents: 6674
diff changeset
1332 static int last_pts_set = 0;
6674
f8551f89dd48 MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents: 6163
diff changeset
1333 vobsub_out_t *vob = (vobsub_out_t*)me;
f8551f89dd48 MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents: 6163
diff changeset
1334 if (vob->fsub) {
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1335 /* Windows' Vobsub require that every packet is exactly 2kB long */
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1336 unsigned char buffer[2048];
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1337 unsigned char *p;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1338 int remain = 2048;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1339 /* Do not output twice a line with the same timestamp, this
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1340 breaks Windows' Vobsub */
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1341 if (vob->fidx && (!last_pts_set || last_pts != pts)) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1342 static unsigned int last_h = 9999, last_m = 9999, last_s = 9999, last_ms = 9999;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1343 unsigned int h, m, ms;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1344 double s;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1345 s = pts;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1346 h = s / 3600;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1347 s -= h * 3600;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1348 m = s / 60;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1349 s -= m * 60;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1350 ms = (s - (unsigned int) s) * 1000;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1351 if (ms >= 1000) /* prevent overfolws or bad float stuff */
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1352 ms = 0;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1353 if (h != last_h || m != last_m || (unsigned int) s != last_s || ms != last_ms) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1354 fprintf(vob->fidx, "timestamp: %02u:%02u:%02u:%03u, filepos: %09lx\n",
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1355 h, m, (unsigned int) s, ms, ftell(vob->fsub));
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1356 last_h = h;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1357 last_m = m;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1358 last_s = (unsigned int) s;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1359 last_ms = ms;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1360 }
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1361 }
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1362 last_pts = pts;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1363 last_pts_set = 1;
6706
e1428c2c971f Lots of compatibility fixes for Windows' Vobsub reader.
kmkaplan
parents: 6674
diff changeset
1364
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1365 /* Packet start code: Windows' Vobsub needs this */
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1366 p = buffer;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1367 *p++ = 0; /* 0x00 */
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1368 *p++ = 0;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1369 *p++ = 1;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1370 *p++ = 0xba;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1371 *p++ = 0x40;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1372 memset(p, 0, 9);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1373 p += 9;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1374 { /* Packet */
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1375 static unsigned char last_pts[5] = { 0, 0, 0, 0, 0};
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1376 unsigned char now_pts[5];
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1377 int pts_len, pad_len, datalen = len;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1378 pts *= 90000;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1379 now_pts[0] = 0x21 | (((unsigned long)pts >> 29) & 0x0e);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1380 now_pts[1] = ((unsigned long)pts >> 22) & 0xff;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1381 now_pts[2] = 0x01 | (((unsigned long)pts >> 14) & 0xfe);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1382 now_pts[3] = ((unsigned long)pts >> 7) & 0xff;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1383 now_pts[4] = 0x01 | (((unsigned long)pts << 1) & 0xfe);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1384 pts_len = memcmp(last_pts, now_pts, sizeof(now_pts)) ? sizeof(now_pts) : 0;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1385 memcpy(last_pts, now_pts, sizeof(now_pts));
6706
e1428c2c971f Lots of compatibility fixes for Windows' Vobsub reader.
kmkaplan
parents: 6674
diff changeset
1386
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1387 datalen += 3; /* Version, PTS_flags, pts_len */
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1388 datalen += pts_len;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1389 datalen += 1; /* AID */
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1390 pad_len = 2048 - (p - buffer) - 4 /* MPEG ID */ - 2 /* payload len */ - datalen;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1391 /* XXX - Go figure what should go here! In any case the
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1392 packet has to be completly filled. If I can fill it
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1393 with padding (0x000001be) latter I'll do that. But if
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1394 there is only room for 6 bytes then I can not write a
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1395 padding packet. So I add some padding in the PTS
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1396 field. This looks like a dirty kludge. Oh well... */
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1397 if (pad_len < 0) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1398 /* Packet is too big. Let's try ommiting the PTS field */
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1399 datalen -= pts_len;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1400 pts_len = 0;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1401 pad_len = 0;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1402 } else if (pad_len > 6)
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1403 pad_len = 0;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1404 datalen += pad_len;
6706
e1428c2c971f Lots of compatibility fixes for Windows' Vobsub reader.
kmkaplan
parents: 6674
diff changeset
1405
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1406 *p++ = 0; /* 0x0e */
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1407 *p++ = 0;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1408 *p++ = 1;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1409 *p++ = 0xbd;
6706
e1428c2c971f Lots of compatibility fixes for Windows' Vobsub reader.
kmkaplan
parents: 6674
diff changeset
1410
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1411 *p++ = (datalen >> 8) & 0xff; /* length of payload */
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1412 *p++ = datalen & 0xff;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1413 *p++ = 0x80; /* System-2 (.VOB) stream */
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1414 *p++ = pts_len ? 0x80 : 0x00; /* pts_flags */
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1415 *p++ = pts_len + pad_len;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1416 memcpy(p, now_pts, pts_len);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1417 p += pts_len;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1418 memset(p, 0, pad_len);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1419 p += pad_len;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1420 }
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1421 *p++ = 0x20 | vob->aid; /* aid */
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1422 if (fwrite(buffer, p - buffer, 1, vob->fsub) != 1
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1423 || fwrite(packet, len, 1, vob->fsub) != 1)
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1424 perror("ERROR: vobsub write failed");
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1425 else
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1426 remain -= p - buffer + len;
6706
e1428c2c971f Lots of compatibility fixes for Windows' Vobsub reader.
kmkaplan
parents: 6674
diff changeset
1427
30094
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1428 /* Padding */
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1429 if (remain >= 6) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1430 p = buffer;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1431 *p++ = 0x00;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1432 *p++ = 0x00;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1433 *p++ = 0x01;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1434 *p++ = 0xbe;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1435 *p++ = (remain - 6) >> 8;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1436 *p++ = (remain - 6) & 0xff;
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1437 /* for better compression, blank this */
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1438 memset(buffer + 6, 0, remain - (p - buffer));
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1439 if (fwrite(buffer, remain, 1, vob->fsub) != 1)
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1440 perror("ERROR: vobsub padding write failed");
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1441 } else if (remain > 0) {
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1442 /* I don't know what to output. But anyway the block
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1443 needs to be 2KB big */
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1444 memset(buffer, 0, remain);
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1445 if (fwrite(buffer, remain, 1, vob->fsub) != 1)
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1446 perror("ERROR: vobsub blank padding write failed");
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1447 } else if (remain < 0)
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1448 fprintf(stderr,
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1449 "\nERROR: wrong thing happenned...\n"
5012dea094ff cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
diego
parents: 29429
diff changeset
1450 " I wrote a %i data bytes spu packet and that's too long\n", len);
6674
f8551f89dd48 MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents: 6163
diff changeset
1451 }
f8551f89dd48 MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents: 6163
diff changeset
1452 }