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