annotate vobsub.c @ 25341:baddb0681b2e

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