Mercurial > mplayer.hg
annotate libmpdvdkit2/libdvdread_changes.diff @ 17035:78f281afea05
synced with 1.1161
author | gpoirier |
---|---|
date | Wed, 23 Nov 2005 08:26:53 +0000 |
parents | 72c1c7054ad5 |
children | b1b8ff93dc0c |
rev | line source |
---|---|
15875
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
1 diff -Naur dvdread.orig/bswap.h dvdread/bswap.h |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
2 --- dvdread.orig/bswap.h 2005-06-23 00:18:54.000000000 +0200 |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
3 +++ dvdread/bswap.h 2005-06-23 00:19:10.000000000 +0200 |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
4 @@ -20,8 +24,6 @@ |
14937 | 5 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
6 */ | |
7 | |
8 -#include <config.h> | |
9 - | |
10 #if defined(WORDS_BIGENDIAN) | |
11 /* All bigendian systems are fine, just ignore the swaps. */ | |
12 #define B2N_16(x) (void)(x) | |
15875
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
13 @@ -59,13 +61,57 @@ |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
14 #define B2N_32(x) x = be32toh(x) |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
15 #define B2N_64(x) x = be64toh(x) |
14937 | 16 |
15875
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
17 +#elif defined(__DragonFly__) |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
18 +#include <sys/endian.h> |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
19 +#define B2N_16(x) x = be16toh(x) |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
20 +#define B2N_32(x) x = be32toh(x) |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
21 +#define B2N_64(x) x = be64toh(x) |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
22 + |
14937 | 23 +#elif defined(ARCH_X86) |
24 +inline static unsigned short bswap_16(unsigned short x) | |
25 +{ | |
26 + __asm("xchgb %b0,%h0" : | |
27 + "=q" (x) : | |
28 + "0" (x)); | |
29 + return x; | |
30 +} | |
31 +#define B2N_16(x) x = bswap_16(x) | |
32 + | |
33 +inline static unsigned int bswap_32(unsigned int x) | |
34 +{ | |
35 + __asm( | |
36 +#if __CPU__ > 386 | |
37 + "bswap %0": | |
38 + "=r" (x) : | |
39 +#else | |
40 + "xchgb %b0,%h0\n" | |
41 + " rorl $16,%0\n" | |
42 + " xchgb %b0,%h0": | |
43 + "=q" (x) : | |
44 +#endif | |
45 + "0" (x)); | |
46 + return x; | |
47 +} | |
48 +#define B2N_32(x) x = bswap_32(x) | |
49 + | |
50 +inline static unsigned long long int bswap_64(unsigned long long int x) | |
51 +{ | |
52 + register union { __extension__ uint64_t __ll; | |
53 + uint32_t __l[2]; } __x; | |
54 + asm("xchgl %0,%1": | |
55 + "=r"(__x.__l[0]),"=r"(__x.__l[1]): | |
56 + "0"(bswap_32((unsigned long)x)),"1"(bswap_32((unsigned long)(x>>32)))); | |
57 + return __x.__ll; | |
58 +} | |
59 +#define B2N_64(x) x = bswap_64(x) | |
60 + | |
61 /* This is a slow but portable implementation, it has multiple evaluation | |
62 * problems so beware. | |
15875
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
63 * Old FreeBSD's and Solaris don't have <byteswap.h> or any other such |
14937 | 64 * functionality! |
65 */ | |
66 | |
67 -#elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__) | |
68 +#elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__) || defined(__CYGWIN__) | |
69 #define B2N_16(x) \ | |
70 x = ((((x) & 0xff00) >> 8) | \ | |
71 (((x) & 0x00ff) << 8)) | |
15875
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
72 diff -Naur dvdread.orig/.cvsignore dvdread/.cvsignore |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
73 diff -Naur dvdread.orig/dvd_input.c dvdread/dvd_input.c |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
74 --- dvdread.orig/dvd_input.c 2005-06-23 00:18:54.000000000 +0200 |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
75 +++ dvdread/dvd_input.c 2005-06-23 00:30:23.000000000 +0200 |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
76 @@ -37,7 +41,7 @@ |
14937 | 77 |
15875
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
78 #ifdef HAVE_DVDCSS_DVDCSS_H |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
79 /* linking to libdvdcss */ |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
80 -#include <dvdcss/dvdcss.h> |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
81 +#include "dvdcss.h" |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
82 #define DVDcss_open(a) dvdcss_open((char*)(a)) |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
83 #define DVDcss_close dvdcss_close |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
84 #define DVDcss_seek dvdcss_seek |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
85 @@ -74,7 +78,7 @@ |
14937 | 86 dvd_input_t dev; |
15875
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
87 |
14937 | 88 /* Allocate the handle structure */ |
89 - dev = (dvd_input_t) malloc(sizeof(dvd_input_t)); | |
90 + dev = (dvd_input_t) malloc(sizeof(struct dvd_input_s)); | |
91 if(dev == NULL) { | |
92 fprintf(stderr, "libdvdread: Could not allocate memory.\n"); | |
93 return NULL; | |
15875
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
94 @@ -320,8 +324,10 @@ |
14937 | 95 fprintf(stderr, "DVDCSS_METHOD %s\n", psz_method); |
96 fprintf(stderr, "DVDCSS_VERBOSE %s\n", psz_verbose); | |
97 */ | |
15875
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
98 + /* |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
99 fprintf(stderr, "libdvdread: Using libdvdcss version %s for DVD access\n", |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
100 *dvdcss_version); |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
101 + */ |
14937 | 102 |
15875
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
103 /* libdvdcss wrapper functions */ |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
104 dvdinput_open = css_open; |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
105 diff -Naur dvdread.orig/dvd_input.h dvdread/dvd_input.h |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
106 diff -Naur dvdread.orig/dvd_reader.c dvdread/dvd_reader.c |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
107 --- dvdread.orig/dvd_reader.c 2005-06-23 00:18:54.000000000 +0200 |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
108 +++ dvdread/dvd_reader.c 2005-06-23 00:19:10.000000000 +0200 |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
109 @@ -32,24 +36,36 @@ |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
110 #include <limits.h> |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
111 #include <dirent.h> |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
112 |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
113 -#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__bsdi__)|| defined(__DARWIN__) |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
114 +#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__bsdi__)|| defined(__DARWIN__) || defined(__DragonFly__) |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
115 #define SYS_BSD 1 |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
116 #endif |
14937 | 117 |
118 #if defined(__sun) | |
119 #include <sys/mnttab.h> | |
120 +#elif defined(hpux) | |
121 +#include </usr/conf/h/mnttab.h> | |
122 #elif defined(SYS_BSD) | |
123 #include <fstab.h> | |
15535 | 124 -#elif defined(__linux__) |
125 +#elif defined(__linux__) || defined(__CYGWIN__) | |
14937 | 126 #include <mntent.h> |
127 #endif | |
128 | |
129 +#ifdef __MINGW32__ | |
130 +#include <sys/timeb.h> | |
131 +static void gettimeofday(struct timeval* t,void* timezone){ | |
132 + struct timeb timebuffer; | |
133 + ftime( &timebuffer ); | |
134 + t->tv_sec=timebuffer.time; | |
135 + t->tv_usec=1000*timebuffer.millitm; | |
136 +} | |
137 +#endif | |
138 + | |
139 #include "dvd_udf.h" | |
140 #include "dvd_input.h" | |
141 #include "dvd_reader.h" | |
15875
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
142 #include "md5.h" |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
143 |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
144 -#define DEFAULT_UDF_CACHE_LEVEL 1 |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
145 +#define DEFAULT_UDF_CACHE_LEVEL 0 |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
146 |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
147 struct dvd_reader_s { |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
148 /* Basic information. */ |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
149 @@ -194,6 +210,13 @@ |
14937 | 150 } |
151 | |
152 | |
153 +#ifndef HAVE_MPLAYER | |
154 + #include "get_path.c" | |
155 +#else | |
156 + extern char * get_path( char * filename ); | |
157 +#endif | |
158 + | |
159 +//extern char * dvdcss_cache_dir; | |
160 | |
161 /** | |
162 * Open a DVD image or block device file. | |
16510 | 163 @@ -278,11 +301,16 @@ |
164 Darwin /dev/rdisk0, it needs to be the raw device | |
165 BSD/OS /dev/sr0c (if not mounted) or /dev/rsr0c ('c' any letter will do) */ | |
166 static char *bsd_block2char( const char *path ) | |
167 +#if defined(__FreeBSD__) | |
168 +{ | |
169 + return (char *) strdup( path ); | |
170 +} | |
171 +#else | |
172 { | |
14937 | 173 char *new_path; |
174 | |
175 /* If it doesn't start with "/dev/" or does start with "/dev/r" exit */ | |
176 - if( !strncmp( path, "/dev/", 5 ) || strncmp( path, "/dev/r", 6 ) ) | |
177 + if( strncmp( path, "/dev/", 5 ) || !strncmp( path, "/dev/r", 6 ) ) | |
178 return (char *) strdup( path ); | |
179 | |
180 /* Replace "/dev/" with "/dev/r" */ | |
16510 | 181 @@ -292,6 +320,7 @@ |
182 | |
183 return new_path; | |
184 } | |
185 +#endif /* __FreeBSD__ */ | |
186 #endif | |
187 | |
188 dvd_reader_t *DVDOpen( const char *path ) | |
189 @@ -303,6 +332,16 @@ | |
15875
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
190 if( path == NULL ) |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
191 return 0; |
14937 | 192 |
193 +#ifdef WIN32 | |
194 + /* Stat doesn't work on devices under mingwin/cygwin. */ | |
195 + if( path[0] && path[1] == ':' && path[2] == '\0' ) | |
196 + { | |
197 + /* Don't try to stat the file */ | |
198 + fileinfo.st_mode = S_IFBLK; | |
199 + } | |
200 + else | |
201 +#endif | |
202 + { | |
203 ret = stat( path, &fileinfo ); | |
204 if( ret < 0 ) { | |
205 /* If we can't stat the file, give up */ | |
16510 | 206 @@ -310,6 +349,7 @@ |
14937 | 207 perror(""); |
208 return 0; | |
209 } | |
210 + } | |
211 | |
212 /* Try to open libdvdcss or fall back to standard functions */ | |
15875
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
213 have_css = dvdinput_setup(); |
16510 | 214 @@ -335,7 +375,7 @@ |
15535 | 215 char *path_copy; |
216 #if defined(SYS_BSD) | |
217 struct fstab* fe; | |
218 -#elif defined(__sun) || defined(__linux__) | |
219 +#elif defined(__sun) || defined(__linux__) || defined(__CYGWIN__) | |
220 FILE *mntfile; | |
221 #endif | |
222 | |
16510 | 223 @@ -350,7 +390,9 @@ |
14937 | 224 if( cdir >= 0 ) { |
225 chdir( path_copy ); | |
226 new_path = getcwd( NULL, PATH_MAX ); | |
227 +#ifndef __MINGW32__ | |
228 fchdir( cdir ); | |
229 +#endif | |
230 close( cdir ); | |
231 if( new_path ) { | |
232 free( path_copy ); | |
16510 | 233 @@ -406,7 +448,7 @@ |
15535 | 234 } |
235 fclose( mntfile ); | |
236 } | |
237 -#elif defined(__linux__) | |
238 +#elif defined(__linux__) || defined(__CYGWIN__) | |
239 mntfile = fopen( MOUNTED, "r" ); | |
240 if( mntfile ) { | |
241 struct mntent *me; | |
16510 | 242 @@ -425,6 +467,9 @@ |
14937 | 243 } |
244 fclose( mntfile ); | |
245 } | |
15535 | 246 +#elif defined(__MINGW32__) |
14937 | 247 + dev_name = strdup(path); |
248 + auth_drive = DVDOpenImageFile( path, have_css ); | |
249 #endif | |
250 if( !dev_name ) { | |
251 fprintf( stderr, "libdvdread: Couldn't find device name.\n" ); | |
16510 | 252 @@ -615,8 +660,8 @@ |
14937 | 253 } |
254 | |
255 if( dvd->css_state == 1 /* Need key init */ ) { | |
256 - initAllCSSKeys( dvd ); | |
257 - dvd->css_state = 2; | |
258 +// initAllCSSKeys( dvd ); | |
259 +// dvd->css_state = 2; | |
260 } | |
261 /* | |
15875
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
262 if( dvdinput_title( dvd_file->dvd->dev, (int)start ) < 0 ) { |
16510 | 263 @@ -915,7 +960,7 @@ |
14937 | 264 return (ssize_t)ret; |
265 } | |
266 | |
267 -int32_t DVDFileSeek( dvd_file_t *dvd_file, int32_t offset ) | |
268 +int DVDFileSeek( dvd_file_t *dvd_file, int offset ) | |
269 { | |
15875
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
270 /* Check arguments. */ |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
271 if( dvd_file == NULL || offset < 0 ) |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
272 diff -Naur dvdread.orig/dvdread_internal.h dvdread/dvdread_internal.h |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
273 --- dvdread.orig/dvdread_internal.h 2005-06-23 00:18:54.000000000 +0200 |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
274 +++ dvdread/dvdread_internal.h 2005-06-23 00:19:10.000000000 +0200 |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
275 @@ -2,11 +2,7 @@ |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
276 #define DVDREAD_INTERNAL_H |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
277 |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
278 |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
279 -#define CHECK_VALUE(arg) \ |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
280 - if(!(arg)) { \ |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
281 - fprintf(stderr, "\n*** libdvdread: CHECK_VALUE failed in %s:%i ***" \ |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
282 - "\n*** for %s ***\n\n", \ |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
283 - __FILE__, __LINE__, # arg ); \ |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
284 - } |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
285 +#define CHECK_VALUE(arg) |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
286 + |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
287 |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
288 #endif /* DVDREAD_INTERNAL_H */ |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
289 diff -Naur dvdread.orig/dvd_udf.c dvdread/dvd_udf.c |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
290 --- dvdread.orig/dvd_udf.c 2005-06-23 00:18:54.000000000 +0200 |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
291 +++ dvdread/dvd_udf.c 2005-06-23 00:19:10.000000000 +0200 |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
292 @@ -33,7 +37,9 @@ |
14937 | 293 #include <stdio.h> |
294 #include <stdlib.h> | |
295 #include <string.h> | |
296 +#ifndef __MINGW32__ | |
297 #include <sys/ioctl.h> | |
298 +#endif | |
299 #include <sys/types.h> | |
300 #include <sys/stat.h> | |
301 #include <unistd.h> | |
15875
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
302 diff -Naur dvdread.orig/ifo_print.c dvdread/ifo_print.c |
16659 | 303 --- dvdread.orig/ifo_print.c 30 Jun 2005 22:48:26 -0000 1.4 |
304 +++ dvdread/ifo_print.c 3 Oct 2005 14:29:01 -0000 1.5 | |
305 @@ -761,14 +761,14 @@ | |
306 ifoPrint_USER_OPS(&pgc->prohibited_ops); | |
307 | |
308 for(i = 0; i < 8; i++) { | |
309 - if(pgc->audio_control[i] & 0x8000) { /* The 'is present' bit */ | |
310 + if(pgc->audio_control[i].present) { | |
311 printf("Audio stream %i control: %04x\n", | |
312 i, pgc->audio_control[i]); | |
313 } | |
314 } | |
315 | |
316 for(i = 0; i < 32; i++) { | |
317 - if(pgc->subp_control[i] & 0x80000000) { /* The 'is present' bit */ | |
318 + if(pgc->subp_control[i].present) { | |
319 printf("Subpicture stream %2i control: %08x\n", | |
320 i, pgc->subp_control[i]); | |
321 } | |
322 | |
15875
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
323 diff -Naur dvdread.orig/ifo_print.h dvdread/ifo_print.h |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
324 diff -Naur dvdread.orig/ifo_read.c dvdread/ifo_read.c |
16659 | 325 --- dvdread.orig/ifo_read.c 30 Jun 2005 22:48:26 -0000 1.4 |
326 +++ dvdread/ifo_read.c 3 Oct 2005 14:29:01 -0000 1.5 | |
327 @@ -638,10 +638,6 @@ | |
328 B2N_16(pgc->cell_playback_offset); | |
329 B2N_16(pgc->cell_position_offset); | |
330 | |
331 - for(i = 0; i < 8; i++) | |
332 - B2N_16(pgc->audio_control[i]); | |
333 - for(i = 0; i < 32; i++) | |
334 - B2N_32(pgc->subp_control[i]); | |
335 for(i = 0; i < 16; i++) | |
336 B2N_32(pgc->palette[i]); | |
337 | |
338 @@ -650,10 +646,10 @@ | |
339 | |
340 /* verify time (look at print_time) */ | |
341 for(i = 0; i < 8; i++) | |
342 - if(!pgc->audio_control[i] & 0x8000) /* The 'is present' bit */ | |
343 + if(!pgc->audio_control[i].present) | |
344 CHECK_ZERO(pgc->audio_control[i]); | |
345 for(i = 0; i < 32; i++) | |
346 - if(!pgc->subp_control[i] & 0x80000000) /* The 'is present' bit */ | |
347 + if(!pgc->subp_control[i].present) | |
348 CHECK_ZERO(pgc->subp_control[i]); | |
349 | |
350 /* Check that time is 0:0:0:0 also if nr_of_programs == 0 */ | |
351 | |
15875
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
352 diff -Naur dvdread.orig/ifo_read.h dvdread/ifo_read.h |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
353 --- dvdread.orig/ifo_read.h 2005-06-23 00:18:54.000000000 +0200 |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
354 +++ dvdread/ifo_read.h 2005-06-23 00:19:10.000000000 +0200 |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
355 @@ -20,8 +24,8 @@ |
14937 | 356 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
357 */ | |
358 | |
359 -#include <dvdread/ifo_types.h> | |
360 -#include <dvdread/dvd_reader.h> | |
361 +#include "ifo_types.h" | |
362 +#include "dvd_reader.h" | |
363 | |
364 #ifdef __cplusplus | |
365 extern "C" { | |
15875
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
366 diff -Naur dvdread.orig/ifo_types.h dvdread/ifo_types.h |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
367 --- dvdread.orig/ifo_types.h 2005-06-23 00:18:54.000000000 +0200 |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
368 +++ dvdread/ifo_types.h 2005-06-23 00:19:10.000000000 +0200 |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
369 @@ -21,7 +25,7 @@ |
14937 | 370 */ |
371 | |
372 #include <inttypes.h> | |
373 -#include <dvdread/dvd_reader.h> | |
374 +#include "dvd_reader.h" | |
375 | |
376 | |
377 #undef ATTRIBUTE_PACKED | |
16659 | 378 @@ -398,6 +398,55 @@ |
379 } ATTRIBUTE_PACKED user_ops_t; | |
380 | |
381 /** | |
382 + * Subpicture stream mapping for a subtitle | |
383 + */ | |
384 +typedef struct { | |
385 +#ifdef WORDS_BIGENDIAN | |
386 + unsigned int present : 1; | |
387 + unsigned int zero1 : 2; | |
388 + unsigned int s_4p3 : 5; /* stream for 4:3 on any display */ | |
389 + | |
390 + unsigned int zero2 : 3; | |
391 + unsigned int s_wide : 5; /* stream for 16:9 on widescreen display */ | |
392 + | |
393 + unsigned int zero3 : 3; | |
394 + unsigned int s_lbox : 5; /* stream for 16:9 on letterboxed 4:3 display */ | |
395 + | |
396 + unsigned int zero4 : 3; | |
397 + unsigned int s_panscan : 5; /* stream for 16:9 with pan&scan data on 4:3 display */ | |
398 +#else | |
399 + unsigned int s_4p3 : 5; /* stream for 4:3 on any display */ | |
400 + unsigned int zero1 : 2; | |
401 + unsigned int present : 1; | |
402 + | |
403 + unsigned int s_wide : 5; /* stream for 16:9 on widescreen display */ | |
404 + unsigned int zero2 : 3; | |
405 + | |
406 + unsigned int s_lbox : 5; /* stream for 16:9 on letterboxed 4:3 display */ | |
407 + unsigned int zero3 : 3; | |
408 + | |
409 + unsigned int s_panscan : 5; /* stream for 16:9 with pan&scan data on 4:3 display */ | |
410 + unsigned int zero4 : 3; | |
411 +#endif | |
412 +} ATTRIBUTE_PACKED subp_mapping_t; | |
413 + | |
414 +/** | |
415 + * Audio stream mapping for a soundtrack | |
416 + */ | |
417 +typedef struct { | |
418 +#ifdef WORDS_BIGENDIAN | |
419 + unsigned int present : 1; | |
420 + unsigned int zero1 : 4; | |
421 + unsigned int s_audio : 3; | |
422 +#else | |
423 + unsigned int s_audio : 3; | |
424 + unsigned int zero1 : 4; | |
425 + unsigned int present : 1; | |
426 +#endif | |
427 + uint8_t zero2; | |
428 +} ATTRIBUTE_PACKED audio_mapping_t; | |
429 + | |
430 +/** | |
431 * Program Chain Information. | |
432 */ | |
433 typedef struct { | |
434 @@ -406,8 +455,8 @@ | |
435 uint8_t nr_of_cells; | |
436 dvd_time_t playback_time; | |
437 user_ops_t prohibited_ops; | |
438 - uint16_t audio_control[8]; /* New type? */ | |
439 - uint32_t subp_control[32]; /* New type? */ | |
440 + audio_mapping_t audio_control[8]; | |
441 + subp_mapping_t subp_control[32]; | |
442 uint16_t next_pgc_nr; | |
443 uint16_t prev_pgc_nr; | |
444 uint16_t goup_pgc_nr; | |
15875
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
445 diff -Naur dvdread.orig/nav_print.c dvdread/nav_print.c |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
446 diff -Naur dvdread.orig/nav_print.h dvdread/nav_print.h |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
447 --- dvdread.orig/nav_print.h 2005-06-23 00:18:54.000000000 +0200 |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
448 +++ dvdread/nav_print.h 2005-06-23 00:19:10.000000000 +0200 |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
449 @@ -20,7 +24,7 @@ |
14937 | 450 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
451 */ | |
452 | |
453 -#include <dvdread/nav_types.h> | |
454 +#include "nav_types.h" | |
455 | |
15875
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
456 /** |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
457 * Pretty printing of the NAV packets, PCI and DSI structs. |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
458 diff -Naur dvdread.orig/nav_read.c dvdread/nav_read.c |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
459 diff -Naur dvdread.orig/nav_read.h dvdread/nav_read.h |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
460 --- dvdread.orig/nav_read.h 2005-06-23 00:18:54.000000000 +0200 |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
461 +++ dvdread/nav_read.h 2005-06-23 00:19:10.000000000 +0200 |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
462 @@ -19,7 +23,7 @@ |
14937 | 463 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
464 */ | |
465 | |
466 -#include <dvdread/nav_types.h> | |
467 +#include "nav_types.h" | |
468 | |
15875
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
469 /** |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
470 * Parsing of NAV data, PCI and DSI parts. |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
471 diff -Naur dvdread.orig/nav_types.h dvdread/nav_types.h |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
472 --- dvdread.orig/nav_types.h 2005-06-23 00:18:54.000000000 +0200 |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
473 +++ dvdread/nav_types.h 2005-06-23 00:19:10.000000000 +0200 |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
474 @@ -30,7 +34,7 @@ |
14937 | 475 */ |
476 | |
477 #include <inttypes.h> | |
15875
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
478 -#include <dvdread/ifo_types.h> /* only dvd_time_t, vm_cmd_t and user_ops_t */ |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
479 +#include "ifo_types.h" /* only dvd_time_t, vm_cmd_t and user_ops_t */ |
14937 | 480 |
481 | |
482 #undef ATTRIBUTE_PACKED |