annotate vobsub.c @ 29585:a17d4f8040f1

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