Mercurial > libdvdnav.hg
annotate dvdnav.c @ 134:d9d75a22a061 src
- new event on cell changes to report program and cell number and some time info
- get rid of memcopies in event handling
author | mroi |
---|---|
date | Tue, 25 Mar 2003 12:46:29 +0000 |
parents | f2e86078a5dc |
children | 5204d4e4cd3b |
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 |
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
213 result = (time->hour & 0xf0) * 10 * 60 * 60 * 90000; |
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; |
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
215 result += (time->minute & 0xf0) * 10 * 60 * 90000; |
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; |
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
217 result += (time->second & 0xf0) * 10 * 90000; |
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; |
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
219 frames = (time->frame_u & 0x30) * 10 ; |
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
220 frames += (time->frame_u & 0x0f) ; |
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
221 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
|
222 result += frames * 3000; |
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
223 else |
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
224 result += frames * 3600; |
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
225 |
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
226 return result; |
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 |
114 | 229 /* |
0 | 230 * Returns 1 if block contains NAV packet, 0 otherwise. |
231 * Precesses said NAV packet if present. | |
232 * | |
233 * Most of the code in here is copied from xine's MPEG demuxer | |
234 * so any bugs which are found in that should be corrected here also. | |
235 */ | |
114 | 236 static int dvdnav_decode_packet(dvdnav_t *this, uint8_t *p, dsi_t *nav_dsi, pci_t *nav_pci) { |
237 int bMpeg1 = 0; | |
0 | 238 uint32_t nHeaderLen; |
239 uint32_t nPacketLen; | |
240 uint32_t nStreamID; | |
241 | |
242 if (p[3] == 0xBA) { /* program stream pack header */ | |
243 int nStuffingBytes; | |
244 | |
245 bMpeg1 = (p[4] & 0x40) == 0; | |
246 | |
247 if (bMpeg1) { | |
114 | 248 p += 12; |
0 | 249 } else { /* mpeg2 */ |
250 nStuffingBytes = p[0xD] & 0x07; | |
251 p += 14 + nStuffingBytes; | |
252 } | |
253 } | |
254 | |
255 if (p[3] == 0xbb) { /* program stream system header */ | |
256 nHeaderLen = (p[4] << 8) | p[5]; | |
257 p += 6 + nHeaderLen; | |
258 } | |
259 | |
260 /* we should now have a PES packet here */ | |
261 if (p[0] || p[1] || (p[2] != 1)) { | |
76 | 262 fprintf(MSG_OUT, "libdvdnav: demux error! %02x %02x %02x (should be 0x000001) \n",p[0],p[1],p[2]); |
0 | 263 return 0; |
264 } | |
265 | |
266 nPacketLen = p[4] << 8 | p[5]; | |
267 nStreamID = p[3]; | |
268 | |
269 nHeaderLen = 6; | |
270 p += nHeaderLen; | |
271 | |
272 if (nStreamID == 0xbf) { /* Private stream 2 */ | |
114 | 273 #if 0 |
274 int i; | |
275 fprintf(MSG_OUT, "libdvdnav: nav packet=%u\n",p-p_start-6); | |
276 for(i=0;i<80;i++) | |
277 fprintf(MSG_OUT, "%02x ",p[i-6]); | |
278 fprintf(MSG_OUT, "\n"); | |
279 #endif | |
280 | |
0 | 281 if(p[0] == 0x00) { |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
282 navRead_PCI(nav_pci, p+1); |
0 | 283 } |
284 | |
285 p += nPacketLen; | |
286 | |
287 /* We should now have a DSI packet. */ | |
288 if(p[6] == 0x01) { | |
289 nPacketLen = p[4] << 8 | p[5]; | |
290 p += 6; | |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
291 navRead_DSI(nav_dsi, p+1); |
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
292 } |
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
293 return 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 0; |
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
296 } |
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
|
297 |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
298 /* DSI is used for most angle stuff. |
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
299 * 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
|
300 */ |
114 | 301 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
|
302 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
|
303 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
|
304 |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
305 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
|
306 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
|
307 |
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
|
308 /* |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
309 * 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
|
310 * 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
|
311 * 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
|
312 * 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
|
313 * really happy. |
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
314 * |
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
315 * 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
|
316 * 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
|
317 * Should really assert if bit 31 != 1 |
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
318 */ |
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
|
319 |
114 | 320 #if 0 |
321 /* 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
|
322 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
|
323 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
|
324 } 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
|
325 vobu->vobu_next = vobu->vobu_length; |
114 | 326 } |
327 #else | |
328 /* Relative offset from vobu_start */ | |
329 vobu->vobu_next = ( nav_dsi->vobu_sri.next_vobu & 0x3fffffff ); | |
330 #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
|
331 |
114 | 332 vm_get_angle_info(this->vm, &angle, &num_angle); |
333 | |
334 /* 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
|
335 #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
|
336 if((num_angle < angle) && (angle != 1)) { |
114 | 337 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
|
338 |
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
|
339 /* 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
|
340 * finish with angles. */ |
114 | 341 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
|
342 } |
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
|
343 #endif |
0 | 344 |
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
|
345 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
|
346 |
114 | 347 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
|
348 if((next & 0x3fffffff) != 0) { |
114 | 349 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
|
350 vobu->vobu_next = - (int32_t)(next & 0x3fffffff); |
114 | 351 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
|
352 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
|
353 } |
114 | 354 } 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
|
355 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
|
356 |
114 | 357 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
|
358 vobu->vobu_next = - (int32_t)(next & 0x3fffffff); |
114 | 359 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
|
360 vobu->vobu_next = + (int32_t)(next & 0x3fffffff); |
0 | 361 } |
362 } | |
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
|
363 |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
364 return 1; |
0 | 365 } |
60 | 366 |
114 | 367 /* |
368 * These are the main get_next_block function which actually get the media stream video and audio etc. | |
369 * | |
370 * There are two versions: The second one is using the zero-copy read ahead cache and therefore | |
371 * hands out pointers targetting directly into the cache. | |
372 * The first one uses a memcopy to fill this cache block into the application provided memory. | |
373 * The benefit of this first one is that no special memory management is needed. The application is | |
374 * the only one responsible of allocating and freeing the memory associated with the pointer. | |
375 * The drawback is the additional memcopy. | |
28 | 376 */ |
60 | 377 |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
378 dvdnav_status_t dvdnav_get_next_block(dvdnav_t *this, unsigned char *buf, |
114 | 379 int *event, int *len) { |
60 | 380 unsigned char *block; |
381 dvdnav_status_t status; | |
382 | |
383 block = buf; | |
384 status = dvdnav_get_next_cache_block(this, &block, event, len); | |
114 | 385 if (status == S_OK && block != buf) { |
60 | 386 /* we received a block from the cache, copy it, so we can give it back */ |
387 memcpy(buf, block, DVD_VIDEO_LB_LEN); | |
388 dvdnav_free_cache_block(this, block); | |
389 } | |
390 return status; | |
391 } | |
392 | |
393 dvdnav_status_t dvdnav_get_next_cache_block(dvdnav_t *this, unsigned char **buf, | |
114 | 394 int *event, int *len) { |
0 | 395 dvd_state_t *state; |
396 int result; | |
114 | 397 |
60 | 398 if(!this || !event || !len || !buf || !*buf) { |
114 | 399 printerr("Passed a NULL pointer."); |
0 | 400 return S_ERR; |
401 } | |
114 | 402 |
403 pthread_mutex_lock(&this->vm_lock); | |
0 | 404 |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
405 if(!this->started) { |
0 | 406 /* Start the VM */ |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
407 vm_start(this->vm); |
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
408 this->started = 1; |
0 | 409 } |
410 | |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
411 state = &(this->vm->state); |
0 | 412 (*event) = DVDNAV_NOP; |
413 (*len) = 0; | |
414 | |
415 /* Check the STOP flag */ | |
114 | 416 if(this->vm->stopped) { |
121 | 417 vm_stop(this->vm); |
0 | 418 (*event) = DVDNAV_STOP; |
114 | 419 this->started = 0; |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
420 pthread_mutex_unlock(&this->vm_lock); |
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
421 return S_OK; |
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
422 } |
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
423 |
114 | 424 vm_position_get(this->vm, &this->position_next); |
0 | 425 |
126 | 426 #ifdef LOG_DEBUG |
114 | 427 fprintf(MSG_OUT, "libdvdnav: POS-NEXT "); |
428 vm_position_print(this->vm, &this->position_next); | |
116 | 429 fprintf(MSG_OUT, "libdvdnav: POS-CUR "); |
114 | 430 vm_position_print(this->vm, &this->position_current); |
31 | 431 #endif |
114 | 432 |
433 /* did we hop? */ | |
434 if(this->position_current.hop_channel != this->position_next.hop_channel) { | |
435 (*event) = DVDNAV_HOP_CHANNEL; | |
58 | 436 #ifdef LOG_DEBUG |
114 | 437 fprintf(MSG_OUT, "libdvdnav: HOP_CHANNEL\n"); |
31 | 438 #endif |
115 | 439 if (this->position_next.hop_channel - this->position_current.hop_channel >= HOP_SEEK) { |
114 | 440 int num_angles = 0, current; |
441 | |
442 /* we seeked -> check for multiple angles */ | |
443 vm_get_angle_info(this->vm, ¤t, &num_angles); | |
444 if (num_angles > 1) { | |
445 int result, block; | |
446 /* we have to skip the first VOBU when seeking in a multiangle feature, | |
447 * because it might belong to the wrong angle */ | |
448 block = this->position_next.cell_start + this->position_next.block; | |
449 result = dvdnav_read_cache_block(this->cache, block, 1, buf); | |
450 if(result <= 0) { | |
451 printerr("Error reading NAV packet."); | |
452 pthread_mutex_unlock(&this->vm_lock); | |
453 return S_ERR; | |
454 } | |
455 /* Decode nav into pci and dsi. Then get next VOBU info. */ | |
456 if(!dvdnav_decode_packet(this, *buf, &this->dsi, &this->pci)) { | |
457 printerr("Expected NAV packet but none found."); | |
458 pthread_mutex_unlock(&this->vm_lock); | |
459 return S_ERR; | |
460 } | |
461 dvdnav_get_vobu(this, &this->dsi, &this->pci, &this->vobu); | |
462 /* skip to next, if there is a next */ | |
463 if (this->vobu.vobu_next != SRI_END_OF_CELL) { | |
464 this->vobu.vobu_start += this->vobu.vobu_next; | |
465 this->vobu.vobu_next = 0; | |
466 } | |
467 /* update VM state */ | |
468 this->vm->state.blockN = this->vobu.vobu_start - this->position_next.cell_start; | |
469 } | |
470 } | |
471 this->position_current.hop_channel = this->position_next.hop_channel; | |
127 | 472 /* Make blockN == vobu_length to do expected_nav */ |
114 | 473 this->vobu.vobu_length = 0; |
127 | 474 this->vobu.blockN = 0; |
116 | 475 this->sync_wait = 0; |
30 | 476 pthread_mutex_unlock(&this->vm_lock); |
477 return S_OK; | |
0 | 478 } |
479 | |
116 | 480 /* Check the HIGHLIGHT flag */ |
481 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
|
482 dvdnav_highlight_event_t *hevent = (dvdnav_highlight_event_t *)*buf; |
116 | 483 |
484 (*event) = DVDNAV_HIGHLIGHT; | |
485 #ifdef LOG_DEBUG | |
486 fprintf(MSG_OUT, "libdvdnav: HIGHLIGHT\n"); | |
487 #endif | |
134
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
488 (*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
|
489 hevent->display = 1; |
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
490 hevent->buttonN = this->position_next.button; |
116 | 491 this->position_current.button = this->position_next.button; |
492 pthread_mutex_unlock(&this->vm_lock); | |
493 return S_OK; | |
494 } | |
495 | |
496 /* Check the WAIT flag */ | |
497 if(this->sync_wait) { | |
498 (*event) = DVDNAV_WAIT; | |
499 #ifdef LOG_DEBUG | |
500 fprintf(MSG_OUT, "libdvdnav: WAIT\n"); | |
501 #endif | |
502 (*len) = 0; | |
503 pthread_mutex_unlock(&this->vm_lock); | |
504 return S_OK; | |
505 } | |
506 | |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
507 /* 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
|
508 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
|
509 (this->position_current.domain != this->position_next.domain)) { |
0 | 510 dvd_read_domain_t domain; |
511 int vtsN; | |
134
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
512 dvdnav_vts_change_event_t *vts_event = (dvdnav_vts_change_event_t *)*buf; |
0 | 513 |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
514 if(this->file) { |
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
515 DVDCloseFile(this->file); |
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
516 this->file = NULL; |
0 | 517 } |
518 | |
134
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
519 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
|
520 vts_event->old_domain = this->open_domain; |
0 | 521 |
114 | 522 /* 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
|
523 switch(this->position_next.domain) { |
114 | 524 case FP_DOMAIN: |
525 case VMGM_DOMAIN: | |
0 | 526 domain = DVD_READ_MENU_VOBS; |
527 vtsN = 0; | |
528 break; | |
114 | 529 case VTSM_DOMAIN: |
0 | 530 domain = DVD_READ_MENU_VOBS; |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
531 vtsN = this->position_next.vts; |
0 | 532 break; |
114 | 533 case VTS_DOMAIN: |
0 | 534 domain = DVD_READ_TITLE_VOBS; |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
535 vtsN = this->position_next.vts; |
0 | 536 break; |
114 | 537 default: |
0 | 538 printerr("Unknown domain when changing VTS."); |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
539 pthread_mutex_unlock(&this->vm_lock); |
0 | 540 return S_ERR; |
541 } | |
542 | |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
543 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
|
544 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
|
545 dvdnav_read_cache_clear(this->cache); |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
546 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
|
547 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
|
548 vts_event->new_domain = this->position_next.domain; |
0 | 549 |
550 /* 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
|
551 if(this->file == NULL) { |
0 | 552 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
|
553 pthread_mutex_unlock(&this->vm_lock); |
0 | 554 return S_ERR; |
555 } | |
556 | |
557 /* File opened successfully so return a VTS change event */ | |
558 (*event) = DVDNAV_VTS_CHANGE; | |
114 | 559 #ifdef LOG_DEBUG |
560 fprintf(MSG_OUT, "libdvdnav: VTS_CHANGE\n"); | |
561 #endif | |
134
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
562 (*len) = sizeof(dvdnav_vts_change_event_t); |
0 | 563 |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
564 this->spu_clut_changed = 1; |
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
565 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
|
566 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
|
567 this->position_current.audio_channel = -1; /* Force an update */; |
0 | 568 |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
569 pthread_mutex_unlock(&this->vm_lock); |
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
570 return S_OK; |
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
571 } |
114 | 572 |
573 /* Check if the cell changed */ | |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
574 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
|
575 (this->position_current.cell_restart != this->position_next.cell_restart) || |
114 | 576 (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
|
577 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
|
578 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
|
579 dvd_state_t *state = &this->vm->state; |
114 | 580 |
581 (*event) = DVDNAV_CELL_CHANGE; | |
582 #ifdef LOG_DEBUG | |
583 fprintf(MSG_OUT, "libdvdnav: CELL_CHANGE\n"); | |
584 #endif | |
134
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
585 (*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
|
586 |
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
587 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
|
588 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
|
589 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
|
590 dvdnav_convert_time(&state->pgc->cell_playback[state->cellN-1].playback_time); |
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
591 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
|
592 /* 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
|
593 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
|
594 /* 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
|
595 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
|
596 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
|
597 else |
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
598 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
|
599 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
|
600 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
|
601 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
|
602 cell_event->pgc_length = dvdnav_convert_time(&state->pgc->playback_time); |
114 | 603 |
604 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
|
605 this->position_current.cell_restart = this->position_next.cell_restart; |
114 | 606 this->position_current.cell_start = this->position_next.cell_start; |
607 this->position_current.block = this->position_next.block; | |
608 | |
609 /* vobu info is used for mid cell resumes */ | |
610 this->vobu.vobu_start = this->position_next.cell_start + this->position_next.block; | |
611 this->vobu.vobu_next = 0; | |
127 | 612 /* Make blockN == vobu_length to do expected_nav */ |
114 | 613 this->vobu.vobu_length = 0; |
127 | 614 this->vobu.blockN = 0; |
114 | 615 |
616 /* update the spu palette at least on PGC changes */ | |
617 this->spu_clut_changed = 1; | |
618 this->position_current.spu_channel = -1; /* Force an update */ | |
619 this->position_current.audio_channel = -1; /* Force an update */ | |
620 | |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
621 pthread_mutex_unlock(&this->vm_lock); |
0 | 622 return S_OK; |
623 } | |
624 | |
114 | 625 /* has the CLUT changed? */ |
626 if(this->spu_clut_changed) { | |
627 (*event) = DVDNAV_SPU_CLUT_CHANGE; | |
628 #ifdef LOG_DEBUG | |
629 fprintf(MSG_OUT, "libdvdnav: SPU_CLUT_CHANGE\n"); | |
630 #endif | |
631 (*len) = 16 * sizeof(uint32_t); | |
632 memcpy(*buf, &(state->pgc->palette), 16 * sizeof(uint32_t)); | |
633 this->spu_clut_changed = 0; | |
634 pthread_mutex_unlock(&this->vm_lock); | |
635 return S_OK; | |
636 } | |
637 | |
638 /* has the SPU channel changed? */ | |
639 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
|
640 dvdnav_spu_stream_change_event_t *stream_change = (dvdnav_spu_stream_change_event_t *)*buf; |
114 | 641 |
642 (*event) = DVDNAV_SPU_STREAM_CHANGE; | |
643 #ifdef LOG_DEBUG | |
644 fprintf(MSG_OUT, "libdvdnav: SPU_STREAM_CHANGE\n"); | |
645 #endif | |
646 (*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
|
647 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
|
648 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
|
649 stream_change->physical_pan_scan = vm_get_subp_active_stream(this->vm, 2); |
114 | 650 this->position_current.spu_channel = this->position_next.spu_channel; |
651 #ifdef LOG_DEBUG | |
652 fprintf(MSG_OUT, "libdvdnav: SPU_STREAM_CHANGE stream_id_wide=%d\n",stream_change.physical_wide); | |
653 fprintf(MSG_OUT, "libdvdnav: SPU_STREAM_CHANGE stream_id_letterbox=%d\n",stream_change.physical_letterbox); | |
654 fprintf(MSG_OUT, "libdvdnav: SPU_STREAM_CHANGE stream_id_pan_scan=%d\n",stream_change.physical_pan_scan); | |
655 #endif | |
134
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
656 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
|
657 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
|
658 stream_change->physical_pan_scan != -1) { |
114 | 659 #ifdef LOG_DEBUG |
660 fprintf(MSG_OUT, "libdvdnav: SPU_STREAM_CHANGE returning S_OK\n"); | |
661 #endif | |
662 pthread_mutex_unlock(&this->vm_lock); | |
663 return S_OK; | |
664 } | |
665 } | |
0 | 666 |
114 | 667 /* has the audio channel changed? */ |
668 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
|
669 dvdnav_audio_stream_change_event_t *stream_change = (dvdnav_audio_stream_change_event_t *)*buf; |
114 | 670 |
671 (*event) = DVDNAV_AUDIO_STREAM_CHANGE; | |
672 #ifdef LOG_DEBUG | |
673 fprintf(MSG_OUT, "libdvdnav: AUDIO_STREAM_CHANGE\n"); | |
674 #endif | |
675 (*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
|
676 stream_change->physical = vm_get_audio_active_stream( this->vm ); |
114 | 677 this->position_current.audio_channel = this->position_next.audio_channel; |
678 #ifdef LOG_DEBUG | |
679 fprintf(MSG_OUT, "libdvdnav: AUDIO_STREAM_CHANGE stream_id=%d returning S_OK\n",stream_change.physical); | |
680 #endif | |
681 pthread_mutex_unlock(&this->vm_lock); | |
682 return S_OK; | |
683 } | |
684 | |
685 /* Check the STILLFRAME flag */ | |
686 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
|
687 dvdnav_still_event_t *still_event = (dvdnav_still_event_t *)*buf; |
114 | 688 |
689 (*event) = DVDNAV_STILL_FRAME; | |
690 #ifdef LOG_DEBUG | |
691 fprintf(MSG_OUT, "libdvdnav: STILL_FRAME\n"); | |
692 #endif | |
693 (*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
|
694 still_event->length = this->position_current.still; |
114 | 695 pthread_mutex_unlock(&this->vm_lock); |
696 return S_OK; | |
697 } | |
698 | |
699 /* Have we reached the end of a VOBU? */ | |
700 if (this->vobu.blockN >= this->vobu.vobu_length) { | |
701 | |
702 /* 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
|
703 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
|
704 /* End of Cell from NAV DSI info */ |
31 | 705 #ifdef LOG_DEBUG |
76 | 706 fprintf(MSG_OUT, "libdvdnav: Still set to %x\n", this->position_next.still); |
31 | 707 #endif |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
708 this->position_current.still = this->position_next.still; |
0 | 709 |
116 | 710 /* we are about to leave a cell, so a lot of state changes could occur; |
711 * under certain conditions, the application should get in sync with us before this, | |
712 * otherwise it might show stills or menus too shortly */ | |
713 if ((this->position_current.still || this->pci.hli.hl_gi.hli_ss) && !this->sync_wait_skip) { | |
714 this->sync_wait = 1; | |
715 } else { | |
716 if( this->position_current.still == 0 || this->skip_still ) { | |
717 /* no active cell still -> get us to the next cell */ | |
718 vm_get_next_cell(this->vm); | |
719 this->position_current.still = 0; /* still gets activated at end of cell */ | |
720 this->skip_still = 0; | |
721 this->sync_wait_skip = 0; | |
722 } | |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
723 } |
114 | 724 /* handle related state changes in next iteration */ |
725 (*event) = DVDNAV_NOP; | |
726 (*len) = 0; | |
727 pthread_mutex_unlock(&this->vm_lock); | |
728 return S_OK; | |
729 } | |
0 | 730 |
114 | 731 /* Perform remapping jump if necessary (this is always a |
0 | 732 * VOBU boundary). */ |
114 | 733 if (this->vm->map) { |
734 this->vobu.vobu_next = remap_block( this->vm->map, | |
735 this->vm->state.domain, this->vm->state.TTN_REG, | |
736 this->vm->state.pgN, | |
737 this->vobu.vobu_start, this->vobu.vobu_next); | |
738 } | |
0 | 739 |
114 | 740 /* at the start of the next VOBU -> expecting NAV packet */ |
45 | 741 result = dvdnav_read_cache_block(this->cache, this->vobu.vobu_start + this->vobu.vobu_next, 1, buf); |
0 | 742 |
743 if(result <= 0) { | |
744 printerr("Error reading NAV packet."); | |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
745 pthread_mutex_unlock(&this->vm_lock); |
0 | 746 return S_ERR; |
747 } | |
114 | 748 /* Decode nav into pci and dsi. Then get next VOBU info. */ |
749 if(!dvdnav_decode_packet(this, *buf, &this->dsi, &this->pci)) { | |
0 | 750 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
|
751 pthread_mutex_unlock(&this->vm_lock); |
0 | 752 return S_ERR; |
753 } | |
114 | 754 /* We need to update the vm state->blockN with which VOBU we are in. |
755 * This is so RSM resumes to the VOBU level and not just the CELL level. | |
28 | 756 */ |
114 | 757 this->vm->state.blockN = this->vobu.vobu_start - this->position_current.cell_start; |
758 | |
759 dvdnav_get_vobu(this, &this->dsi, &this->pci, &this->vobu); | |
760 this->vobu.blockN = 0; | |
761 /* Give the cache a hint about the size of next VOBU. | |
762 * This improves pre-caching, because the VOBU will almost certainly be read entirely. | |
45 | 763 */ |
764 dvdnav_pre_cache_blocks(this->cache, this->vobu.vobu_start+1, this->vobu.vobu_length+1); | |
0 | 765 |
766 /* Successfully got a NAV packet */ | |
767 (*event) = DVDNAV_NAV_PACKET; | |
114 | 768 #ifdef LOG_DEBUG |
769 fprintf(MSG_OUT, "libdvdnav: NAV_PACKET\n"); | |
770 #endif | |
3
328eadb3f37e
Added initial example programs directory and make sure all debug/error output goes to stderr.
richwareham
parents:
0
diff
changeset
|
771 (*len) = 2048; |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
772 pthread_mutex_unlock(&this->vm_lock); |
0 | 773 return S_OK; |
774 } | |
775 | |
776 /* 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
|
777 if(!this->file) { |
114 | 778 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
|
779 pthread_mutex_unlock(&this->vm_lock); |
0 | 780 return S_ERR; |
781 } | |
782 | |
114 | 783 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
|
784 result = dvdnav_read_cache_block(this->cache, this->vobu.vobu_start + this->vobu.blockN, 1, buf); |
0 | 785 if(result <= 0) { |
786 printerr("Error reading from DVD."); | |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
787 pthread_mutex_unlock(&this->vm_lock); |
0 | 788 return S_ERR; |
789 } | |
114 | 790 (*event) = DVDNAV_BLOCK_OK; |
0 | 791 (*len) = 2048; |
792 | |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
793 pthread_mutex_unlock(&this->vm_lock); |
0 | 794 return S_OK; |
795 } | |
796 | |
114 | 797 dvdnav_status_t dvdnav_get_title_string(dvdnav_t *this, const char **title_str) { |
798 | |
799 if(!this || !title_str) { | |
800 printerr("Passed a NULL pointer."); | |
801 return S_ERR; | |
802 } | |
803 | |
804 (*title_str) = this->vm->dvd_name; | |
805 return S_OK; | |
806 } | |
807 | |
808 uint8_t dvdnav_get_video_aspect(dvdnav_t *this) { | |
809 uint8_t retval; | |
810 | |
811 if(!this) | |
812 return -1; | |
813 | |
814 pthread_mutex_lock(&this->vm_lock); | |
815 retval = (uint8_t)vm_get_video_aspect(this->vm); | |
816 pthread_mutex_unlock(&this->vm_lock); | |
817 | |
818 return retval; | |
819 } | |
820 | |
821 uint8_t dvdnav_get_video_scale_permission(dvdnav_t *this) { | |
822 uint8_t retval; | |
823 | |
824 if(!this) | |
825 return -1; | |
826 | |
827 pthread_mutex_lock(&this->vm_lock); | |
828 retval = (uint8_t)vm_get_video_scale_permission(this->vm); | |
829 pthread_mutex_unlock(&this->vm_lock); | |
830 | |
831 return retval; | |
832 } | |
833 | |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
834 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
|
835 audio_attr_t attr; |
0 | 836 |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
837 if(!this) |
0 | 838 return -1; |
839 | |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
840 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
|
841 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
|
842 pthread_mutex_unlock(&this->vm_lock); |
0 | 843 |
25
df024077cbc1
Why rewrite vm function, use it instead (this remark is for me, of course ;-) ).
f1rmb
parents:
24
diff
changeset
|
844 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
|
845 return 0xffff; |
0 | 846 |
25
df024077cbc1
Why rewrite vm function, use it instead (this remark is for me, of course ;-) ).
f1rmb
parents:
24
diff
changeset
|
847 return attr.lang_code; |
0 | 848 } |
849 | |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
850 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
|
851 subp_attr_t attr; |
21
d2d73f2ad8d3
Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents:
17
diff
changeset
|
852 |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
853 if(!this) |
21
d2d73f2ad8d3
Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents:
17
diff
changeset
|
854 return -1; |
d2d73f2ad8d3
Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents:
17
diff
changeset
|
855 |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
856 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
|
857 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
|
858 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
|
859 |
25
df024077cbc1
Why rewrite vm function, use it instead (this remark is for me, of course ;-) ).
f1rmb
parents:
24
diff
changeset
|
860 if(attr.type != 1) |
21
d2d73f2ad8d3
Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents:
17
diff
changeset
|
861 return 0xffff; |
d2d73f2ad8d3
Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents:
17
diff
changeset
|
862 |
25
df024077cbc1
Why rewrite vm function, use it instead (this remark is for me, of course ;-) ).
f1rmb
parents:
24
diff
changeset
|
863 return attr.lang_code; |
21
d2d73f2ad8d3
Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents:
17
diff
changeset
|
864 } |
d2d73f2ad8d3
Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents:
17
diff
changeset
|
865 |
114 | 866 int8_t dvdnav_get_audio_logical_stream(dvdnav_t *this, uint8_t audio_num) { |
867 int8_t retval; | |
868 | |
869 if(!this) | |
870 return -1; | |
871 | |
872 pthread_mutex_lock(&this->vm_lock); | |
873 if (!this->vm->state.pgc) { | |
874 pthread_mutex_unlock(&this->vm_lock); | |
875 return -1; | |
876 } | |
877 retval = vm_get_audio_stream(this->vm, audio_num); | |
878 pthread_mutex_unlock(&this->vm_lock); | |
879 | |
880 return retval; | |
881 } | |
882 | |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
883 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
|
884 int8_t retval; |
d2d73f2ad8d3
Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents:
17
diff
changeset
|
885 |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
886 if(!this) |
21
d2d73f2ad8d3
Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents:
17
diff
changeset
|
887 return -1; |
d2d73f2ad8d3
Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents:
17
diff
changeset
|
888 |
114 | 889 pthread_mutex_lock(&this->vm_lock); |
890 if (!this->vm->state.pgc) { | |
891 pthread_mutex_unlock(&this->vm_lock); | |
892 return -1; | |
893 } | |
894 retval = vm_get_subp_stream(this->vm, subp_num, 0); | |
895 pthread_mutex_unlock(&this->vm_lock); | |
896 | |
897 return retval; | |
898 } | |
899 | |
900 int8_t dvdnav_get_active_audio_stream(dvdnav_t *this) { | |
901 int8_t retval; | |
902 | |
903 if(!this) | |
904 return -1; | |
905 | |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
906 pthread_mutex_lock(&this->vm_lock); |
114 | 907 if (!this->vm->state.pgc) { |
908 pthread_mutex_unlock(&this->vm_lock); | |
909 return -1; | |
910 } | |
911 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
|
912 pthread_mutex_unlock(&this->vm_lock); |
114 | 913 |
21
d2d73f2ad8d3
Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents:
17
diff
changeset
|
914 return retval; |
d2d73f2ad8d3
Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents:
17
diff
changeset
|
915 } |
d2d73f2ad8d3
Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents:
17
diff
changeset
|
916 |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
917 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
|
918 int8_t retval; |
0 | 919 |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
920 if(!this) |
0 | 921 return -1; |
922 | |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
923 pthread_mutex_lock(&this->vm_lock); |
114 | 924 if (!this->vm->state.pgc) { |
925 pthread_mutex_unlock(&this->vm_lock); | |
926 return -1; | |
927 } | |
928 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
|
929 pthread_mutex_unlock(&this->vm_lock); |
0 | 930 |
21
d2d73f2ad8d3
Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents:
17
diff
changeset
|
931 return retval; |
0 | 932 } |
933 | |
114 | 934 static int8_t dvdnav_is_domain(dvdnav_t *this, domain_t domain) { |
935 int8_t retval; | |
936 | |
937 if (!this || !this->started) | |
938 return -1; | |
939 | |
940 pthread_mutex_lock(&this->vm_lock); | |
941 retval = (this->vm->state.domain == domain); | |
942 pthread_mutex_unlock(&this->vm_lock); | |
943 | |
944 return retval; | |
945 } | |
946 | |
0 | 947 /* First Play domain. (Menu) */ |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
948 int8_t dvdnav_is_domain_fp(dvdnav_t *this) { |
114 | 949 return dvdnav_is_domain(this, FP_DOMAIN); |
0 | 950 } |
951 /* Video management Menu domain. (Menu) */ | |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
952 int8_t dvdnav_is_domain_vmgm(dvdnav_t *this) { |
114 | 953 return dvdnav_is_domain(this, VMGM_DOMAIN); |
0 | 954 } |
955 /* Video Title Menu domain (Menu) */ | |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
956 int8_t dvdnav_is_domain_vtsm(dvdnav_t *this) { |
114 | 957 return dvdnav_is_domain(this, VTSM_DOMAIN); |
0 | 958 } |
959 /* Video Title domain (playing movie). */ | |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
960 int8_t dvdnav_is_domain_vts(dvdnav_t *this) { |
114 | 961 return dvdnav_is_domain(this, VTS_DOMAIN); |
0 | 962 } |
963 | |
114 | 964 /* 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
|
965 dvdnav_status_t dvdnav_angle_change(dvdnav_t *this, int angle) { |
0 | 966 int num, current; |
967 | |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
968 if(!this) { |
114 | 969 printerr("Passed a NULL pointer."); |
0 | 970 return S_ERR; |
971 } | |
972 | |
114 | 973 pthread_mutex_lock(&this->vm_lock); |
974 vm_get_angle_info(this->vm, ¤t, &num); | |
0 | 975 /* Set angle SPRM if valid */ |
976 if((angle > 0) && (angle <= num)) { | |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
977 this->vm->state.AGL_REG = angle; |
0 | 978 } else { |
114 | 979 printerr("Passed an invalid angle number."); |
980 pthread_mutex_unlock(&this->vm_lock); | |
0 | 981 return S_ERR; |
982 } | |
114 | 983 pthread_mutex_unlock(&this->vm_lock); |
0 | 984 |
985 return S_OK; | |
986 } | |
987 | |
114 | 988 dvdnav_status_t dvdnav_get_angle_info(dvdnav_t *this, int *current_angle, |
989 int *number_of_angles) { | |
990 if(!this || !current_angle || !number_of_angles) { | |
991 printerr("Passed a NULL pointer."); | |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
992 return S_ERR; |
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
993 } |
114 | 994 |
995 pthread_mutex_lock(&this->vm_lock); | |
996 vm_get_angle_info(this->vm, current_angle, number_of_angles); | |
997 pthread_mutex_unlock(&this->vm_lock); | |
998 | |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
999 return S_OK; |
114 | 1000 } |
0 | 1001 |
67
61c0ee1bbb7a
Moved get_current_nav_pci into dvdnac.c, changed example to use it instead of 'home-rolled'
richwareham
parents:
66
diff
changeset
|
1002 pci_t* dvdnav_get_current_nav_pci(dvdnav_t *this) { |
114 | 1003 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
|
1004 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
|
1005 } |
61c0ee1bbb7a
Moved get_current_nav_pci into dvdnac.c, changed example to use it instead of 'home-rolled'
richwareham
parents:
66
diff
changeset
|
1006 |
66
2bd4a78eefce
Patch from aschultz@cs.uni-magdeburg.de to allow for still-frame 'peek-ahead'
richwareham
parents:
60
diff
changeset
|
1007 dsi_t* dvdnav_get_current_nav_dsi(dvdnav_t *this) { |
114 | 1008 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
|
1009 return &this->dsi; |
2bd4a78eefce
Patch from aschultz@cs.uni-magdeburg.de to allow for still-frame 'peek-ahead'
richwareham
parents:
60
diff
changeset
|
1010 } |
2bd4a78eefce
Patch from aschultz@cs.uni-magdeburg.de to allow for still-frame 'peek-ahead'
richwareham
parents:
60
diff
changeset
|
1011 |
2bd4a78eefce
Patch from aschultz@cs.uni-magdeburg.de to allow for still-frame 'peek-ahead'
richwareham
parents:
60
diff
changeset
|
1012 uint32_t dvdnav_get_next_still_flag(dvdnav_t *this) { |
114 | 1013 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
|
1014 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
|
1015 } |
2bd4a78eefce
Patch from aschultz@cs.uni-magdeburg.de to allow for still-frame 'peek-ahead'
richwareham
parents:
60
diff
changeset
|
1016 |
0 | 1017 /* |
1018 * $Log$ | |
134
d9d75a22a061
- new event on cell changes to report program and cell number and some time info
mroi
parents:
127
diff
changeset
|
1019 * 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
|
1020 * - 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
|
1021 * - 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
|
1022 * |
127 | 1023 * Revision 1.45 2003/03/15 20:18:50 mroi |
1024 * start blockN from 0 | |
1025 * | |
126 | 1026 * Revision 1.44 2003/03/14 18:49:28 mroi |
1027 * less overwhelming TRACE info | |
1028 * | |
121 | 1029 * Revision 1.43 2003/03/12 11:38:51 mroi |
1030 * stop the VM here | |
1031 * | |
116 | 1032 * Revision 1.42 2003/02/25 14:08:14 mroi |
1033 * new event DVDNAV_WAIT | |
115 | 1034 * |
114 | 1035 * Revision 1.40 2003/02/20 15:32:15 mroi |
1036 * big libdvdnav cleanup, quoting the ChangeLog: | |
1037 * * some bugfixes | |
1038 * * code cleanup | |
1039 * * build process polishing | |
1040 * * more sensible event order in get_next_block to ensure useful event delivery | |
1041 * * VOBU level resume | |
1042 * * fixed: seeking in a multiangle feature briefly showed the wrong angle | |
1043 * | |
106
e984044bbe7b
port Stephen's comment fixing to avoid problems when syncing xine-lib's copy of
mroi
parents:
100
diff
changeset
|
1044 * 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
|
1045 * 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
|
1046 * libdvdnav |
e984044bbe7b
port Stephen's comment fixing to avoid problems when syncing xine-lib's copy of
mroi
parents:
100
diff
changeset
|
1047 * |
100 | 1048 * Revision 1.38 2002/09/19 04:48:28 jcdutton |
1049 * Update version info. | |
1050 * The "note2" bit if to help developers know which version of libdvdnav the user is using. | |
1051 * | |
99 | 1052 * Revision 1.37 2002/09/18 14:26:42 mroi |
1053 * fix possible unlock on not locked mutex | |
1054 * | |
97
c1dff1899bda
First patch for personalized dvd viewing. I have not tested it yet.
jcdutton
parents:
92
diff
changeset
|
1055 * 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
|
1056 * 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
|
1057 * |
92 | 1058 * Revision 1.35 2002/09/05 12:55:05 mroi |
1059 * fix memleaks in dvdnav_open | |
1060 * | |
89
0fbef4901e2c
Add a comment so I can tell which version of the CVS a user is using.
jcdutton
parents:
84
diff
changeset
|
1061 * 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
|
1062 * 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
|
1063 * 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
|
1064 * |
84 | 1065 * Revision 1.33 2002/08/31 11:05:27 jcdutton |
1066 * Properly seed the DVD VM Instruction rand(). | |
1067 * | |
82 | 1068 * Revision 1.32 2002/08/31 02:50:27 jcdutton |
1069 * Improve some debug messages. | |
1070 * Add some comments about dvdnav_open memory leaks. | |
1071 * | |
76 | 1072 * Revision 1.31 2002/08/27 19:15:08 mroi |
1073 * more consistent console output | |
1074 * | |
73
a23d50ba81d3
update spu clut, spu channel and audio channel more often
mroi
parents:
67
diff
changeset
|
1075 * 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
|
1076 * 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
|
1077 * |
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 * 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
|
1079 * 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
|
1080 * 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
|
1081 * |
66
2bd4a78eefce
Patch from aschultz@cs.uni-magdeburg.de to allow for still-frame 'peek-ahead'
richwareham
parents:
60
diff
changeset
|
1082 * 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
|
1083 * 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
|
1084 * |
60 | 1085 * Revision 1.27 2002/07/12 15:46:44 mroi |
1086 * use new memcopy'less read ahead cache | |
1087 * | |
58 | 1088 * Revision 1.26 2002/07/06 16:24:54 mroi |
1089 * * fix debug messages | |
1090 * * send spu stream change event only, when there are new streams | |
1091 * (should fix problems with Terminator disk 2) | |
1092 * | |
55
5674fbd44f26
report all spu types (widescreen, letterbox and pan&scan), not widescreen
mroi
parents:
54
diff
changeset
|
1093 * 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
|
1094 * 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
|
1095 * 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
|
1096 * |
54 | 1097 * Revision 1.24 2002/07/05 01:42:30 jcdutton |
1098 * Add more debug info for Menu language selection. | |
1099 * Only do vm_start when we have to. | |
1100 * | |
50
578ce1d41479
Rename some of the functions in vm.c to help readability.
jcdutton
parents:
45
diff
changeset
|
1101 * 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
|
1102 * 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
|
1103 * 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
|
1104 * 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
|
1105 * |
45 | 1106 * Revision 1.22 2002/06/25 13:37:11 jcdutton |
1107 * Revert back to old read_cache method. | |
1108 * Some new optimizations added to the old read_cache method, thus reducing the amount of calls to read blocks from the DVD device. | |
1109 * | |
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
|
1110 * 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
|
1111 * 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
|
1112 * |
42 | 1113 * Revision 1.20 2002/06/04 13:35:16 richwareham |
1114 * Removed more C++ style comments | |
1115 * | |
39 | 1116 * Revision 1.19 2002/05/30 23:15:14 richwareham |
1117 * First draft of removing HAVE_DVDREAD9 | |
1118 * | |
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
|
1119 * 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
|
1120 * '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
|
1121 * |
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
|
1122 * 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
|
1123 * 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
|
1124 * |
31 | 1125 * Revision 1.16 2002/04/24 21:15:25 jcdutton |
1126 * Quiet please!!! | |
1127 * | |
30 | 1128 * Revision 1.15 2002/04/24 00:47:46 jcdutton |
1129 * Some more cleanups. | |
1130 * Improve button passing. | |
1131 * | |
28 | 1132 * Revision 1.14 2002/04/23 13:26:08 jcdutton |
1133 * Add some comments, FIXMEs. | |
1134 * 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. | |
1135 * | |
26 | 1136 * Revision 1.13 2002/04/23 12:55:40 jcdutton |
1137 * Removed un-needed variables. | |
1138 * General Clean up. | |
1139 * | |
25
df024077cbc1
Why rewrite vm function, use it instead (this remark is for me, of course ;-) ).
f1rmb
parents:
24
diff
changeset
|
1140 * 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
|
1141 * 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
|
1142 * 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
|
1143 * |
24 | 1144 * Revision 1.11 2002/04/23 02:12:27 jcdutton |
1145 * Re-implemented seeking. | |
1146 * | |
23 | 1147 * Revision 1.10 2002/04/23 00:07:16 jcdutton |
1148 * Name stills work better. | |
1149 * | |
22
3c1df0cb3aee
Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents:
21
diff
changeset
|
1150 * 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
|
1151 * 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
|
1152 * |
21
d2d73f2ad8d3
Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents:
17
diff
changeset
|
1153 * 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
|
1154 * 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
|
1155 * inspired from libogle ;-). |
d2d73f2ad8d3
Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents:
17
diff
changeset
|
1156 * |
17 | 1157 * Revision 1.7 2002/04/10 16:45:57 jcdutton |
1158 * Actually fix the const this time! | |
1159 * | |
8
66708b4a1b5e
Stop C++ bitching about some things and extend the menus example
richwareham
parents:
7
diff
changeset
|
1160 * 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
|
1161 * 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
|
1162 * |
7
7fdefafa624f
Slight correction to handle quicker menu transitions.
jcdutton
parents:
6
diff
changeset
|
1163 * Revision 1.5 2002/04/06 18:42:05 jcdutton |
7fdefafa624f
Slight correction to handle quicker menu transitions.
jcdutton
parents:
6
diff
changeset
|
1164 * Slight correction to handle quicker menu transitions. |
7fdefafa624f
Slight correction to handle quicker menu transitions.
jcdutton
parents:
6
diff
changeset
|
1165 * |
6 | 1166 * Revision 1.4 2002/04/06 18:31:50 jcdutton |
1167 * Some cleaning up. | |
1168 * changed exit(1) to assert(0) so they actually get seen by the user so that it helps developers more. | |
1169 * | |
4
99bed5d6db2f
Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents:
3
diff
changeset
|
1170 * 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
|
1171 * Added reset patch from Kees Cook <kees@outflux.net> |
99bed5d6db2f
Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents:
3
diff
changeset
|
1172 * |
3
328eadb3f37e
Added initial example programs directory and make sure all debug/error output goes to stderr.
richwareham
parents:
0
diff
changeset
|
1173 * 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
|
1174 * 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
|
1175 * |
328eadb3f37e
Added initial example programs directory and make sure all debug/error output goes to stderr.
richwareham
parents:
0
diff
changeset
|
1176 * 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
|
1177 * Initial import |
0 | 1178 * |
1179 * Revision 1.28 2002/02/02 23:26:20 richwareham | |
1180 * Restored title selection | |
1181 * | |
1182 * Revision 1.27 2002/02/01 15:48:10 richwareham | |
1183 * Re-implemented angle selection and title/chapter display | |
1184 * | |
1185 * Revision 1.26 2002/01/31 16:53:49 richwareham | |
1186 * Big patch from Daniel Caujolle-Bert to (re)implement SPU/Audio language display | |
1187 * | |
1188 * Revision 1.25 2002/01/24 20:53:50 richwareham | |
1189 * Added option to _not_ use DVD read-ahead to options | |
1190 * | |
1191 * Revision 1.24 2002/01/20 15:54:59 jcdutton | |
1192 * Implement seeking. | |
1193 * It is still a bit buggy, but works sometimes. | |
1194 * I need to find out how to make the jump clean. | |
1195 * At the moment, some corruption of the mpeg2 stream occurs, | |
1196 * which causes libmpeg2 to crash. | |
1197 * | |
1198 * Revision 1.23 2002/01/18 00:23:52 jcdutton | |
1199 * Support Ejecting of DVD. | |
1200 * It will first un-mount the DVD, then eject it. | |
1201 * | |
1202 * Revision 1.22 2002/01/17 14:50:32 jcdutton | |
1203 * Fix corruption of stream during menu transitions. | |
1204 * Menu transitions are now clean. | |
1205 * | |
1206 * Revision 1.21 2002/01/15 00:37:03 jcdutton | |
1207 * Just a few cleanups, and a assert fix. (memset fixed it) | |
1208 * | |
1209 * Revision 1.20 2002/01/13 22:17:57 jcdutton | |
1210 * Change logging. | |
1211 * | |
1212 * | |
1213 */ |