Mercurial > libdvdnav.hg
annotate dvdnav.c @ 161:81b9602f780c src
report start of PG as well
author | mroi |
---|---|
date | Sun, 06 Apr 2003 13:05:45 +0000 |
parents | 6439d00b1363 |
children | 90b1f6f0520e |
rev | line source |
---|---|
0 | 1 /* |
2 * Copyright (C) 2000 Rich Wareham <richwareham@users.sourceforge.net> | |
3 * | |
4 * This file is part of libdvdnav, a DVD navigation library. | |
5 * | |
6 * libdvdnav is free software; you can redistribute it and/or modify | |
7 * it under the terms of the GNU General Public License as published by | |
8 * the Free Software Foundation; either version 2 of the License, or | |
9 * (at your option) any later version. | |
10 * | |
11 * libdvdnav is distributed in the hope that it will be useful, | |
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
14 * GNU General Public License for more details. | |
15 * | |
16 * You should have received a copy of the GNU General Public License | |
17 * along with this program; if not, write to the Free Software | |
18 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA | |
19 * | |
20 * $Id$ | |
21 * | |
22 */ | |
23 | |
24 #ifdef HAVE_CONFIG_H | |
25 #include "config.h" | |
26 #endif | |
27 | |
31 | 28 /* |
29 #define LOG_DEBUG | |
30 */ | |
31 | |
0 | 32 #include <pthread.h> |
33 #include "dvdnav_internal.h" | |
34 #include "read_cache.h" | |
35 | |
36 #include <dvdread/nav_read.h> | |
37 | |
38 #include <stdlib.h> | |
39 #include <stdio.h> | |
84 | 40 #include <sys/time.h> |
0 | 41 |
97
c1dff1899bda
First patch for personalized dvd viewing. I have not tested it yet.
jcdutton
parents:
92
diff
changeset
|
42 #include "remap.h" |
c1dff1899bda
First patch for personalized dvd viewing. I have not tested it yet.
jcdutton
parents:
92
diff
changeset
|
43 |
114 | 44 static dvdnav_status_t dvdnav_clear(dvdnav_t * this) { |
45 /* clear everything except file, vm, mutex, readahead */ | |
21
d2d73f2ad8d3
Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents:
17
diff
changeset
|
46 |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
47 if (this->file) DVDCloseFile(this->file); |
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
48 this->file = NULL; |
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
49 this->open_vtsN = -1; |
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
50 this->open_domain = -1; |
4
99bed5d6db2f
Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents:
3
diff
changeset
|
51 |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
52 memset(&this->pci,0,sizeof(this->pci)); |
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
53 memset(&this->dsi,0,sizeof(this->dsi)); |
4
99bed5d6db2f
Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents:
3
diff
changeset
|
54 |
99bed5d6db2f
Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents:
3
diff
changeset
|
55 /* Set initial values of flags */ |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
56 this->position_current.still = 0; |
23 | 57 this->skip_still = 0; |
116 | 58 this->sync_wait = 0; |
59 this->sync_wait_skip = 0; | |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
60 this->spu_clut_changed = 0; |
114 | 61 this->started = 0; |
4
99bed5d6db2f
Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents:
3
diff
changeset
|
62 |
34
1f29402ef2ef
'Objectified' the read-ahead cache in preparation to implement a 'proper' threaded cache a-la that recommended in the DVD Demystified book.
richwareham
parents:
33
diff
changeset
|
63 dvdnav_read_cache_clear(this->cache); |
1f29402ef2ef
'Objectified' the read-ahead cache in preparation to implement a 'proper' threaded cache a-la that recommended in the DVD Demystified book.
richwareham
parents:
33
diff
changeset
|
64 |
4
99bed5d6db2f
Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents:
3
diff
changeset
|
65 return S_OK; |
99bed5d6db2f
Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents:
3
diff
changeset
|
66 } |
99bed5d6db2f
Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents:
3
diff
changeset
|
67 |
114 | 68 dvdnav_status_t dvdnav_open(dvdnav_t** dest, const char *path) { |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
69 dvdnav_t *this; |
84 | 70 struct timeval time; |
0 | 71 |
72 /* Create a new structure */ | |
100 | 73 fprintf(MSG_OUT, "libdvdnav: Using dvdnav version %s from http://dvd.sf.net\n", VERSION); |
82 | 74 |
0 | 75 (*dest) = NULL; |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
76 this = (dvdnav_t*)malloc(sizeof(dvdnav_t)); |
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
77 if(!this) |
114 | 78 return S_ERR; |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
79 memset(this, 0, (sizeof(dvdnav_t) ) ); /* Make sure this structure is clean */ |
114 | 80 |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
81 pthread_mutex_init(&this->vm_lock, NULL); |
0 | 82 /* Initialise the error string */ |
83 printerr(""); | |
84 | |
85 /* Initialise the VM */ | |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
86 this->vm = vm_new_vm(); |
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
87 if(!this->vm) { |
114 | 88 printerr("Error initialising the DVD VM."); |
92 | 89 pthread_mutex_destroy(&this->vm_lock); |
90 free(this); | |
0 | 91 return S_ERR; |
92 } | |
114 | 93 if(!vm_reset(this->vm, path)) { |
94 printerr("Error starting the VM / opening the DVD device."); | |
92 | 95 pthread_mutex_destroy(&this->vm_lock); |
96 vm_free_vm(this->vm); | |
97 free(this); | |
0 | 98 return S_ERR; |
99 } | |
100 | |
101 /* Set the path. FIXME: Is a deep copy 'right' */ | |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
102 strncpy(this->path, path, MAX_PATH_LEN); |
0 | 103 |
104 /* Pre-open and close a file so that the CSS-keys are cached. */ | |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
105 this->file = DVDOpenFile(vm_get_dvd_reader(this->vm), 0, DVD_READ_MENU_VOBS); |
0 | 106 |
34
1f29402ef2ef
'Objectified' the read-ahead cache in preparation to implement a 'proper' threaded cache a-la that recommended in the DVD Demystified book.
richwareham
parents:
33
diff
changeset
|
107 /* Start the read-ahead cache. */ |
1f29402ef2ef
'Objectified' the read-ahead cache in preparation to implement a 'proper' threaded cache a-la that recommended in the DVD Demystified book.
richwareham
parents:
33
diff
changeset
|
108 this->cache = dvdnav_read_cache_new(this); |
84 | 109 |
114 | 110 /* Seed the random numbers. So that the DVD VM Command rand() |
111 * gives a different start value each time a DVD is played. */ | |
112 gettimeofday(&time, NULL); | |
84 | 113 srand(time.tv_usec); |
114 | |
114 | 115 dvdnav_clear(this); |
116 | |
117 (*dest) = this; | |
0 | 118 return S_OK; |
119 } | |
120 | |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
121 dvdnav_status_t dvdnav_close(dvdnav_t *this) { |
114 | 122 |
31 | 123 #ifdef LOG_DEBUG |
76 | 124 fprintf(MSG_OUT, "libdvdnav: close:called\n"); |
31 | 125 #endif |
34
1f29402ef2ef
'Objectified' the read-ahead cache in preparation to implement a 'proper' threaded cache a-la that recommended in the DVD Demystified book.
richwareham
parents:
33
diff
changeset
|
126 |
114 | 127 if(!this) { |
128 printerr("Passed a NULL pointer."); | |
129 return S_ERR; | |
130 } | |
131 | |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
132 if (this->file) { |
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
133 DVDCloseFile(this->file); |
31 | 134 #ifdef LOG_DEBUG |
76 | 135 fprintf(MSG_OUT, "libdvdnav: close:file closing\n"); |
31 | 136 #endif |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
137 this->file = NULL; |
0 | 138 } |
139 | |
140 /* Free the VM */ | |
114 | 141 if(this->vm) |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
142 vm_free_vm(this->vm); |
114 | 143 |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
144 pthread_mutex_destroy(&this->vm_lock); |
60 | 145 |
146 /* We leave the final freeing of the entire structure to the cache, | |
147 * because we don't know, if there are still buffers out in the wild, | |
148 * that must return first. */ | |
114 | 149 if(this->cache) |
60 | 150 dvdnav_read_cache_free(this->cache); |
114 | 151 else |
152 free(this); | |
0 | 153 |
154 return S_OK; | |
155 } | |
156 | |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
157 dvdnav_status_t dvdnav_reset(dvdnav_t *this) { |
4
99bed5d6db2f
Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents:
3
diff
changeset
|
158 dvdnav_status_t result; |
99bed5d6db2f
Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents:
3
diff
changeset
|
159 |
31 | 160 #ifdef LOG_DEBUG |
76 | 161 fprintf(MSG_OUT, "libdvdnav: reset:called\n"); |
31 | 162 #endif |
114 | 163 |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
164 if(!this) { |
114 | 165 printerr("Passed a NULL pointer."); |
4
99bed5d6db2f
Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents:
3
diff
changeset
|
166 return S_ERR; |
99bed5d6db2f
Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents:
3
diff
changeset
|
167 } |
114 | 168 |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
169 pthread_mutex_lock(&this->vm_lock); |
114 | 170 |
31 | 171 #ifdef LOG_DEBUG |
76 | 172 fprintf(MSG_OUT, "libdvdnav: reseting vm\n"); |
31 | 173 #endif |
114 | 174 if(!vm_reset(this->vm, NULL)) { |
175 printerr("Error restarting the VM."); | |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
176 pthread_mutex_unlock(&this->vm_lock); |
4
99bed5d6db2f
Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents:
3
diff
changeset
|
177 return S_ERR; |
99bed5d6db2f
Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents:
3
diff
changeset
|
178 } |
31 | 179 #ifdef LOG_DEBUG |
76 | 180 fprintf(MSG_OUT, "libdvdnav: clearing dvdnav\n"); |
31 | 181 #endif |
114 | 182 result = dvdnav_clear(this); |
183 | |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
184 pthread_mutex_unlock(&this->vm_lock); |
4
99bed5d6db2f
Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents:
3
diff
changeset
|
185 return result; |
99bed5d6db2f
Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents:
3
diff
changeset
|
186 } |
99bed5d6db2f
Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents:
3
diff
changeset
|
187 |
114 | 188 dvdnav_status_t dvdnav_path(dvdnav_t *this, const char** path) { |
189 | |
190 if(!this || !path) { | |
191 printerr("Passed a NULL pointer."); | |
0 | 192 return S_ERR; |
193 } | |
194 | |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
195 (*path) = this->path; |
0 | 196 |
197 return S_OK; | |
198 } | |
199 | |
114 | 200 const char* dvdnav_err_to_string(dvdnav_t *this) { |
201 | |
202 if(!this) | |
3
328eadb3f37e
Added initial example programs directory and make sure all debug/error output goes to stderr.
richwareham
parents:
0
diff
changeset
|
203 return "Hey! You gave me a NULL pointer you naughty person!"; |
0 | 204 |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
205 return this->err_str; |
0 | 206 } |
207 | |
134
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
208 /* converts a dvd_time_t to PTS ticks */ |
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
209 static int64_t dvdnav_convert_time(dvd_time_t *time) { |
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
210 int64_t result; |
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
211 int frames; |
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
212 |
135 | 213 result = (time->hour >> 4 ) * 10 * 60 * 60 * 90000; |
134
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
214 result += (time->hour & 0x0f) * 60 * 60 * 90000; |
135 | 215 result += (time->minute >> 4 ) * 10 * 60 * 90000; |
134
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
216 result += (time->minute & 0x0f) * 60 * 90000; |
135 | 217 result += (time->second >> 4 ) * 10 * 90000; |
134
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
218 result += (time->second & 0x0f) * 90000; |
135 | 219 |
220 frames = ((time->frame_u & 0x30) >> 4) * 10; | |
221 frames += ((time->frame_u & 0x0f) ) ; | |
222 | |
134
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
223 if (time->frame_u & 0x80) |
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
224 result += frames * 3000; |
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
225 else |
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
226 result += frames * 3600; |
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
227 |
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
228 return result; |
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
229 } |
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
230 |
114 | 231 /* |
0 | 232 * Returns 1 if block contains NAV packet, 0 otherwise. |
233 * Precesses said NAV packet if present. | |
234 * | |
235 * Most of the code in here is copied from xine's MPEG demuxer | |
236 * so any bugs which are found in that should be corrected here also. | |
237 */ | |
114 | 238 static int dvdnav_decode_packet(dvdnav_t *this, uint8_t *p, dsi_t *nav_dsi, pci_t *nav_pci) { |
239 int bMpeg1 = 0; | |
0 | 240 uint32_t nHeaderLen; |
241 uint32_t nPacketLen; | |
242 uint32_t nStreamID; | |
243 | |
244 if (p[3] == 0xBA) { /* program stream pack header */ | |
245 int nStuffingBytes; | |
246 | |
247 bMpeg1 = (p[4] & 0x40) == 0; | |
248 | |
249 if (bMpeg1) { | |
114 | 250 p += 12; |
0 | 251 } else { /* mpeg2 */ |
252 nStuffingBytes = p[0xD] & 0x07; | |
253 p += 14 + nStuffingBytes; | |
254 } | |
255 } | |
256 | |
257 if (p[3] == 0xbb) { /* program stream system header */ | |
258 nHeaderLen = (p[4] << 8) | p[5]; | |
259 p += 6 + nHeaderLen; | |
260 } | |
261 | |
262 /* we should now have a PES packet here */ | |
263 if (p[0] || p[1] || (p[2] != 1)) { | |
76 | 264 fprintf(MSG_OUT, "libdvdnav: demux error! %02x %02x %02x (should be 0x000001) \n",p[0],p[1],p[2]); |
0 | 265 return 0; |
266 } | |
267 | |
268 nPacketLen = p[4] << 8 | p[5]; | |
269 nStreamID = p[3]; | |
270 | |
271 nHeaderLen = 6; | |
272 p += nHeaderLen; | |
273 | |
274 if (nStreamID == 0xbf) { /* Private stream 2 */ | |
114 | 275 #if 0 |
276 int i; | |
277 fprintf(MSG_OUT, "libdvdnav: nav packet=%u\n",p-p_start-6); | |
278 for(i=0;i<80;i++) | |
279 fprintf(MSG_OUT, "%02x ",p[i-6]); | |
280 fprintf(MSG_OUT, "\n"); | |
281 #endif | |
282 | |
0 | 283 if(p[0] == 0x00) { |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
284 navRead_PCI(nav_pci, p+1); |
0 | 285 } |
286 | |
287 p += nPacketLen; | |
288 | |
289 /* We should now have a DSI packet. */ | |
290 if(p[6] == 0x01) { | |
291 nPacketLen = p[4] << 8 | p[5]; | |
292 p += 6; | |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
293 navRead_DSI(nav_dsi, p+1); |
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
294 } |
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
295 return 1; |
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
296 } |
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
297 return 0; |
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
298 } |
33
ef2136c4e7b2
Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents:
31
diff
changeset
|
299 |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
300 /* DSI is used for most angle stuff. |
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
301 * PCI is used for only non-seemless angle stuff |
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
302 */ |
114 | 303 static int dvdnav_get_vobu(dvdnav_t *this, dsi_t *nav_dsi, pci_t *nav_pci, dvdnav_vobu_t *vobu) { |
33
ef2136c4e7b2
Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents:
31
diff
changeset
|
304 uint32_t next; |
ef2136c4e7b2
Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents:
31
diff
changeset
|
305 int angle, num_angle; |
ef2136c4e7b2
Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents:
31
diff
changeset
|
306 |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
307 vobu->vobu_start = nav_dsi->dsi_gi.nv_pck_lbn; /* Absolute offset from start of disk */ |
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
308 vobu->vobu_length = nav_dsi->dsi_gi.vobu_ea; /* Relative offset from vobu_start */ |
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
309 |
43
0ba15bf3dc25
Biiiiiiig change to let doxygen generate some docs for the library. Note that I'm in no way sure that the autoconf stuff plays nice.
richwareham
parents:
42
diff
changeset
|
310 /* |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
311 * If we're not at the end of this cell, we can determine the next |
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
312 * VOBU to display using the VOBU_SRI information section of the |
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
313 * DSI. Using this value correctly follows the current angle, |
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
314 * avoiding the doubled scenes in The Matrix, and makes our life |
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
315 * really happy. |
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
316 * |
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
317 * vobu_next is an offset value, 0x3fffffff = SRI_END_OF_CELL |
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
318 * DVDs are about 6 Gigs, which is only up to 0x300000 blocks |
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
319 * Should really assert if bit 31 != 1 |
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
320 */ |
33
ef2136c4e7b2
Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents:
31
diff
changeset
|
321 |
114 | 322 #if 0 |
323 /* Old code -- may still be useful one day */ | |
33
ef2136c4e7b2
Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents:
31
diff
changeset
|
324 if(nav_dsi->vobu_sri.next_vobu != SRI_END_OF_CELL ) { |
ef2136c4e7b2
Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents:
31
diff
changeset
|
325 vobu->vobu_next = ( nav_dsi->vobu_sri.next_vobu & 0x3fffffff ); |
ef2136c4e7b2
Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents:
31
diff
changeset
|
326 } else { |
ef2136c4e7b2
Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents:
31
diff
changeset
|
327 vobu->vobu_next = vobu->vobu_length; |
114 | 328 } |
329 #else | |
330 /* Relative offset from vobu_start */ | |
331 vobu->vobu_next = ( nav_dsi->vobu_sri.next_vobu & 0x3fffffff ); | |
332 #endif | |
33
ef2136c4e7b2
Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents:
31
diff
changeset
|
333 |
114 | 334 vm_get_angle_info(this->vm, &angle, &num_angle); |
335 | |
336 /* FIMXE: The angle reset doesn't work for some reason for the moment */ | |
33
ef2136c4e7b2
Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents:
31
diff
changeset
|
337 #if 0 |
ef2136c4e7b2
Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents:
31
diff
changeset
|
338 if((num_angle < angle) && (angle != 1)) { |
114 | 339 fprintf(MSG_OUT, "libdvdnav: angle ends!\n"); |
33
ef2136c4e7b2
Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents:
31
diff
changeset
|
340 |
ef2136c4e7b2
Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents:
31
diff
changeset
|
341 /* This is to switch back to angle one when we |
ef2136c4e7b2
Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents:
31
diff
changeset
|
342 * finish with angles. */ |
114 | 343 dvdnav_angle_change(this, 1); |
33
ef2136c4e7b2
Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents:
31
diff
changeset
|
344 } |
ef2136c4e7b2
Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents:
31
diff
changeset
|
345 #endif |
0 | 346 |
33
ef2136c4e7b2
Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents:
31
diff
changeset
|
347 if(num_angle != 0) { |
ef2136c4e7b2
Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents:
31
diff
changeset
|
348 |
114 | 349 if((next = nav_pci->nsml_agli.nsml_agl_dsta[angle-1]) != 0) { |
33
ef2136c4e7b2
Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents:
31
diff
changeset
|
350 if((next & 0x3fffffff) != 0) { |
114 | 351 if(next & 0x80000000) |
33
ef2136c4e7b2
Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents:
31
diff
changeset
|
352 vobu->vobu_next = - (int32_t)(next & 0x3fffffff); |
114 | 353 else |
33
ef2136c4e7b2
Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents:
31
diff
changeset
|
354 vobu->vobu_next = + (int32_t)(next & 0x3fffffff); |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
355 } |
114 | 356 } else if((next = nav_dsi->sml_agli.data[angle-1].address) != 0) { |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
357 vobu->vobu_length = nav_dsi->sml_pbi.ilvu_ea; |
33
ef2136c4e7b2
Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents:
31
diff
changeset
|
358 |
114 | 359 if((next & 0x80000000) && (next != 0x7fffffff)) |
33
ef2136c4e7b2
Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents:
31
diff
changeset
|
360 vobu->vobu_next = - (int32_t)(next & 0x3fffffff); |
114 | 361 else |
33
ef2136c4e7b2
Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents:
31
diff
changeset
|
362 vobu->vobu_next = + (int32_t)(next & 0x3fffffff); |
0 | 363 } |
364 } | |
33
ef2136c4e7b2
Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents:
31
diff
changeset
|
365 |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
366 return 1; |
0 | 367 } |
60 | 368 |
114 | 369 /* |
370 * These are the main get_next_block function which actually get the media stream video and audio etc. | |
371 * | |
372 * There are two versions: The second one is using the zero-copy read ahead cache and therefore | |
373 * hands out pointers targetting directly into the cache. | |
374 * The first one uses a memcopy to fill this cache block into the application provided memory. | |
375 * The benefit of this first one is that no special memory management is needed. The application is | |
376 * the only one responsible of allocating and freeing the memory associated with the pointer. | |
377 * The drawback is the additional memcopy. | |
28 | 378 */ |
60 | 379 |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
380 dvdnav_status_t dvdnav_get_next_block(dvdnav_t *this, unsigned char *buf, |
114 | 381 int *event, int *len) { |
60 | 382 unsigned char *block; |
383 dvdnav_status_t status; | |
384 | |
385 block = buf; | |
386 status = dvdnav_get_next_cache_block(this, &block, event, len); | |
114 | 387 if (status == S_OK && block != buf) { |
60 | 388 /* we received a block from the cache, copy it, so we can give it back */ |
389 memcpy(buf, block, DVD_VIDEO_LB_LEN); | |
390 dvdnav_free_cache_block(this, block); | |
391 } | |
392 return status; | |
393 } | |
394 | |
395 dvdnav_status_t dvdnav_get_next_cache_block(dvdnav_t *this, unsigned char **buf, | |
114 | 396 int *event, int *len) { |
0 | 397 dvd_state_t *state; |
398 int result; | |
114 | 399 |
60 | 400 if(!this || !event || !len || !buf || !*buf) { |
114 | 401 printerr("Passed a NULL pointer."); |
0 | 402 return S_ERR; |
403 } | |
114 | 404 |
405 pthread_mutex_lock(&this->vm_lock); | |
0 | 406 |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
407 if(!this->started) { |
0 | 408 /* Start the VM */ |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
409 vm_start(this->vm); |
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
410 this->started = 1; |
0 | 411 } |
412 | |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
413 state = &(this->vm->state); |
0 | 414 (*event) = DVDNAV_NOP; |
415 (*len) = 0; | |
416 | |
417 /* Check the STOP flag */ | |
114 | 418 if(this->vm->stopped) { |
121 | 419 vm_stop(this->vm); |
0 | 420 (*event) = DVDNAV_STOP; |
114 | 421 this->started = 0; |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
422 pthread_mutex_unlock(&this->vm_lock); |
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
423 return S_OK; |
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
424 } |
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
425 |
114 | 426 vm_position_get(this->vm, &this->position_next); |
0 | 427 |
126 | 428 #ifdef LOG_DEBUG |
114 | 429 fprintf(MSG_OUT, "libdvdnav: POS-NEXT "); |
430 vm_position_print(this->vm, &this->position_next); | |
116 | 431 fprintf(MSG_OUT, "libdvdnav: POS-CUR "); |
114 | 432 vm_position_print(this->vm, &this->position_current); |
31 | 433 #endif |
114 | 434 |
435 /* did we hop? */ | |
436 if(this->position_current.hop_channel != this->position_next.hop_channel) { | |
437 (*event) = DVDNAV_HOP_CHANNEL; | |
58 | 438 #ifdef LOG_DEBUG |
114 | 439 fprintf(MSG_OUT, "libdvdnav: HOP_CHANNEL\n"); |
31 | 440 #endif |
115 | 441 if (this->position_next.hop_channel - this->position_current.hop_channel >= HOP_SEEK) { |
114 | 442 int num_angles = 0, current; |
443 | |
444 /* we seeked -> check for multiple angles */ | |
445 vm_get_angle_info(this->vm, ¤t, &num_angles); | |
446 if (num_angles > 1) { | |
447 int result, block; | |
448 /* we have to skip the first VOBU when seeking in a multiangle feature, | |
449 * because it might belong to the wrong angle */ | |
450 block = this->position_next.cell_start + this->position_next.block; | |
451 result = dvdnav_read_cache_block(this->cache, block, 1, buf); | |
452 if(result <= 0) { | |
453 printerr("Error reading NAV packet."); | |
454 pthread_mutex_unlock(&this->vm_lock); | |
455 return S_ERR; | |
456 } | |
457 /* Decode nav into pci and dsi. Then get next VOBU info. */ | |
458 if(!dvdnav_decode_packet(this, *buf, &this->dsi, &this->pci)) { | |
459 printerr("Expected NAV packet but none found."); | |
460 pthread_mutex_unlock(&this->vm_lock); | |
461 return S_ERR; | |
462 } | |
463 dvdnav_get_vobu(this, &this->dsi, &this->pci, &this->vobu); | |
464 /* skip to next, if there is a next */ | |
465 if (this->vobu.vobu_next != SRI_END_OF_CELL) { | |
466 this->vobu.vobu_start += this->vobu.vobu_next; | |
467 this->vobu.vobu_next = 0; | |
468 } | |
469 /* update VM state */ | |
470 this->vm->state.blockN = this->vobu.vobu_start - this->position_next.cell_start; | |
471 } | |
472 } | |
473 this->position_current.hop_channel = this->position_next.hop_channel; | |
141
8f63f4c25f2f
update position on HOP_CHANNEL, do not rely on a following CELL_CHANGE
mroi
parents:
135
diff
changeset
|
474 /* update VOBU info */ |
8f63f4c25f2f
update position on HOP_CHANNEL, do not rely on a following CELL_CHANGE
mroi
parents:
135
diff
changeset
|
475 this->vobu.vobu_start = this->position_next.cell_start + this->position_next.block; |
8f63f4c25f2f
update position on HOP_CHANNEL, do not rely on a following CELL_CHANGE
mroi
parents:
135
diff
changeset
|
476 this->vobu.vobu_next = 0; |
127 | 477 /* Make blockN == vobu_length to do expected_nav */ |
114 | 478 this->vobu.vobu_length = 0; |
127 | 479 this->vobu.blockN = 0; |
116 | 480 this->sync_wait = 0; |
30 | 481 pthread_mutex_unlock(&this->vm_lock); |
482 return S_OK; | |
0 | 483 } |
484 | |
116 | 485 /* Check the HIGHLIGHT flag */ |
486 if(this->position_current.button != this->position_next.button) { | |
134
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
487 dvdnav_highlight_event_t *hevent = (dvdnav_highlight_event_t *)*buf; |
116 | 488 |
489 (*event) = DVDNAV_HIGHLIGHT; | |
490 #ifdef LOG_DEBUG | |
491 fprintf(MSG_OUT, "libdvdnav: HIGHLIGHT\n"); | |
492 #endif | |
134
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
493 (*len) = sizeof(dvdnav_highlight_event_t); |
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
494 hevent->display = 1; |
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
495 hevent->buttonN = this->position_next.button; |
116 | 496 this->position_current.button = this->position_next.button; |
497 pthread_mutex_unlock(&this->vm_lock); | |
498 return S_OK; | |
499 } | |
500 | |
501 /* Check the WAIT flag */ | |
502 if(this->sync_wait) { | |
503 (*event) = DVDNAV_WAIT; | |
504 #ifdef LOG_DEBUG | |
505 fprintf(MSG_OUT, "libdvdnav: WAIT\n"); | |
506 #endif | |
507 (*len) = 0; | |
508 pthread_mutex_unlock(&this->vm_lock); | |
509 return S_OK; | |
510 } | |
511 | |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
512 /* Check to see if we need to change the currently opened VOB */ |
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
513 if((this->position_current.vts != this->position_next.vts) || |
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
514 (this->position_current.domain != this->position_next.domain)) { |
0 | 515 dvd_read_domain_t domain; |
516 int vtsN; | |
134
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
517 dvdnav_vts_change_event_t *vts_event = (dvdnav_vts_change_event_t *)*buf; |
0 | 518 |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
519 if(this->file) { |
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
520 DVDCloseFile(this->file); |
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
521 this->file = NULL; |
0 | 522 } |
523 | |
134
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
524 vts_event->old_vtsN = this->open_vtsN; |
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
525 vts_event->old_domain = this->open_domain; |
0 | 526 |
114 | 527 /* Use the DOMAIN to find whether to open menu or title VOBs */ |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
528 switch(this->position_next.domain) { |
114 | 529 case FP_DOMAIN: |
530 case VMGM_DOMAIN: | |
0 | 531 domain = DVD_READ_MENU_VOBS; |
532 vtsN = 0; | |
533 break; | |
114 | 534 case VTSM_DOMAIN: |
0 | 535 domain = DVD_READ_MENU_VOBS; |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
536 vtsN = this->position_next.vts; |
0 | 537 break; |
114 | 538 case VTS_DOMAIN: |
0 | 539 domain = DVD_READ_TITLE_VOBS; |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
540 vtsN = this->position_next.vts; |
0 | 541 break; |
114 | 542 default: |
0 | 543 printerr("Unknown domain when changing VTS."); |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
544 pthread_mutex_unlock(&this->vm_lock); |
0 | 545 return S_ERR; |
546 } | |
547 | |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
548 this->position_current.vts = this->position_next.vts; |
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
549 this->position_current.domain = this->position_next.domain; |
34
1f29402ef2ef
'Objectified' the read-ahead cache in preparation to implement a 'proper' threaded cache a-la that recommended in the DVD Demystified book.
richwareham
parents:
33
diff
changeset
|
550 dvdnav_read_cache_clear(this->cache); |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
551 this->file = DVDOpenFile(vm_get_dvd_reader(this->vm), vtsN, domain); |
134
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
552 vts_event->new_vtsN = this->position_next.vts; |
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
553 vts_event->new_domain = this->position_next.domain; |
0 | 554 |
555 /* If couldn't open the file for some reason, moan */ | |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
556 if(this->file == NULL) { |
0 | 557 printerrf("Error opening vtsN=%i, domain=%i.", vtsN, domain); |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
558 pthread_mutex_unlock(&this->vm_lock); |
0 | 559 return S_ERR; |
560 } | |
561 | |
562 /* File opened successfully so return a VTS change event */ | |
563 (*event) = DVDNAV_VTS_CHANGE; | |
114 | 564 #ifdef LOG_DEBUG |
565 fprintf(MSG_OUT, "libdvdnav: VTS_CHANGE\n"); | |
566 #endif | |
134
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
567 (*len) = sizeof(dvdnav_vts_change_event_t); |
0 | 568 |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
569 this->spu_clut_changed = 1; |
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
570 this->position_current.cell = -1; /* Force an update */ |
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
571 this->position_current.spu_channel = -1; /* Force an update */ |
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
572 this->position_current.audio_channel = -1; /* Force an update */; |
0 | 573 |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
574 pthread_mutex_unlock(&this->vm_lock); |
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
575 return S_OK; |
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
576 } |
114 | 577 |
578 /* Check if the cell changed */ | |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
579 if( (this->position_current.cell != this->position_next.cell) || |
50
578ce1d41479
Rename some of the functions in vm.c to help readability.
jcdutton
parents:
45
diff
changeset
|
580 (this->position_current.cell_restart != this->position_next.cell_restart) || |
114 | 581 (this->position_current.cell_start != this->position_next.cell_start) ) { |
134
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
582 dvdnav_cell_change_event_t *cell_event = (dvdnav_cell_change_event_t *)*buf; |
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
583 int first_cell_nr, last_cell_nr, i; |
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
584 dvd_state_t *state = &this->vm->state; |
114 | 585 |
586 (*event) = DVDNAV_CELL_CHANGE; | |
587 #ifdef LOG_DEBUG | |
588 fprintf(MSG_OUT, "libdvdnav: CELL_CHANGE\n"); | |
589 #endif | |
134
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
590 (*len) = sizeof(dvdnav_cell_change_event_t); |
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
591 |
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
592 cell_event->cellN = state->cellN; |
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
593 cell_event->pgN = state->pgN; |
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
594 cell_event->cell_length = |
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
595 dvdnav_convert_time(&state->pgc->cell_playback[state->cellN-1].playback_time); |
161 | 596 |
134
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
597 cell_event->pg_length = 0; |
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
598 /* Find start cell of program. */ |
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
599 first_cell_nr = state->pgc->program_map[state->pgN-1]; |
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
600 /* Find end cell of program */ |
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
601 if(state->pgN < state->pgc->nr_of_programs) |
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
602 last_cell_nr = state->pgc->program_map[state->pgN] - 1; |
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
603 else |
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
604 last_cell_nr = state->pgc->nr_of_cells; |
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
605 for (i = first_cell_nr; i <= last_cell_nr; i++) |
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
606 cell_event->pg_length += |
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
607 dvdnav_convert_time(&state->pgc->cell_playback[i - 1].playback_time); |
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
608 cell_event->pgc_length = dvdnav_convert_time(&state->pgc->playback_time); |
151 | 609 |
610 cell_event->cell_start = 0; | |
611 for (i = 1; i < state->cellN; i++) | |
612 cell_event->cell_start += | |
613 dvdnav_convert_time(&state->pgc->cell_playback[i - 1].playback_time); | |
161 | 614 |
615 cell_event->pg_start = 0; | |
616 for (i = 1; i < state->pgc->program_map[state->pgN-1]; i++) | |
617 cell_event->pg_start += | |
618 dvdnav_convert_time(&state->pgc->cell_playback[i - 1].playback_time); | |
619 | |
114 | 620 this->position_current.cell = this->position_next.cell; |
50
578ce1d41479
Rename some of the functions in vm.c to help readability.
jcdutton
parents:
45
diff
changeset
|
621 this->position_current.cell_restart = this->position_next.cell_restart; |
114 | 622 this->position_current.cell_start = this->position_next.cell_start; |
623 this->position_current.block = this->position_next.block; | |
624 | |
625 /* vobu info is used for mid cell resumes */ | |
626 this->vobu.vobu_start = this->position_next.cell_start + this->position_next.block; | |
627 this->vobu.vobu_next = 0; | |
127 | 628 /* Make blockN == vobu_length to do expected_nav */ |
114 | 629 this->vobu.vobu_length = 0; |
127 | 630 this->vobu.blockN = 0; |
114 | 631 |
632 /* update the spu palette at least on PGC changes */ | |
633 this->spu_clut_changed = 1; | |
634 this->position_current.spu_channel = -1; /* Force an update */ | |
635 this->position_current.audio_channel = -1; /* Force an update */ | |
636 | |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
637 pthread_mutex_unlock(&this->vm_lock); |
0 | 638 return S_OK; |
639 } | |
640 | |
114 | 641 /* has the CLUT changed? */ |
642 if(this->spu_clut_changed) { | |
643 (*event) = DVDNAV_SPU_CLUT_CHANGE; | |
644 #ifdef LOG_DEBUG | |
645 fprintf(MSG_OUT, "libdvdnav: SPU_CLUT_CHANGE\n"); | |
646 #endif | |
647 (*len) = 16 * sizeof(uint32_t); | |
648 memcpy(*buf, &(state->pgc->palette), 16 * sizeof(uint32_t)); | |
649 this->spu_clut_changed = 0; | |
650 pthread_mutex_unlock(&this->vm_lock); | |
651 return S_OK; | |
652 } | |
653 | |
654 /* has the SPU channel changed? */ | |
655 if(this->position_current.spu_channel != this->position_next.spu_channel) { | |
134
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
656 dvdnav_spu_stream_change_event_t *stream_change = (dvdnav_spu_stream_change_event_t *)*buf; |
114 | 657 |
658 (*event) = DVDNAV_SPU_STREAM_CHANGE; | |
659 #ifdef LOG_DEBUG | |
660 fprintf(MSG_OUT, "libdvdnav: SPU_STREAM_CHANGE\n"); | |
661 #endif | |
662 (*len) = sizeof(dvdnav_spu_stream_change_event_t); | |
134
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
663 stream_change->physical_wide = vm_get_subp_active_stream(this->vm, 0); |
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
664 stream_change->physical_letterbox = vm_get_subp_active_stream(this->vm, 1); |
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
665 stream_change->physical_pan_scan = vm_get_subp_active_stream(this->vm, 2); |
114 | 666 this->position_current.spu_channel = this->position_next.spu_channel; |
667 #ifdef LOG_DEBUG | |
143
0b302ca31859
merge James fixes from xine-lib cvs back into libdvdnav cvs so they will not be lost
mroi
parents:
142
diff
changeset
|
668 fprintf(MSG_OUT, "libdvdnav: SPU_STREAM_CHANGE stream_id_wide=%d\n",stream_change->physical_wide); |
0b302ca31859
merge James fixes from xine-lib cvs back into libdvdnav cvs so they will not be lost
mroi
parents:
142
diff
changeset
|
669 fprintf(MSG_OUT, "libdvdnav: SPU_STREAM_CHANGE stream_id_letterbox=%d\n",stream_change->physical_letterbox); |
0b302ca31859
merge James fixes from xine-lib cvs back into libdvdnav cvs so they will not be lost
mroi
parents:
142
diff
changeset
|
670 fprintf(MSG_OUT, "libdvdnav: SPU_STREAM_CHANGE stream_id_pan_scan=%d\n",stream_change->physical_pan_scan); |
114 | 671 #endif |
134
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
672 if (stream_change->physical_wide != -1 && |
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
673 stream_change->physical_letterbox != -1 && |
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
674 stream_change->physical_pan_scan != -1) { |
114 | 675 #ifdef LOG_DEBUG |
676 fprintf(MSG_OUT, "libdvdnav: SPU_STREAM_CHANGE returning S_OK\n"); | |
677 #endif | |
678 pthread_mutex_unlock(&this->vm_lock); | |
679 return S_OK; | |
680 } | |
681 } | |
0 | 682 |
114 | 683 /* has the audio channel changed? */ |
684 if(this->position_current.audio_channel != this->position_next.audio_channel) { | |
134
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
685 dvdnav_audio_stream_change_event_t *stream_change = (dvdnav_audio_stream_change_event_t *)*buf; |
114 | 686 |
687 (*event) = DVDNAV_AUDIO_STREAM_CHANGE; | |
688 #ifdef LOG_DEBUG | |
689 fprintf(MSG_OUT, "libdvdnav: AUDIO_STREAM_CHANGE\n"); | |
690 #endif | |
691 (*len) = sizeof(dvdnav_audio_stream_change_event_t); | |
134
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
692 stream_change->physical = vm_get_audio_active_stream( this->vm ); |
114 | 693 this->position_current.audio_channel = this->position_next.audio_channel; |
694 #ifdef LOG_DEBUG | |
143
0b302ca31859
merge James fixes from xine-lib cvs back into libdvdnav cvs so they will not be lost
mroi
parents:
142
diff
changeset
|
695 fprintf(MSG_OUT, "libdvdnav: AUDIO_STREAM_CHANGE stream_id=%d returning S_OK\n",stream_change->physical); |
114 | 696 #endif |
697 pthread_mutex_unlock(&this->vm_lock); | |
698 return S_OK; | |
699 } | |
700 | |
701 /* Check the STILLFRAME flag */ | |
702 if(this->position_current.still != 0) { | |
134
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
703 dvdnav_still_event_t *still_event = (dvdnav_still_event_t *)*buf; |
114 | 704 |
705 (*event) = DVDNAV_STILL_FRAME; | |
706 #ifdef LOG_DEBUG | |
707 fprintf(MSG_OUT, "libdvdnav: STILL_FRAME\n"); | |
708 #endif | |
709 (*len) = sizeof(dvdnav_still_event_t); | |
134
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
710 still_event->length = this->position_current.still; |
114 | 711 pthread_mutex_unlock(&this->vm_lock); |
712 return S_OK; | |
713 } | |
714 | |
715 /* Have we reached the end of a VOBU? */ | |
716 if (this->vobu.blockN >= this->vobu.vobu_length) { | |
717 | |
718 /* Have we reached the end of a cell? */ | |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
719 if(this->vobu.vobu_next == SRI_END_OF_CELL) { |
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
720 /* End of Cell from NAV DSI info */ |
31 | 721 #ifdef LOG_DEBUG |
76 | 722 fprintf(MSG_OUT, "libdvdnav: Still set to %x\n", this->position_next.still); |
31 | 723 #endif |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
724 this->position_current.still = this->position_next.still; |
0 | 725 |
116 | 726 /* we are about to leave a cell, so a lot of state changes could occur; |
727 * under certain conditions, the application should get in sync with us before this, | |
728 * otherwise it might show stills or menus too shortly */ | |
729 if ((this->position_current.still || this->pci.hli.hl_gi.hli_ss) && !this->sync_wait_skip) { | |
730 this->sync_wait = 1; | |
731 } else { | |
732 if( this->position_current.still == 0 || this->skip_still ) { | |
733 /* no active cell still -> get us to the next cell */ | |
734 vm_get_next_cell(this->vm); | |
735 this->position_current.still = 0; /* still gets activated at end of cell */ | |
736 this->skip_still = 0; | |
737 this->sync_wait_skip = 0; | |
738 } | |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
739 } |
114 | 740 /* handle related state changes in next iteration */ |
741 (*event) = DVDNAV_NOP; | |
742 (*len) = 0; | |
743 pthread_mutex_unlock(&this->vm_lock); | |
744 return S_OK; | |
745 } | |
0 | 746 |
114 | 747 /* Perform remapping jump if necessary (this is always a |
0 | 748 * VOBU boundary). */ |
114 | 749 if (this->vm->map) { |
750 this->vobu.vobu_next = remap_block( this->vm->map, | |
751 this->vm->state.domain, this->vm->state.TTN_REG, | |
752 this->vm->state.pgN, | |
753 this->vobu.vobu_start, this->vobu.vobu_next); | |
754 } | |
0 | 755 |
114 | 756 /* at the start of the next VOBU -> expecting NAV packet */ |
45 | 757 result = dvdnav_read_cache_block(this->cache, this->vobu.vobu_start + this->vobu.vobu_next, 1, buf); |
0 | 758 |
759 if(result <= 0) { | |
760 printerr("Error reading NAV packet."); | |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
761 pthread_mutex_unlock(&this->vm_lock); |
0 | 762 return S_ERR; |
763 } | |
114 | 764 /* Decode nav into pci and dsi. Then get next VOBU info. */ |
765 if(!dvdnav_decode_packet(this, *buf, &this->dsi, &this->pci)) { | |
0 | 766 printerr("Expected NAV packet but none found."); |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
767 pthread_mutex_unlock(&this->vm_lock); |
0 | 768 return S_ERR; |
769 } | |
114 | 770 /* We need to update the vm state->blockN with which VOBU we are in. |
771 * This is so RSM resumes to the VOBU level and not just the CELL level. | |
28 | 772 */ |
114 | 773 this->vm->state.blockN = this->vobu.vobu_start - this->position_current.cell_start; |
774 | |
775 dvdnav_get_vobu(this, &this->dsi, &this->pci, &this->vobu); | |
776 this->vobu.blockN = 0; | |
777 /* Give the cache a hint about the size of next VOBU. | |
778 * This improves pre-caching, because the VOBU will almost certainly be read entirely. | |
45 | 779 */ |
780 dvdnav_pre_cache_blocks(this->cache, this->vobu.vobu_start+1, this->vobu.vobu_length+1); | |
0 | 781 |
782 /* Successfully got a NAV packet */ | |
783 (*event) = DVDNAV_NAV_PACKET; | |
114 | 784 #ifdef LOG_DEBUG |
785 fprintf(MSG_OUT, "libdvdnav: NAV_PACKET\n"); | |
786 #endif | |
3
328eadb3f37e
Added initial example programs directory and make sure all debug/error output goes to stderr.
richwareham
parents:
0
diff
changeset
|
787 (*len) = 2048; |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
788 pthread_mutex_unlock(&this->vm_lock); |
0 | 789 return S_OK; |
790 } | |
791 | |
792 /* If we've got here, it must just be a normal block. */ | |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
793 if(!this->file) { |
114 | 794 printerr("Attempting to read without opening file."); |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
795 pthread_mutex_unlock(&this->vm_lock); |
0 | 796 return S_ERR; |
797 } | |
798 | |
114 | 799 this->vobu.blockN++; |
34
1f29402ef2ef
'Objectified' the read-ahead cache in preparation to implement a 'proper' threaded cache a-la that recommended in the DVD Demystified book.
richwareham
parents:
33
diff
changeset
|
800 result = dvdnav_read_cache_block(this->cache, this->vobu.vobu_start + this->vobu.blockN, 1, buf); |
0 | 801 if(result <= 0) { |
802 printerr("Error reading from DVD."); | |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
803 pthread_mutex_unlock(&this->vm_lock); |
0 | 804 return S_ERR; |
805 } | |
114 | 806 (*event) = DVDNAV_BLOCK_OK; |
0 | 807 (*len) = 2048; |
808 | |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
809 pthread_mutex_unlock(&this->vm_lock); |
0 | 810 return S_OK; |
811 } | |
812 | |
114 | 813 dvdnav_status_t dvdnav_get_title_string(dvdnav_t *this, const char **title_str) { |
814 | |
815 if(!this || !title_str) { | |
816 printerr("Passed a NULL pointer."); | |
817 return S_ERR; | |
818 } | |
819 | |
820 (*title_str) = this->vm->dvd_name; | |
821 return S_OK; | |
822 } | |
823 | |
824 uint8_t dvdnav_get_video_aspect(dvdnav_t *this) { | |
825 uint8_t retval; | |
826 | |
142
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
827 if(!this) { |
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
828 printerr("Passed a NULL pointer."); |
114 | 829 return -1; |
142
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
830 } |
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
831 if(!this->started) { |
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
832 printerr("Virtual DVD machine not started."); |
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
833 return -1; |
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
834 } |
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
835 |
114 | 836 pthread_mutex_lock(&this->vm_lock); |
837 retval = (uint8_t)vm_get_video_aspect(this->vm); | |
838 pthread_mutex_unlock(&this->vm_lock); | |
839 | |
840 return retval; | |
841 } | |
842 | |
843 uint8_t dvdnav_get_video_scale_permission(dvdnav_t *this) { | |
844 uint8_t retval; | |
845 | |
142
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
846 if(!this) { |
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
847 printerr("Passed a NULL pointer."); |
114 | 848 return -1; |
142
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
849 } |
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
850 if(!this->started) { |
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
851 printerr("Virtual DVD machine not started."); |
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
852 return -1; |
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
853 } |
114 | 854 |
855 pthread_mutex_lock(&this->vm_lock); | |
856 retval = (uint8_t)vm_get_video_scale_permission(this->vm); | |
857 pthread_mutex_unlock(&this->vm_lock); | |
858 | |
859 return retval; | |
860 } | |
861 | |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
862 uint16_t dvdnav_audio_stream_to_lang(dvdnav_t *this, uint8_t stream) { |
25
df024077cbc1
Why rewrite vm function, use it instead (this remark is for me, of course ;-) ).
f1rmb
parents:
24
diff
changeset
|
863 audio_attr_t attr; |
0 | 864 |
142
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
865 if(!this) { |
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
866 printerr("Passed a NULL pointer."); |
0 | 867 return -1; |
142
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
868 } |
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
869 if(!this->started) { |
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
870 printerr("Virtual DVD machine not started."); |
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
871 return -1; |
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
872 } |
0 | 873 |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
874 pthread_mutex_lock(&this->vm_lock); |
25
df024077cbc1
Why rewrite vm function, use it instead (this remark is for me, of course ;-) ).
f1rmb
parents:
24
diff
changeset
|
875 attr = vm_get_audio_attr(this->vm, stream); |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
876 pthread_mutex_unlock(&this->vm_lock); |
0 | 877 |
25
df024077cbc1
Why rewrite vm function, use it instead (this remark is for me, of course ;-) ).
f1rmb
parents:
24
diff
changeset
|
878 if(attr.lang_type != 1) |
21
d2d73f2ad8d3
Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents:
17
diff
changeset
|
879 return 0xffff; |
0 | 880 |
25
df024077cbc1
Why rewrite vm function, use it instead (this remark is for me, of course ;-) ).
f1rmb
parents:
24
diff
changeset
|
881 return attr.lang_code; |
0 | 882 } |
883 | |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
884 uint16_t dvdnav_spu_stream_to_lang(dvdnav_t *this, uint8_t stream) { |
25
df024077cbc1
Why rewrite vm function, use it instead (this remark is for me, of course ;-) ).
f1rmb
parents:
24
diff
changeset
|
885 subp_attr_t attr; |
21
d2d73f2ad8d3
Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents:
17
diff
changeset
|
886 |
142
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
887 if(!this) { |
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
888 printerr("Passed a NULL pointer."); |
21
d2d73f2ad8d3
Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents:
17
diff
changeset
|
889 return -1; |
142
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
890 } |
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
891 if(!this->started) { |
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
892 printerr("Virtual DVD machine not started."); |
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
893 return -1; |
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
894 } |
21
d2d73f2ad8d3
Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents:
17
diff
changeset
|
895 |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
896 pthread_mutex_lock(&this->vm_lock); |
25
df024077cbc1
Why rewrite vm function, use it instead (this remark is for me, of course ;-) ).
f1rmb
parents:
24
diff
changeset
|
897 attr = vm_get_subp_attr(this->vm, stream); |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
898 pthread_mutex_unlock(&this->vm_lock); |
21
d2d73f2ad8d3
Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents:
17
diff
changeset
|
899 |
25
df024077cbc1
Why rewrite vm function, use it instead (this remark is for me, of course ;-) ).
f1rmb
parents:
24
diff
changeset
|
900 if(attr.type != 1) |
21
d2d73f2ad8d3
Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents:
17
diff
changeset
|
901 return 0xffff; |
d2d73f2ad8d3
Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents:
17
diff
changeset
|
902 |
25
df024077cbc1
Why rewrite vm function, use it instead (this remark is for me, of course ;-) ).
f1rmb
parents:
24
diff
changeset
|
903 return attr.lang_code; |
21
d2d73f2ad8d3
Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents:
17
diff
changeset
|
904 } |
d2d73f2ad8d3
Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents:
17
diff
changeset
|
905 |
114 | 906 int8_t dvdnav_get_audio_logical_stream(dvdnav_t *this, uint8_t audio_num) { |
907 int8_t retval; | |
908 | |
142
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
909 if(!this) { |
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
910 printerr("Passed a NULL pointer."); |
114 | 911 return -1; |
142
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
912 } |
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
913 if(!this->started) { |
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
914 printerr("Virtual DVD machine not started."); |
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
915 return -1; |
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
916 } |
114 | 917 |
918 pthread_mutex_lock(&this->vm_lock); | |
919 if (!this->vm->state.pgc) { | |
142
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
920 printerr("No current PGC."); |
114 | 921 pthread_mutex_unlock(&this->vm_lock); |
922 return -1; | |
923 } | |
924 retval = vm_get_audio_stream(this->vm, audio_num); | |
925 pthread_mutex_unlock(&this->vm_lock); | |
926 | |
927 return retval; | |
928 } | |
929 | |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
930 int8_t dvdnav_get_spu_logical_stream(dvdnav_t *this, uint8_t subp_num) { |
21
d2d73f2ad8d3
Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents:
17
diff
changeset
|
931 int8_t retval; |
d2d73f2ad8d3
Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents:
17
diff
changeset
|
932 |
142
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
933 if(!this) { |
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
934 printerr("Passed a NULL pointer."); |
21
d2d73f2ad8d3
Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents:
17
diff
changeset
|
935 return -1; |
142
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
936 } |
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
937 if(!this->started) { |
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
938 printerr("Virtual DVD machine not started."); |
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
939 return -1; |
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
940 } |
21
d2d73f2ad8d3
Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents:
17
diff
changeset
|
941 |
114 | 942 pthread_mutex_lock(&this->vm_lock); |
943 if (!this->vm->state.pgc) { | |
142
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
944 printerr("No current PGC."); |
114 | 945 pthread_mutex_unlock(&this->vm_lock); |
946 return -1; | |
947 } | |
948 retval = vm_get_subp_stream(this->vm, subp_num, 0); | |
949 pthread_mutex_unlock(&this->vm_lock); | |
950 | |
951 return retval; | |
952 } | |
953 | |
954 int8_t dvdnav_get_active_audio_stream(dvdnav_t *this) { | |
955 int8_t retval; | |
956 | |
142
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
957 if(!this) { |
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
958 printerr("Passed a NULL pointer."); |
114 | 959 return -1; |
142
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
960 } |
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
961 if(!this->started) { |
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
962 printerr("Virtual DVD machine not started."); |
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
963 return -1; |
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
964 } |
114 | 965 |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
966 pthread_mutex_lock(&this->vm_lock); |
114 | 967 if (!this->vm->state.pgc) { |
142
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
968 printerr("No current PGC."); |
114 | 969 pthread_mutex_unlock(&this->vm_lock); |
970 return -1; | |
971 } | |
972 retval = vm_get_audio_active_stream(this->vm); | |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
973 pthread_mutex_unlock(&this->vm_lock); |
114 | 974 |
21
d2d73f2ad8d3
Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents:
17
diff
changeset
|
975 return retval; |
d2d73f2ad8d3
Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents:
17
diff
changeset
|
976 } |
d2d73f2ad8d3
Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents:
17
diff
changeset
|
977 |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
978 int8_t dvdnav_get_active_spu_stream(dvdnav_t *this) { |
21
d2d73f2ad8d3
Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents:
17
diff
changeset
|
979 int8_t retval; |
0 | 980 |
142
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
981 if(!this) { |
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
982 printerr("Passed a NULL pointer."); |
0 | 983 return -1; |
142
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
984 } |
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
985 if(!this->started) { |
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
986 printerr("Virtual DVD machine not started."); |
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
987 return -1; |
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
988 } |
0 | 989 |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
990 pthread_mutex_lock(&this->vm_lock); |
114 | 991 if (!this->vm->state.pgc) { |
142
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
992 printerr("No current PGC."); |
114 | 993 pthread_mutex_unlock(&this->vm_lock); |
994 return -1; | |
995 } | |
996 retval = vm_get_subp_active_stream(this->vm, 0); | |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
997 pthread_mutex_unlock(&this->vm_lock); |
0 | 998 |
21
d2d73f2ad8d3
Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents:
17
diff
changeset
|
999 return retval; |
0 | 1000 } |
1001 | |
114 | 1002 static int8_t dvdnav_is_domain(dvdnav_t *this, domain_t domain) { |
1003 int8_t retval; | |
1004 | |
142
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
1005 if(!this) { |
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
1006 printerr("Passed a NULL pointer."); |
114 | 1007 return -1; |
142
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
1008 } |
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
1009 if(!this->started) { |
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
1010 printerr("Virtual DVD machine not started."); |
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
1011 return -1; |
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
1012 } |
114 | 1013 |
1014 pthread_mutex_lock(&this->vm_lock); | |
1015 retval = (this->vm->state.domain == domain); | |
1016 pthread_mutex_unlock(&this->vm_lock); | |
1017 | |
1018 return retval; | |
1019 } | |
1020 | |
0 | 1021 /* First Play domain. (Menu) */ |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
1022 int8_t dvdnav_is_domain_fp(dvdnav_t *this) { |
114 | 1023 return dvdnav_is_domain(this, FP_DOMAIN); |
0 | 1024 } |
1025 /* Video management Menu domain. (Menu) */ | |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
1026 int8_t dvdnav_is_domain_vmgm(dvdnav_t *this) { |
114 | 1027 return dvdnav_is_domain(this, VMGM_DOMAIN); |
0 | 1028 } |
1029 /* Video Title Menu domain (Menu) */ | |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
1030 int8_t dvdnav_is_domain_vtsm(dvdnav_t *this) { |
114 | 1031 return dvdnav_is_domain(this, VTSM_DOMAIN); |
0 | 1032 } |
1033 /* Video Title domain (playing movie). */ | |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
1034 int8_t dvdnav_is_domain_vts(dvdnav_t *this) { |
114 | 1035 return dvdnav_is_domain(this, VTS_DOMAIN); |
0 | 1036 } |
1037 | |
114 | 1038 /* Generally delegate angle information handling to VM */ |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
1039 dvdnav_status_t dvdnav_angle_change(dvdnav_t *this, int angle) { |
0 | 1040 int num, current; |
1041 | |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
1042 if(!this) { |
114 | 1043 printerr("Passed a NULL pointer."); |
0 | 1044 return S_ERR; |
1045 } | |
1046 | |
114 | 1047 pthread_mutex_lock(&this->vm_lock); |
1048 vm_get_angle_info(this->vm, ¤t, &num); | |
0 | 1049 /* Set angle SPRM if valid */ |
1050 if((angle > 0) && (angle <= num)) { | |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
1051 this->vm->state.AGL_REG = angle; |
0 | 1052 } else { |
114 | 1053 printerr("Passed an invalid angle number."); |
1054 pthread_mutex_unlock(&this->vm_lock); | |
0 | 1055 return S_ERR; |
1056 } | |
114 | 1057 pthread_mutex_unlock(&this->vm_lock); |
0 | 1058 |
1059 return S_OK; | |
1060 } | |
1061 | |
114 | 1062 dvdnav_status_t dvdnav_get_angle_info(dvdnav_t *this, int *current_angle, |
1063 int *number_of_angles) { | |
1064 if(!this || !current_angle || !number_of_angles) { | |
1065 printerr("Passed a NULL pointer."); | |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
1066 return S_ERR; |
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
1067 } |
114 | 1068 |
1069 pthread_mutex_lock(&this->vm_lock); | |
1070 vm_get_angle_info(this->vm, current_angle, number_of_angles); | |
1071 pthread_mutex_unlock(&this->vm_lock); | |
1072 | |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
1073 return S_OK; |
114 | 1074 } |
0 | 1075 |
67
61c0ee1bbb7a
Moved get_current_nav_pci into dvdnac.c, changed example to use it instead of 'home-rolled'
richwareham
parents:
66
diff
changeset
|
1076 pci_t* dvdnav_get_current_nav_pci(dvdnav_t *this) { |
114 | 1077 if(!this) return 0; |
67
61c0ee1bbb7a
Moved get_current_nav_pci into dvdnac.c, changed example to use it instead of 'home-rolled'
richwareham
parents:
66
diff
changeset
|
1078 return &this->pci; |
61c0ee1bbb7a
Moved get_current_nav_pci into dvdnac.c, changed example to use it instead of 'home-rolled'
richwareham
parents:
66
diff
changeset
|
1079 } |
61c0ee1bbb7a
Moved get_current_nav_pci into dvdnac.c, changed example to use it instead of 'home-rolled'
richwareham
parents:
66
diff
changeset
|
1080 |
66
2bd4a78eefce
Patch from aschultz@cs.uni-magdeburg.de to allow for still-frame 'peek-ahead'
richwareham
parents:
60
diff
changeset
|
1081 dsi_t* dvdnav_get_current_nav_dsi(dvdnav_t *this) { |
114 | 1082 if(!this) return 0; |
66
2bd4a78eefce
Patch from aschultz@cs.uni-magdeburg.de to allow for still-frame 'peek-ahead'
richwareham
parents:
60
diff
changeset
|
1083 return &this->dsi; |
2bd4a78eefce
Patch from aschultz@cs.uni-magdeburg.de to allow for still-frame 'peek-ahead'
richwareham
parents:
60
diff
changeset
|
1084 } |
2bd4a78eefce
Patch from aschultz@cs.uni-magdeburg.de to allow for still-frame 'peek-ahead'
richwareham
parents:
60
diff
changeset
|
1085 |
2bd4a78eefce
Patch from aschultz@cs.uni-magdeburg.de to allow for still-frame 'peek-ahead'
richwareham
parents:
60
diff
changeset
|
1086 uint32_t dvdnav_get_next_still_flag(dvdnav_t *this) { |
114 | 1087 if(!this) return -1; |
66
2bd4a78eefce
Patch from aschultz@cs.uni-magdeburg.de to allow for still-frame 'peek-ahead'
richwareham
parents:
60
diff
changeset
|
1088 return this->position_next.still; |
2bd4a78eefce
Patch from aschultz@cs.uni-magdeburg.de to allow for still-frame 'peek-ahead'
richwareham
parents:
60
diff
changeset
|
1089 } |
2bd4a78eefce
Patch from aschultz@cs.uni-magdeburg.de to allow for still-frame 'peek-ahead'
richwareham
parents:
60
diff
changeset
|
1090 |
0 | 1091 /* |
1092 * $Log$ | |
161 | 1093 * Revision 1.52 2003/04/06 13:05:45 mroi |
1094 * report start of PG as well | |
1095 * | |
151 | 1096 * Revision 1.51 2003/04/04 14:21:32 mroi |
1097 * fill in new timing member in cell_change event | |
1098 * | |
143
0b302ca31859
merge James fixes from xine-lib cvs back into libdvdnav cvs so they will not be lost
mroi
parents:
142
diff
changeset
|
1099 * Revision 1.50 2003/04/01 11:30:56 mroi |
0b302ca31859
merge James fixes from xine-lib cvs back into libdvdnav cvs so they will not be lost
mroi
parents:
142
diff
changeset
|
1100 * merge James fixes from xine-lib cvs back into libdvdnav cvs so they will not be lost |
0b302ca31859
merge James fixes from xine-lib cvs back into libdvdnav cvs so they will not be lost
mroi
parents:
142
diff
changeset
|
1101 * on syncing |
0b302ca31859
merge James fixes from xine-lib cvs back into libdvdnav cvs so they will not be lost
mroi
parents:
142
diff
changeset
|
1102 * |
142
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
1103 * Revision 1.49 2003/04/01 11:28:54 mroi |
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
1104 * some more sanity checking will prevent segfaults in these functions |
e375b765ebf5
some more sanity checking will prevent segfaults in these functions
mroi
parents:
141
diff
changeset
|
1105 * |
141
8f63f4c25f2f
update position on HOP_CHANNEL, do not rely on a following CELL_CHANGE
mroi
parents:
135
diff
changeset
|
1106 * Revision 1.48 2003/03/31 13:48:36 mroi |
8f63f4c25f2f
update position on HOP_CHANNEL, do not rely on a following CELL_CHANGE
mroi
parents:
135
diff
changeset
|
1107 * update position on HOP_CHANNEL, do not rely on a following CELL_CHANGE |
8f63f4c25f2f
update position on HOP_CHANNEL, do not rely on a following CELL_CHANGE
mroi
parents:
135
diff
changeset
|
1108 * |
135 | 1109 * Revision 1.47 2003/03/26 14:37:22 mroi |
1110 * I should get a brain and learn how to handle BCD... | |
1111 * also fixing a possible mis-jump with angled cells | |
1112 * | |
134
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
1113 * Revision 1.46 2003/03/25 12:46:26 mroi |
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
1114 * - new event on cell changes to report program and cell number and some time info |
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
1115 * - get rid of memcopies in event handling |
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
1116 * |
127 | 1117 * Revision 1.45 2003/03/15 20:18:50 mroi |
1118 * start blockN from 0 | |
1119 * | |
126 | 1120 * Revision 1.44 2003/03/14 18:49:28 mroi |
1121 * less overwhelming TRACE info | |
1122 * | |
121 | 1123 * Revision 1.43 2003/03/12 11:38:51 mroi |
1124 * stop the VM here | |
1125 * | |
116 | 1126 * Revision 1.42 2003/02/25 14:08:14 mroi |
1127 * new event DVDNAV_WAIT | |
115 | 1128 * |
114 | 1129 * Revision 1.40 2003/02/20 15:32:15 mroi |
1130 * big libdvdnav cleanup, quoting the ChangeLog: | |
1131 * * some bugfixes | |
1132 * * code cleanup | |
1133 * * build process polishing | |
1134 * * more sensible event order in get_next_block to ensure useful event delivery | |
1135 * * VOBU level resume | |
1136 * * fixed: seeking in a multiangle feature briefly showed the wrong angle | |
1137 * | |
106
e984044bbe7b
port Stephen's comment fixing to avoid problems when syncing xine-lib's copy of
mroi
parents:
100
diff
changeset
|
1138 * Revision 1.39 2002/10/23 11:38:09 mroi |
e984044bbe7b
port Stephen's comment fixing to avoid problems when syncing xine-lib's copy of
mroi
parents:
100
diff
changeset
|
1139 * port Stephen's comment fixing to avoid problems when syncing xine-lib's copy of |
e984044bbe7b
port Stephen's comment fixing to avoid problems when syncing xine-lib's copy of
mroi
parents:
100
diff
changeset
|
1140 * libdvdnav |
e984044bbe7b
port Stephen's comment fixing to avoid problems when syncing xine-lib's copy of
mroi
parents:
100
diff
changeset
|
1141 * |
100 | 1142 * Revision 1.38 2002/09/19 04:48:28 jcdutton |
1143 * Update version info. | |
1144 * The "note2" bit if to help developers know which version of libdvdnav the user is using. | |
1145 * | |
99 | 1146 * Revision 1.37 2002/09/18 14:26:42 mroi |
1147 * fix possible unlock on not locked mutex | |
1148 * | |
97
c1dff1899bda
First patch for personalized dvd viewing. I have not tested it yet.
jcdutton
parents:
92
diff
changeset
|
1149 * Revision 1.36 2002/09/17 11:00:21 jcdutton |
c1dff1899bda
First patch for personalized dvd viewing. I have not tested it yet.
jcdutton
parents:
92
diff
changeset
|
1150 * First patch for personalized dvd viewing. I have not tested it yet. |
c1dff1899bda
First patch for personalized dvd viewing. I have not tested it yet.
jcdutton
parents:
92
diff
changeset
|
1151 * |
92 | 1152 * Revision 1.35 2002/09/05 12:55:05 mroi |
1153 * fix memleaks in dvdnav_open | |
1154 * | |
89
0fbef4901e2c
Add a comment so I can tell which version of the CVS a user is using.
jcdutton
parents:
84
diff
changeset
|
1155 * Revision 1.34 2002/09/03 00:41:48 jcdutton |
0fbef4901e2c
Add a comment so I can tell which version of the CVS a user is using.
jcdutton
parents:
84
diff
changeset
|
1156 * Add a comment so I can tell which version of the CVS a user is using. |
0fbef4901e2c
Add a comment so I can tell which version of the CVS a user is using.
jcdutton
parents:
84
diff
changeset
|
1157 * Also add a FIXME to remind me to fix the Chapter number display. |
0fbef4901e2c
Add a comment so I can tell which version of the CVS a user is using.
jcdutton
parents:
84
diff
changeset
|
1158 * |
84 | 1159 * Revision 1.33 2002/08/31 11:05:27 jcdutton |
1160 * Properly seed the DVD VM Instruction rand(). | |
1161 * | |
82 | 1162 * Revision 1.32 2002/08/31 02:50:27 jcdutton |
1163 * Improve some debug messages. | |
1164 * Add some comments about dvdnav_open memory leaks. | |
1165 * | |
76 | 1166 * Revision 1.31 2002/08/27 19:15:08 mroi |
1167 * more consistent console output | |
1168 * | |
73
a23d50ba81d3
update spu clut, spu channel and audio channel more often
mroi
parents:
67
diff
changeset
|
1169 * Revision 1.30 2002/08/09 21:34:27 mroi |
a23d50ba81d3
update spu clut, spu channel and audio channel more often
mroi
parents:
67
diff
changeset
|
1170 * update spu clut, spu channel and audio channel more often |
a23d50ba81d3
update spu clut, spu channel and audio channel more often
mroi
parents:
67
diff
changeset
|
1171 * |
67
61c0ee1bbb7a
Moved get_current_nav_pci into dvdnac.c, changed example to use it instead of 'home-rolled'
richwareham
parents:
66
diff
changeset
|
1172 * Revision 1.29 2002/07/25 14:51:40 richwareham |
61c0ee1bbb7a
Moved get_current_nav_pci into dvdnac.c, changed example to use it instead of 'home-rolled'
richwareham
parents:
66
diff
changeset
|
1173 * Moved get_current_nav_pci into dvdnac.c, changed example to use it instead of 'home-rolled' |
61c0ee1bbb7a
Moved get_current_nav_pci into dvdnac.c, changed example to use it instead of 'home-rolled'
richwareham
parents:
66
diff
changeset
|
1174 * check_packet. |
61c0ee1bbb7a
Moved get_current_nav_pci into dvdnac.c, changed example to use it instead of 'home-rolled'
richwareham
parents:
66
diff
changeset
|
1175 * |
66
2bd4a78eefce
Patch from aschultz@cs.uni-magdeburg.de to allow for still-frame 'peek-ahead'
richwareham
parents:
60
diff
changeset
|
1176 * Revision 1.28 2002/07/25 14:42:33 richwareham |
2bd4a78eefce
Patch from aschultz@cs.uni-magdeburg.de to allow for still-frame 'peek-ahead'
richwareham
parents:
60
diff
changeset
|
1177 * Patch from aschultz@cs.uni-magdeburg.de to allow for still-frame 'peek-ahead' |
2bd4a78eefce
Patch from aschultz@cs.uni-magdeburg.de to allow for still-frame 'peek-ahead'
richwareham
parents:
60
diff
changeset
|
1178 * |
60 | 1179 * Revision 1.27 2002/07/12 15:46:44 mroi |
1180 * use new memcopy'less read ahead cache | |
1181 * | |
58 | 1182 * Revision 1.26 2002/07/06 16:24:54 mroi |
1183 * * fix debug messages | |
1184 * * send spu stream change event only, when there are new streams | |
1185 * (should fix problems with Terminator disk 2) | |
1186 * | |
55
5674fbd44f26
report all spu types (widescreen, letterbox and pan&scan), not widescreen
mroi
parents:
54
diff
changeset
|
1187 * Revision 1.25 2002/07/05 14:18:54 mroi |
5674fbd44f26
report all spu types (widescreen, letterbox and pan&scan), not widescreen
mroi
parents:
54
diff
changeset
|
1188 * report all spu types (widescreen, letterbox and pan&scan), not widescreen |
5674fbd44f26
report all spu types (widescreen, letterbox and pan&scan), not widescreen
mroi
parents:
54
diff
changeset
|
1189 * only and report the stream's scale permissions to detect pan&scan material |
5674fbd44f26
report all spu types (widescreen, letterbox and pan&scan), not widescreen
mroi
parents:
54
diff
changeset
|
1190 * |
54 | 1191 * Revision 1.24 2002/07/05 01:42:30 jcdutton |
1192 * Add more debug info for Menu language selection. | |
1193 * Only do vm_start when we have to. | |
1194 * | |
50
578ce1d41479
Rename some of the functions in vm.c to help readability.
jcdutton
parents:
45
diff
changeset
|
1195 * Revision 1.23 2002/07/02 22:57:09 jcdutton |
578ce1d41479
Rename some of the functions in vm.c to help readability.
jcdutton
parents:
45
diff
changeset
|
1196 * Rename some of the functions in vm.c to help readability. |
578ce1d41479
Rename some of the functions in vm.c to help readability.
jcdutton
parents:
45
diff
changeset
|
1197 * Hopefully fix __FUNCTION__ problem. Use __func_ as recommended in C99. |
578ce1d41479
Rename some of the functions in vm.c to help readability.
jcdutton
parents:
45
diff
changeset
|
1198 * Fix bug where libdvdnav would not immeadiately replay the same cell due to menu buttons. |
578ce1d41479
Rename some of the functions in vm.c to help readability.
jcdutton
parents:
45
diff
changeset
|
1199 * |
45 | 1200 * Revision 1.22 2002/06/25 13:37:11 jcdutton |
1201 * Revert back to old read_cache method. | |
1202 * Some new optimizations added to the old read_cache method, thus reducing the amount of calls to read blocks from the DVD device. | |
1203 * | |
43
0ba15bf3dc25
Biiiiiiig change to let doxygen generate some docs for the library. Note that I'm in no way sure that the autoconf stuff plays nice.
richwareham
parents:
42
diff
changeset
|
1204 * Revision 1.21 2002/06/06 15:03:09 richwareham |
0ba15bf3dc25
Biiiiiiig change to let doxygen generate some docs for the library. Note that I'm in no way sure that the autoconf stuff plays nice.
richwareham
parents:
42
diff
changeset
|
1205 * Biiiiiiig change to let doxygen generate some docs for the library. Note that I'm in no way sure that the autoconf stuff plays nice. |
0ba15bf3dc25
Biiiiiiig change to let doxygen generate some docs for the library. Note that I'm in no way sure that the autoconf stuff plays nice.
richwareham
parents:
42
diff
changeset
|
1206 * |
42 | 1207 * Revision 1.20 2002/06/04 13:35:16 richwareham |
1208 * Removed more C++ style comments | |
1209 * | |
39 | 1210 * Revision 1.19 2002/05/30 23:15:14 richwareham |
1211 * First draft of removing HAVE_DVDREAD9 | |
1212 * | |
34
1f29402ef2ef
'Objectified' the read-ahead cache in preparation to implement a 'proper' threaded cache a-la that recommended in the DVD Demystified book.
richwareham
parents:
33
diff
changeset
|
1213 * Revision 1.18 2002/05/30 09:52:29 richwareham |
1f29402ef2ef
'Objectified' the read-ahead cache in preparation to implement a 'proper' threaded cache a-la that recommended in the DVD Demystified book.
richwareham
parents:
33
diff
changeset
|
1214 * 'Objectified' the read-ahead cache in preparation to implement a 'proper' threaded cache a-la that recommended in the DVD Demystified book. |
1f29402ef2ef
'Objectified' the read-ahead cache in preparation to implement a 'proper' threaded cache a-la that recommended in the DVD Demystified book.
richwareham
parents:
33
diff
changeset
|
1215 * |
33
ef2136c4e7b2
Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents:
31
diff
changeset
|
1216 * Revision 1.17 2002/05/09 11:57:24 richwareham |
ef2136c4e7b2
Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents:
31
diff
changeset
|
1217 * Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus) |
ef2136c4e7b2
Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents:
31
diff
changeset
|
1218 * |
31 | 1219 * Revision 1.16 2002/04/24 21:15:25 jcdutton |
1220 * Quiet please!!! | |
1221 * | |
30 | 1222 * Revision 1.15 2002/04/24 00:47:46 jcdutton |
1223 * Some more cleanups. | |
1224 * Improve button passing. | |
1225 * | |
28 | 1226 * Revision 1.14 2002/04/23 13:26:08 jcdutton |
1227 * Add some comments, FIXMEs. | |
1228 * The main point being that dvdnav_get_next_block is almost in a state where it can be optional whether the application programmer uses it, or implements their own version of the function. That is been the main reason for the re-write of this function recently. | |
1229 * | |
26 | 1230 * Revision 1.13 2002/04/23 12:55:40 jcdutton |
1231 * Removed un-needed variables. | |
1232 * General Clean up. | |
1233 * | |
25
df024077cbc1
Why rewrite vm function, use it instead (this remark is for me, of course ;-) ).
f1rmb
parents:
24
diff
changeset
|
1234 * Revision 1.12 2002/04/23 12:34:39 f1rmb |
df024077cbc1
Why rewrite vm function, use it instead (this remark is for me, of course ;-) ).
f1rmb
parents:
24
diff
changeset
|
1235 * Why rewrite vm function, use it instead (this remark is for me, of course ;-) ). |
df024077cbc1
Why rewrite vm function, use it instead (this remark is for me, of course ;-) ).
f1rmb
parents:
24
diff
changeset
|
1236 * Comment unused var, shut compiler warnings. |
df024077cbc1
Why rewrite vm function, use it instead (this remark is for me, of course ;-) ).
f1rmb
parents:
24
diff
changeset
|
1237 * |
24 | 1238 * Revision 1.11 2002/04/23 02:12:27 jcdutton |
1239 * Re-implemented seeking. | |
1240 * | |
23 | 1241 * Revision 1.10 2002/04/23 00:07:16 jcdutton |
1242 * Name stills work better. | |
1243 * | |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
1244 * Revision 1.9 2002/04/22 22:00:48 jcdutton |
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
1245 * Start of rewrite of libdvdnav. Still need to re-implement seeking. |
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
1246 * |
21
d2d73f2ad8d3
Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents:
17
diff
changeset
|
1247 * Revision 1.8 2002/04/22 20:57:14 f1rmb |
d2d73f2ad8d3
Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents:
17
diff
changeset
|
1248 * Change/fix SPU active stream id. Same for audio. Few new functions, largely |
d2d73f2ad8d3
Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents:
17
diff
changeset
|
1249 * inspired from libogle ;-). |
d2d73f2ad8d3
Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents:
17
diff
changeset
|
1250 * |
17 | 1251 * Revision 1.7 2002/04/10 16:45:57 jcdutton |
1252 * Actually fix the const this time! | |
1253 * | |
8
66708b4a1b5e
Stop C++ bitching about some things and extend the menus example
richwareham
parents:
7
diff
changeset
|
1254 * Revision 1.6 2002/04/07 14:10:11 richwareham |
66708b4a1b5e
Stop C++ bitching about some things and extend the menus example
richwareham
parents:
7
diff
changeset
|
1255 * Stop C++ bitching about some things and extend the menus example |
66708b4a1b5e
Stop C++ bitching about some things and extend the menus example
richwareham
parents:
7
diff
changeset
|
1256 * |
7
7fdefafa624f
Slight correction to handle quicker menu transitions.
jcdutton
parents:
6
diff
changeset
|
1257 * Revision 1.5 2002/04/06 18:42:05 jcdutton |
7fdefafa624f
Slight correction to handle quicker menu transitions.
jcdutton
parents:
6
diff
changeset
|
1258 * Slight correction to handle quicker menu transitions. |
7fdefafa624f
Slight correction to handle quicker menu transitions.
jcdutton
parents:
6
diff
changeset
|
1259 * |
6 | 1260 * Revision 1.4 2002/04/06 18:31:50 jcdutton |
1261 * Some cleaning up. | |
1262 * changed exit(1) to assert(0) so they actually get seen by the user so that it helps developers more. | |
1263 * | |
4
99bed5d6db2f
Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents:
3
diff
changeset
|
1264 * Revision 1.3 2002/04/02 18:22:27 richwareham |
99bed5d6db2f
Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents:
3
diff
changeset
|
1265 * Added reset patch from Kees Cook <kees@outflux.net> |
99bed5d6db2f
Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents:
3
diff
changeset
|
1266 * |
3
328eadb3f37e
Added initial example programs directory and make sure all debug/error output goes to stderr.
richwareham
parents:
0
diff
changeset
|
1267 * Revision 1.2 2002/04/01 18:56:28 richwareham |
328eadb3f37e
Added initial example programs directory and make sure all debug/error output goes to stderr.
richwareham
parents:
0
diff
changeset
|
1268 * Added initial example programs directory and make sure all debug/error output goes to stderr. |
328eadb3f37e
Added initial example programs directory and make sure all debug/error output goes to stderr.
richwareham
parents:
0
diff
changeset
|
1269 * |
328eadb3f37e
Added initial example programs directory and make sure all debug/error output goes to stderr.
richwareham
parents:
0
diff
changeset
|
1270 * Revision 1.1.1.1 2002/03/12 19:45:57 richwareham |
328eadb3f37e
Added initial example programs directory and make sure all debug/error output goes to stderr.
richwareham
parents:
0
diff
changeset
|
1271 * Initial import |
0 | 1272 * |
1273 * Revision 1.28 2002/02/02 23:26:20 richwareham | |
1274 * Restored title selection | |
1275 * | |
1276 * Revision 1.27 2002/02/01 15:48:10 richwareham | |
1277 * Re-implemented angle selection and title/chapter display | |
1278 * | |
1279 * Revision 1.26 2002/01/31 16:53:49 richwareham | |
1280 * Big patch from Daniel Caujolle-Bert to (re)implement SPU/Audio language display | |
1281 * | |
1282 * Revision 1.25 2002/01/24 20:53:50 richwareham | |
1283 * Added option to _not_ use DVD read-ahead to options | |
1284 * | |
1285 * Revision 1.24 2002/01/20 15:54:59 jcdutton | |
1286 * Implement seeking. | |
1287 * It is still a bit buggy, but works sometimes. | |
1288 * I need to find out how to make the jump clean. | |
1289 * At the moment, some corruption of the mpeg2 stream occurs, | |
1290 * which causes libmpeg2 to crash. | |
1291 * | |
1292 * Revision 1.23 2002/01/18 00:23:52 jcdutton | |
1293 * Support Ejecting of DVD. | |
1294 * It will first un-mount the DVD, then eject it. | |
1295 * | |
1296 * Revision 1.22 2002/01/17 14:50:32 jcdutton | |
1297 * Fix corruption of stream during menu transitions. | |
1298 * Menu transitions are now clean. | |
1299 * | |
1300 * Revision 1.21 2002/01/15 00:37:03 jcdutton | |
1301 * Just a few cleanups, and a assert fix. (memset fixed it) | |
1302 * | |
1303 * Revision 1.20 2002/01/13 22:17:57 jcdutton | |
1304 * Change logging. | |
1305 * | |
1306 * | |
1307 */ |