1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
|
--- src/input/libdvdnav/dvdnav.c
+++ src/input/libdvdnav/dvdnav.c
@@ -67,7 +67,7 @@
struct timeval time;
/* Create a new structure */
- fprintf(MSG_OUT, "libdvdnav: Using dvdnav version %s from http://dvd.sf.net\n", VERSION);
+ fprintf(MSG_OUT, "libdvdnav: Using dvdnav version %s from http://xine.sf.net\n", VERSION);
(*dest) = NULL;
this = (dvdnav_t*)malloc(sizeof(dvdnav_t));
--- src/input/libdvdnav/dvd_reader.c
+++ src/input/libdvdnav/dvd_reader.c
@@ -61,6 +61,7 @@
#include <mntent.h>
#endif
+#include "compat.h"
#include "dvd_udf.h"
#include "dvd_input.h"
#include "dvd_reader.h"
@@ -409,7 +410,7 @@
if( cdir >= 0 ) {
chdir( path_copy );
- new_path = getcwd( NULL, PATH_MAX );
+ new_path = getcwd( NULL, XINE_PATH_MAX );
fchdir( cdir );
close( cdir );
if( new_path ) {
@@ -595,7 +596,7 @@
static int findDVDFile( dvd_reader_t *dvd, const char *file, char *filename )
{
- char video_path[ PATH_MAX + 1 ];
+ char video_path[ XINE_PATH_MAX + 1 ];
const char *nodirfile;
int ret;
@@ -629,7 +630,7 @@
*/
static dvd_file_t *DVDOpenFilePath( dvd_reader_t *dvd, char *filename )
{
- char full_path[ PATH_MAX + 1 ];
+ char full_path[ XINE_PATH_MAX + 1 ];
dvd_file_t *dvd_file;
struct stat fileinfo;
dvd_input_t dev;
@@ -722,7 +723,7 @@
static dvd_file_t *DVDOpenVOBPath( dvd_reader_t *dvd, int title, int menu )
{
char filename[ MAX_UDF_FILE_NAME_LEN ];
- char full_path[ PATH_MAX + 1 ];
+ char full_path[ XINE_PATH_MAX + 1 ];
struct stat fileinfo;
dvd_file_t *dvd_file;
int i;
Index: dvd_input.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/input/libdvdnav/dvd_input.c,v
retrieving revision 1.6
diff -u -r1.6 dvd_input.c
--- dvd_input.c 5 Apr 2004 18:01:09 -0000 1.6
+++ dvd_input.c 27 May 2006 16:11:09 -0000
@@ -35,6 +35,7 @@
int (*dvdinput_title) (dvd_input_t, int);
int (*dvdinput_read) (dvd_input_t, void *, int, int);
char * (*dvdinput_error) (dvd_input_t);
+int (*dvdinput_is_encrypted) (dvd_input_t);
#ifdef HAVE_DVDCSS_DVDCSS_H
/* linking to libdvdcss */
@@ -55,6 +56,73 @@
#include "../../msvc/contrib/dlfcn.c"
#endif
+/* Copied from css.h */
+#define KEY_SIZE 5
+
+typedef uint8_t dvd_key_t[KEY_SIZE];
+
+typedef struct dvd_title_s
+{
+ int i_startlb;
+ dvd_key_t p_key;
+ struct dvd_title_s *p_next;
+} dvd_title_t;
+
+typedef struct css_s
+{
+ int i_agid; /* Current Authenication Grant ID. */
+ dvd_key_t p_bus_key; /* Current session key. */
+ dvd_key_t p_disc_key; /* This DVD disc's key. */
+ dvd_key_t p_title_key; /* Current title key. */
+} css_t;
+
+/* Copied from libdvdcss.h */
+
+#ifndef PATH_MAX
+#define PATH_MAX 4096
+#endif
+
+struct dvdcss_s
+{
+ /* File descriptor */
+ char * psz_device;
+ int i_fd;
+ int i_read_fd;
+ int i_pos;
+
+ /* File handling */
+ void *pf_seek;
+ void *pf_read;
+ void *pf_readv;
+
+ /* Decryption stuff */
+ int i_method;
+ css_t css;
+ int b_ioctls;
+ int b_scrambled;
+ dvd_title_t *p_titles;
+
+ /* Key cache directory and pointer to the filename */
+ char psz_cachefile[PATH_MAX];
+ char * psz_block;
+
+ /* Error management */
+ char * psz_error;
+ int b_errors;
+ int b_debug;
+
+#ifdef WIN32
+ int b_file;
+ char * p_readv_buffer;
+ int i_readv_buf_size;
+#endif
+
+#ifndef WIN32
+ int i_raw_fd;
+#endif
+};
+
+
typedef struct dvdcss_s *dvdcss_handle;
static dvdcss_handle (*DVDcss_open) (const char *);
static int (*DVDcss_close) (dvdcss_handle);
@@ -149,8 +217,13 @@
return 0;
}
-
-
+static int css_is_encrypted (dvd_input_t dev)
+{
+ if (dev->dvdcss == NULL) {
+ return 0;
+ }
+ return dev->dvdcss->b_scrambled;
+}
@@ -269,6 +342,10 @@
return 0;
}
+static int file_is_encrypted (dvd_input_t dev)
+{
+ return 0;
+}
/**
* Setup read functions with either libdvdcss or minimal DVD access.
@@ -347,6 +424,7 @@
dvdinput_title = css_title;
dvdinput_read = css_read;
dvdinput_error = css_error;
+ dvdinput_is_encrypted = css_is_encrypted;
return 1;
} else {
@@ -359,6 +437,7 @@
dvdinput_title = file_title;
dvdinput_read = file_read;
dvdinput_error = file_error;
+ dvdinput_is_encrypted = file_is_encrypted;
return 0;
}
}
Index: dvd_input.h
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/input/libdvdnav/dvd_input.h,v
retrieving revision 1.1
diff -u -r1.1 dvd_input.h
--- dvd_input.h 29 Apr 2003 15:58:29 -0000 1.1
+++ dvd_input.h 27 May 2006 16:11:09 -0000
@@ -38,6 +38,7 @@
extern int (*dvdinput_title) (dvd_input_t, int);
extern int (*dvdinput_read) (dvd_input_t, void *, int, int);
extern char * (*dvdinput_error) (dvd_input_t);
+extern int (*dvdinput_is_encrypted) (dvd_input_t);
/**
* Setup function accessed by dvd_reader.c. Returns 1 if there is CSS support.
Index: dvd_reader.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/input/libdvdnav/dvd_reader.c,v
retrieving revision 1.11
diff -u -r1.11 dvd_reader.c
--- dvd_reader.c 20 Sep 2004 19:30:04 -0000 1.11
+++ dvd_reader.c 27 May 2006 16:11:09 -0000
@@ -480,6 +480,13 @@
me->mnt_fsname,
me->mnt_dir );
auth_drive = DVDOpenImageFile( me->mnt_fsname, have_css );
+ /* If the device is not encrypted, don't access the device
+ * directly as it would fail for non-UDF DVDs */
+ if ( dvdinput_is_encrypted( auth_drive->dev ) == 0) {
+ DVDClose( auth_drive );
+ auth_drive = NULL;
+ break;
+ }
dev_name = strdup(me->mnt_fsname);
break;
}
Index: src/input/libdvdnav/md5.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/input/libdvdnav/md5.c,v
retrieving revision 1.2
diff -u -r1.2 md5.c
--- src/input/libdvdnav/md5.c 29 Apr 2003 21:46:05 -0000 1.2
+++ src/input/libdvdnav/md5.c 2 Jun 2006 19:14:50 -0000
@@ -26,14 +26,8 @@
#include <sys/types.h>
-#if STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
-# include <string.h>
-#else
-# ifndef HAVE_MEMCPY
-# define memcpy(d, s, n) bcopy ((s), (d), (n))
-# endif
-#endif
+#include <stdlib.h>
+#include <string.h>
#include "md5.h"
/* #include "unlocked-io.h" */
|
