annotate dvdnav.c @ 285:52877d182e96 src

moved all header inclusions from .h to .c files; my word, I've never seen such a horrible entanglement as in this mess
author nicodvb
date Fri, 20 Apr 2007 23:24:59 +0000
parents ef3b33441db5
children ce4230602517
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1 /*
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
2 * Copyright (C) 2000 Rich Wareham <richwareham@users.sourceforge.net>
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
3 *
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
4 * This file is part of libdvdnav, a DVD navigation library.
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
5 *
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
6 * libdvdnav is free software; you can redistribute it and/or modify
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
7 * it under the terms of the GNU General Public License as published by
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
8 * the Free Software Foundation; either version 2 of the License, or
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
9 * (at your option) any later version.
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
10 *
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
11 * libdvdnav is distributed in the hope that it will be useful,
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
14 * GNU General Public License for more details.
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
15 *
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
16 * You should have received a copy of the GNU General Public License
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
17 * along with this program; if not, write to the Free Software
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
18 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
19 *
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
20 * $Id$
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
21 *
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
22 */
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
23
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
24 #ifdef HAVE_CONFIG_H
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
25 #include "config.h"
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
26 #endif
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
27
31
8b08ee66cbff Quiet please!!!
jcdutton
parents: 30
diff changeset
28 /*
8b08ee66cbff Quiet please!!!
jcdutton
parents: 30
diff changeset
29 #define LOG_DEBUG
8b08ee66cbff Quiet please!!!
jcdutton
parents: 30
diff changeset
30 */
8b08ee66cbff Quiet please!!!
jcdutton
parents: 30
diff changeset
31
278
ef3b33441db5 include inttypes.h wherever necessary
nicodvb
parents: 274
diff changeset
32 #include <inttypes.h>
285
52877d182e96 moved all header inclusions from .h to .c files; my word, I've never seen such a horrible entanglement as in this mess
nicodvb
parents: 278
diff changeset
33 #include "dvd_types.h"
52877d182e96 moved all header inclusions from .h to .c files; my word, I've never seen such a horrible entanglement as in this mess
nicodvb
parents: 278
diff changeset
34 #include "dvd_reader.h"
52877d182e96 moved all header inclusions from .h to .c files; my word, I've never seen such a horrible entanglement as in this mess
nicodvb
parents: 278
diff changeset
35 #include "nav_types.h"
52877d182e96 moved all header inclusions from .h to .c files; my word, I've never seen such a horrible entanglement as in this mess
nicodvb
parents: 278
diff changeset
36 #include "ifo_types.h" /* For vm_cmd_t */
52877d182e96 moved all header inclusions from .h to .c files; my word, I've never seen such a horrible entanglement as in this mess
nicodvb
parents: 278
diff changeset
37 #include "remap.h"
52877d182e96 moved all header inclusions from .h to .c files; my word, I've never seen such a horrible entanglement as in this mess
nicodvb
parents: 278
diff changeset
38 #include "vm/decoder.h"
52877d182e96 moved all header inclusions from .h to .c files; my word, I've never seen such a horrible entanglement as in this mess
nicodvb
parents: 278
diff changeset
39 #include "vm/vm.h"
52877d182e96 moved all header inclusions from .h to .c files; my word, I've never seen such a horrible entanglement as in this mess
nicodvb
parents: 278
diff changeset
40 #include "dvdnav.h"
52877d182e96 moved all header inclusions from .h to .c files; my word, I've never seen such a horrible entanglement as in this mess
nicodvb
parents: 278
diff changeset
41 #include "dvdnav_events.h"
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
42 #include "dvdnav_internal.h"
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
43 #include "read_cache.h"
231
15dc5660d9a8 Fix a missing include file.
jcdutton
parents: 230
diff changeset
44 #include "nav_read.h"
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
45
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
46 #include <stdlib.h>
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
47 #include <stdio.h>
84
ba1121a07120 Properly seed the DVD VM Instruction rand().
jcdutton
parents: 82
diff changeset
48 #include <sys/time.h>
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
49
97
c1dff1899bda First patch for personalized dvd viewing. I have not tested it yet.
jcdutton
parents: 92
diff changeset
50 #include "remap.h"
c1dff1899bda First patch for personalized dvd viewing. I have not tested it yet.
jcdutton
parents: 92
diff changeset
51
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
52 static dvdnav_status_t dvdnav_clear(dvdnav_t * this) {
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
53 /* 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
54
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
55 if (this->file) DVDCloseFile(this->file);
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
56 this->file = NULL;
4
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
57
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
58 memset(&this->pci,0,sizeof(this->pci));
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
59 memset(&this->dsi,0,sizeof(this->dsi));
197
a20a5976a207 last_cmd_nav_lbn has to be initialized with an invalid value, so that the first
mroi
parents: 195
diff changeset
60 this->last_cmd_nav_lbn = SRI_END_OF_CELL;
4
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
61
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
62 /* Set initial values of flags */
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
63 this->position_current.still = 0;
23
c2d40c38e12f Name stills work better.
jcdutton
parents: 22
diff changeset
64 this->skip_still = 0;
116
4d711d0518e9 new event DVDNAV_WAIT
mroi
parents: 115
diff changeset
65 this->sync_wait = 0;
4d711d0518e9 new event DVDNAV_WAIT
mroi
parents: 115
diff changeset
66 this->sync_wait_skip = 0;
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
67 this->spu_clut_changed = 0;
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
68 this->started = 0;
269
77e472cef5f8 implemented dvdnav_get_current_time() with obvious meaning
nicodvb
parents: 266
diff changeset
69 this->cur_cell_time = 0;
4
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
70
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
71 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
72
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 191
diff changeset
73 return DVDNAV_STATUS_OK;
4
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
74 }
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
75
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
76 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
77 dvdnav_t *this;
84
ba1121a07120 Properly seed the DVD VM Instruction rand().
jcdutton
parents: 82
diff changeset
78 struct timeval time;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
79
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
80 /* Create a new structure */
100
a767842bc447 Update version info.
jcdutton
parents: 99
diff changeset
81 fprintf(MSG_OUT, "libdvdnav: Using dvdnav version %s from http://dvd.sf.net\n", VERSION);
82
033f011d8152 Improve some debug messages.
jcdutton
parents: 76
diff changeset
82
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
83 (*dest) = NULL;
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
84 this = (dvdnav_t*)malloc(sizeof(dvdnav_t));
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
85 if(!this)
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 191
diff changeset
86 return DVDNAV_STATUS_ERR;
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
87 memset(this, 0, (sizeof(dvdnav_t) ) ); /* Make sure this structure is clean */
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
88
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
89 pthread_mutex_init(&this->vm_lock, NULL);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
90 /* Initialise the error string */
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
91 printerr("");
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
92
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
93 /* Initialise the VM */
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
94 this->vm = vm_new_vm();
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
95 if(!this->vm) {
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
96 printerr("Error initialising the DVD VM.");
92
82af243658bd fix memleaks in dvdnav_open
mroi
parents: 89
diff changeset
97 pthread_mutex_destroy(&this->vm_lock);
82af243658bd fix memleaks in dvdnav_open
mroi
parents: 89
diff changeset
98 free(this);
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 191
diff changeset
99 return DVDNAV_STATUS_ERR;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
100 }
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
101 if(!vm_reset(this->vm, path)) {
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
102 printerr("Error starting the VM / opening the DVD device.");
92
82af243658bd fix memleaks in dvdnav_open
mroi
parents: 89
diff changeset
103 pthread_mutex_destroy(&this->vm_lock);
82af243658bd fix memleaks in dvdnav_open
mroi
parents: 89
diff changeset
104 vm_free_vm(this->vm);
82af243658bd fix memleaks in dvdnav_open
mroi
parents: 89
diff changeset
105 free(this);
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 191
diff changeset
106 return DVDNAV_STATUS_ERR;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
107 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
108
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
109 /* 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
110 strncpy(this->path, path, MAX_PATH_LEN);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
111
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
112 /* 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
113 this->file = DVDOpenFile(vm_get_dvd_reader(this->vm), 0, DVD_READ_MENU_VOBS);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
114
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
115 /* 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
116 this->cache = dvdnav_read_cache_new(this);
84
ba1121a07120 Properly seed the DVD VM Instruction rand().
jcdutton
parents: 82
diff changeset
117
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
118 /* Seed the random numbers. So that the DVD VM Command rand()
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
119 * gives a different start value each time a DVD is played. */
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
120 gettimeofday(&time, NULL);
84
ba1121a07120 Properly seed the DVD VM Instruction rand().
jcdutton
parents: 82
diff changeset
121 srand(time.tv_usec);
ba1121a07120 Properly seed the DVD VM Instruction rand().
jcdutton
parents: 82
diff changeset
122
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
123 dvdnav_clear(this);
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
124
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
125 (*dest) = this;
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 191
diff changeset
126 return DVDNAV_STATUS_OK;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
127 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
128
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
129 dvdnav_status_t dvdnav_close(dvdnav_t *this) {
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
130
31
8b08ee66cbff Quiet please!!!
jcdutton
parents: 30
diff changeset
131 #ifdef LOG_DEBUG
76
0e2abe7083de more consistent console output
mroi
parents: 73
diff changeset
132 fprintf(MSG_OUT, "libdvdnav: close:called\n");
31
8b08ee66cbff Quiet please!!!
jcdutton
parents: 30
diff changeset
133 #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
134
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
135 if (this->file) {
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
136 DVDCloseFile(this->file);
31
8b08ee66cbff Quiet please!!!
jcdutton
parents: 30
diff changeset
137 #ifdef LOG_DEBUG
76
0e2abe7083de more consistent console output
mroi
parents: 73
diff changeset
138 fprintf(MSG_OUT, "libdvdnav: close:file closing\n");
31
8b08ee66cbff Quiet please!!!
jcdutton
parents: 30
diff changeset
139 #endif
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
140 this->file = NULL;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
141 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
142
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
143 /* Free the VM */
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
144 if(this->vm)
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
145 vm_free_vm(this->vm);
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
146
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
147 pthread_mutex_destroy(&this->vm_lock);
60
30995ad032cf use new memcopy'less read ahead cache
mroi
parents: 58
diff changeset
148
30995ad032cf use new memcopy'less read ahead cache
mroi
parents: 58
diff changeset
149 /* We leave the final freeing of the entire structure to the cache,
30995ad032cf use new memcopy'less read ahead cache
mroi
parents: 58
diff changeset
150 * because we don't know, if there are still buffers out in the wild,
30995ad032cf use new memcopy'less read ahead cache
mroi
parents: 58
diff changeset
151 * that must return first. */
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
152 if(this->cache)
60
30995ad032cf use new memcopy'less read ahead cache
mroi
parents: 58
diff changeset
153 dvdnav_read_cache_free(this->cache);
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
154 else
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
155 free(this);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
156
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 191
diff changeset
157 return DVDNAV_STATUS_OK;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
158 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
159
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
160 dvdnav_status_t dvdnav_reset(dvdnav_t *this) {
4
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
161 dvdnav_status_t result;
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
162
31
8b08ee66cbff Quiet please!!!
jcdutton
parents: 30
diff changeset
163 #ifdef LOG_DEBUG
76
0e2abe7083de more consistent console output
mroi
parents: 73
diff changeset
164 fprintf(MSG_OUT, "libdvdnav: reset:called\n");
31
8b08ee66cbff Quiet please!!!
jcdutton
parents: 30
diff changeset
165 #endif
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
166
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
167 pthread_mutex_lock(&this->vm_lock);
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
168
31
8b08ee66cbff Quiet please!!!
jcdutton
parents: 30
diff changeset
169 #ifdef LOG_DEBUG
76
0e2abe7083de more consistent console output
mroi
parents: 73
diff changeset
170 fprintf(MSG_OUT, "libdvdnav: reseting vm\n");
31
8b08ee66cbff Quiet please!!!
jcdutton
parents: 30
diff changeset
171 #endif
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
172 if(!vm_reset(this->vm, NULL)) {
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
173 printerr("Error restarting the VM.");
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
174 pthread_mutex_unlock(&this->vm_lock);
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 191
diff changeset
175 return DVDNAV_STATUS_ERR;
4
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
176 }
31
8b08ee66cbff Quiet please!!!
jcdutton
parents: 30
diff changeset
177 #ifdef LOG_DEBUG
76
0e2abe7083de more consistent console output
mroi
parents: 73
diff changeset
178 fprintf(MSG_OUT, "libdvdnav: clearing dvdnav\n");
31
8b08ee66cbff Quiet please!!!
jcdutton
parents: 30
diff changeset
179 #endif
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
180 result = dvdnav_clear(this);
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
181
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
182 pthread_mutex_unlock(&this->vm_lock);
4
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
183 return result;
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
184 }
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
185
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
186 dvdnav_status_t dvdnav_path(dvdnav_t *this, const char** path) {
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
187 (*path) = this->path;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
188
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 191
diff changeset
189 return DVDNAV_STATUS_OK;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
190 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
191
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
192 const char* dvdnav_err_to_string(dvdnav_t *this) {
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
193
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
194 if(!this)
3
328eadb3f37e Added initial example programs directory and make sure all debug/error output goes to stderr.
richwareham
parents: 0
diff changeset
195 return "Hey! You gave me a NULL pointer you naughty person!";
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
196
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
197 return this->err_str;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
198 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
199
134
d9d75a22a061 - new event on cell changes to report program and cell number and some time info
mroi
parents: 127
diff changeset
200 /* converts a dvd_time_t to PTS ticks */
265
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 264
diff changeset
201 int64_t dvdnav_convert_time(dvd_time_t *time) {
134
d9d75a22a061 - new event on cell changes to report program and cell number and some time info
mroi
parents: 127
diff changeset
202 int64_t result;
195
6b1bfe8f5283 Start some cleanups.
jcdutton
parents: 194
diff changeset
203 int64_t frames;
134
d9d75a22a061 - new event on cell changes to report program and cell number and some time info
mroi
parents: 127
diff changeset
204
135
5204d4e4cd3b I should get a brain and learn how to handle BCD...
mroi
parents: 134
diff changeset
205 result = (time->hour >> 4 ) * 10 * 60 * 60 * 90000;
134
d9d75a22a061 - new event on cell changes to report program and cell number and some time info
mroi
parents: 127
diff changeset
206 result += (time->hour & 0x0f) * 60 * 60 * 90000;
135
5204d4e4cd3b I should get a brain and learn how to handle BCD...
mroi
parents: 134
diff changeset
207 result += (time->minute >> 4 ) * 10 * 60 * 90000;
134
d9d75a22a061 - new event on cell changes to report program and cell number and some time info
mroi
parents: 127
diff changeset
208 result += (time->minute & 0x0f) * 60 * 90000;
135
5204d4e4cd3b I should get a brain and learn how to handle BCD...
mroi
parents: 134
diff changeset
209 result += (time->second >> 4 ) * 10 * 90000;
134
d9d75a22a061 - new event on cell changes to report program and cell number and some time info
mroi
parents: 127
diff changeset
210 result += (time->second & 0x0f) * 90000;
135
5204d4e4cd3b I should get a brain and learn how to handle BCD...
mroi
parents: 134
diff changeset
211
5204d4e4cd3b I should get a brain and learn how to handle BCD...
mroi
parents: 134
diff changeset
212 frames = ((time->frame_u & 0x30) >> 4) * 10;
5204d4e4cd3b I should get a brain and learn how to handle BCD...
mroi
parents: 134
diff changeset
213 frames += ((time->frame_u & 0x0f) ) ;
5204d4e4cd3b I should get a brain and learn how to handle BCD...
mroi
parents: 134
diff changeset
214
134
d9d75a22a061 - new event on cell changes to report program and cell number and some time info
mroi
parents: 127
diff changeset
215 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
216 result += frames * 3000;
d9d75a22a061 - new event on cell changes to report program and cell number and some time info
mroi
parents: 127
diff changeset
217 else
d9d75a22a061 - new event on cell changes to report program and cell number and some time info
mroi
parents: 127
diff changeset
218 result += frames * 3600;
d9d75a22a061 - new event on cell changes to report program and cell number and some time info
mroi
parents: 127
diff changeset
219
d9d75a22a061 - new event on cell changes to report program and cell number and some time info
mroi
parents: 127
diff changeset
220 return result;
d9d75a22a061 - new event on cell changes to report program and cell number and some time info
mroi
parents: 127
diff changeset
221 }
d9d75a22a061 - new event on cell changes to report program and cell number and some time info
mroi
parents: 127
diff changeset
222
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
223 /*
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
224 * Returns 1 if block contains NAV packet, 0 otherwise.
217
eb503714e1c2 these variables are not needed any more
mroi
parents: 198
diff changeset
225 * Processes said NAV packet if present.
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
226 *
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
227 * Most of the code in here is copied from xine's MPEG demuxer
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
228 * so any bugs which are found in that should be corrected here also.
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
229 */
195
6b1bfe8f5283 Start some cleanups.
jcdutton
parents: 194
diff changeset
230 static int32_t dvdnav_decode_packet(dvdnav_t *this, uint8_t *p, dsi_t *nav_dsi, pci_t *nav_pci) {
6b1bfe8f5283 Start some cleanups.
jcdutton
parents: 194
diff changeset
231 int32_t bMpeg1 = 0;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
232 uint32_t nHeaderLen;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
233 uint32_t nPacketLen;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
234 uint32_t nStreamID;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
235
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
236 if (p[3] == 0xBA) { /* program stream pack header */
195
6b1bfe8f5283 Start some cleanups.
jcdutton
parents: 194
diff changeset
237 int32_t nStuffingBytes;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
238
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
239 bMpeg1 = (p[4] & 0x40) == 0;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
240
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
241 if (bMpeg1) {
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
242 p += 12;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
243 } else { /* mpeg2 */
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
244 nStuffingBytes = p[0xD] & 0x07;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
245 p += 14 + nStuffingBytes;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
246 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
247 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
248
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
249 if (p[3] == 0xbb) { /* program stream system header */
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
250 nHeaderLen = (p[4] << 8) | p[5];
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
251 p += 6 + nHeaderLen;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
252 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
253
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
254 /* we should now have a PES packet here */
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
255 if (p[0] || p[1] || (p[2] != 1)) {
76
0e2abe7083de more consistent console output
mroi
parents: 73
diff changeset
256 fprintf(MSG_OUT, "libdvdnav: demux error! %02x %02x %02x (should be 0x000001) \n",p[0],p[1],p[2]);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
257 return 0;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
258 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
259
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
260 nPacketLen = p[4] << 8 | p[5];
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
261 nStreamID = p[3];
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
262
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
263 nHeaderLen = 6;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
264 p += nHeaderLen;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
265
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
266 if (nStreamID == 0xbf) { /* Private stream 2 */
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
267 #if 0
195
6b1bfe8f5283 Start some cleanups.
jcdutton
parents: 194
diff changeset
268 int32_t i;
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
269 fprintf(MSG_OUT, "libdvdnav: nav packet=%u\n",p-p_start-6);
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
270 for(i=0;i<80;i++)
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
271 fprintf(MSG_OUT, "%02x ",p[i-6]);
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
272 fprintf(MSG_OUT, "\n");
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
273 #endif
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
274
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
275 if(p[0] == 0x00) {
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
276 navRead_PCI(nav_pci, p+1);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
277 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
278
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
279 p += nPacketLen;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
280
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
281 /* We should now have a DSI packet. */
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
282 if(p[6] == 0x01) {
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
283 nPacketLen = p[4] << 8 | p[5];
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
284 p += 6;
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
285 navRead_DSI(nav_dsi, p+1);
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
286 }
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
287 return 1;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
288 }
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
289 return 0;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
290 }
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
291
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
292 /* DSI is used for most angle stuff.
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
293 * 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
294 */
195
6b1bfe8f5283 Start some cleanups.
jcdutton
parents: 194
diff changeset
295 static int32_t 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
296 uint32_t next;
195
6b1bfe8f5283 Start some cleanups.
jcdutton
parents: 194
diff changeset
297 int32_t angle, num_angle;
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
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
299 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
300 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
301
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
302 /*
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
303 * 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
304 * 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
305 * 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
306 * 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
307 * really happy.
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
308 *
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
309 * 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
310 * 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
311 * Should really assert if bit 31 != 1
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
312 */
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
313
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
314 #if 0
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
315 /* 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
316 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
317 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
318 } 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
319 vobu->vobu_next = vobu->vobu_length;
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
320 }
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
321 #else
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
322 /* Relative offset from vobu_start */
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
323 vobu->vobu_next = ( nav_dsi->vobu_sri.next_vobu & 0x3fffffff );
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
324 #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
325
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
326 vm_get_angle_info(this->vm, &angle, &num_angle);
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
327
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
328 /* 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
329 #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
330 if((num_angle < angle) && (angle != 1)) {
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
331 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
332
ef2136c4e7b2 Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents: 31
diff changeset
333 /* 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
334 * finish with angles. */
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
335 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
336 }
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 #endif
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
338
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 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
340
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
341 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
342 if((next & 0x3fffffff) != 0) {
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
343 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
344 vobu->vobu_next = - (int32_t)(next & 0x3fffffff);
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
345 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
346 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
347 }
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
348 } 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
349 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
350
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
351 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
352 vobu->vobu_next = - (int32_t)(next & 0x3fffffff);
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
353 else
33
ef2136c4e7b2 Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents: 31
diff changeset
354 vobu->vobu_next = + (int32_t)(next & 0x3fffffff);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
355 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
356 }
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
357
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
358 return 1;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
359 }
60
30995ad032cf use new memcopy'less read ahead cache
mroi
parents: 58
diff changeset
360
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
361 /*
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
362 * These are the main get_next_block function which actually get the media stream video and audio etc.
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
363 *
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
364 * There are two versions: The second one is using the zero-copy read ahead cache and therefore
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
365 * hands out pointers targetting directly into the cache.
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
366 * The first one uses a memcopy to fill this cache block into the application provided memory.
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
367 * The benefit of this first one is that no special memory management is needed. The application is
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
368 * the only one responsible of allocating and freeing the memory associated with the pointer.
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
369 * The drawback is the additional memcopy.
28
da60d6379f95 Add some comments, FIXMEs.
jcdutton
parents: 26
diff changeset
370 */
60
30995ad032cf use new memcopy'less read ahead cache
mroi
parents: 58
diff changeset
371
195
6b1bfe8f5283 Start some cleanups.
jcdutton
parents: 194
diff changeset
372 dvdnav_status_t dvdnav_get_next_block(dvdnav_t *this, uint8_t *buf,
6b1bfe8f5283 Start some cleanups.
jcdutton
parents: 194
diff changeset
373 int32_t *event, int32_t *len) {
60
30995ad032cf use new memcopy'less read ahead cache
mroi
parents: 58
diff changeset
374 unsigned char *block;
30995ad032cf use new memcopy'less read ahead cache
mroi
parents: 58
diff changeset
375 dvdnav_status_t status;
30995ad032cf use new memcopy'less read ahead cache
mroi
parents: 58
diff changeset
376
30995ad032cf use new memcopy'less read ahead cache
mroi
parents: 58
diff changeset
377 block = buf;
30995ad032cf use new memcopy'less read ahead cache
mroi
parents: 58
diff changeset
378 status = dvdnav_get_next_cache_block(this, &block, event, len);
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 191
diff changeset
379 if (status == DVDNAV_STATUS_OK && block != buf) {
60
30995ad032cf use new memcopy'less read ahead cache
mroi
parents: 58
diff changeset
380 /* we received a block from the cache, copy it, so we can give it back */
30995ad032cf use new memcopy'less read ahead cache
mroi
parents: 58
diff changeset
381 memcpy(buf, block, DVD_VIDEO_LB_LEN);
30995ad032cf use new memcopy'less read ahead cache
mroi
parents: 58
diff changeset
382 dvdnav_free_cache_block(this, block);
30995ad032cf use new memcopy'less read ahead cache
mroi
parents: 58
diff changeset
383 }
30995ad032cf use new memcopy'less read ahead cache
mroi
parents: 58
diff changeset
384 return status;
30995ad032cf use new memcopy'less read ahead cache
mroi
parents: 58
diff changeset
385 }
269
77e472cef5f8 implemented dvdnav_get_current_time() with obvious meaning
nicodvb
parents: 266
diff changeset
386
77e472cef5f8 implemented dvdnav_get_current_time() with obvious meaning
nicodvb
parents: 266
diff changeset
387 int64_t dvdnav_get_current_time(dvdnav_t *this) {
77e472cef5f8 implemented dvdnav_get_current_time() with obvious meaning
nicodvb
parents: 266
diff changeset
388 int i;
77e472cef5f8 implemented dvdnav_get_current_time() with obvious meaning
nicodvb
parents: 266
diff changeset
389 int64_t tm=0;
77e472cef5f8 implemented dvdnav_get_current_time() with obvious meaning
nicodvb
parents: 266
diff changeset
390 dvd_state_t *state = &this->vm->state;
77e472cef5f8 implemented dvdnav_get_current_time() with obvious meaning
nicodvb
parents: 266
diff changeset
391
77e472cef5f8 implemented dvdnav_get_current_time() with obvious meaning
nicodvb
parents: 266
diff changeset
392 for(i=0; i<state->cellN-1; i++) {
77e472cef5f8 implemented dvdnav_get_current_time() with obvious meaning
nicodvb
parents: 266
diff changeset
393 if(!
77e472cef5f8 implemented dvdnav_get_current_time() with obvious meaning
nicodvb
parents: 266
diff changeset
394 (state->pgc->cell_playback[i].block_type == BLOCK_TYPE_ANGLE_BLOCK &&
77e472cef5f8 implemented dvdnav_get_current_time() with obvious meaning
nicodvb
parents: 266
diff changeset
395 state->pgc->cell_playback[i].block_mode != BLOCK_MODE_FIRST_CELL)
77e472cef5f8 implemented dvdnav_get_current_time() with obvious meaning
nicodvb
parents: 266
diff changeset
396 )
77e472cef5f8 implemented dvdnav_get_current_time() with obvious meaning
nicodvb
parents: 266
diff changeset
397 tm += dvdnav_convert_time(&state->pgc->cell_playback[i].playback_time);
77e472cef5f8 implemented dvdnav_get_current_time() with obvious meaning
nicodvb
parents: 266
diff changeset
398 }
77e472cef5f8 implemented dvdnav_get_current_time() with obvious meaning
nicodvb
parents: 266
diff changeset
399 tm += this->cur_cell_time;
77e472cef5f8 implemented dvdnav_get_current_time() with obvious meaning
nicodvb
parents: 266
diff changeset
400
77e472cef5f8 implemented dvdnav_get_current_time() with obvious meaning
nicodvb
parents: 266
diff changeset
401 return tm;
77e472cef5f8 implemented dvdnav_get_current_time() with obvious meaning
nicodvb
parents: 266
diff changeset
402 }
60
30995ad032cf use new memcopy'less read ahead cache
mroi
parents: 58
diff changeset
403
195
6b1bfe8f5283 Start some cleanups.
jcdutton
parents: 194
diff changeset
404 dvdnav_status_t dvdnav_get_next_cache_block(dvdnav_t *this, uint8_t **buf,
6b1bfe8f5283 Start some cleanups.
jcdutton
parents: 194
diff changeset
405 int32_t *event, int32_t *len) {
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
406 dvd_state_t *state;
195
6b1bfe8f5283 Start some cleanups.
jcdutton
parents: 194
diff changeset
407 int32_t result;
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
408
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
409 pthread_mutex_lock(&this->vm_lock);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
410
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
411 if(!this->started) {
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
412 /* Start the VM */
256
6299ccea8a38 killing a lot of asserts and turning them into forced executions of Exit,
mroi
parents: 249
diff changeset
413 if (!vm_start(this->vm)) {
6299ccea8a38 killing a lot of asserts and turning them into forced executions of Exit,
mroi
parents: 249
diff changeset
414 printerr("Encrypted or faulty DVD");
6299ccea8a38 killing a lot of asserts and turning them into forced executions of Exit,
mroi
parents: 249
diff changeset
415 return DVDNAV_STATUS_ERR;
6299ccea8a38 killing a lot of asserts and turning them into forced executions of Exit,
mroi
parents: 249
diff changeset
416 }
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
417 this->started = 1;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
418 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
419
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
420 state = &(this->vm->state);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
421 (*event) = DVDNAV_NOP;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
422 (*len) = 0;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
423
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
424 /* Check the STOP flag */
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
425 if(this->vm->stopped) {
121
545bd4fc0a16 stop the VM here
mroi
parents: 116
diff changeset
426 vm_stop(this->vm);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
427 (*event) = DVDNAV_STOP;
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
428 this->started = 0;
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
429 pthread_mutex_unlock(&this->vm_lock);
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 191
diff changeset
430 return DVDNAV_STATUS_OK;
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
431 }
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
432
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
433 vm_position_get(this->vm, &this->position_next);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
434
126
42d06bc1251d less overwhelming TRACE info
mroi
parents: 121
diff changeset
435 #ifdef LOG_DEBUG
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
436 fprintf(MSG_OUT, "libdvdnav: POS-NEXT ");
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
437 vm_position_print(this->vm, &this->position_next);
116
4d711d0518e9 new event DVDNAV_WAIT
mroi
parents: 115
diff changeset
438 fprintf(MSG_OUT, "libdvdnav: POS-CUR ");
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
439 vm_position_print(this->vm, &this->position_current);
31
8b08ee66cbff Quiet please!!!
jcdutton
parents: 30
diff changeset
440 #endif
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
441
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
442 /* did we hop? */
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
443 if(this->position_current.hop_channel != this->position_next.hop_channel) {
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
444 (*event) = DVDNAV_HOP_CHANNEL;
58
18af52093d13 * fix debug messages
mroi
parents: 55
diff changeset
445 #ifdef LOG_DEBUG
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
446 fprintf(MSG_OUT, "libdvdnav: HOP_CHANNEL\n");
31
8b08ee66cbff Quiet please!!!
jcdutton
parents: 30
diff changeset
447 #endif
115
b527b7cbfb19 fix seek detection
mroi
parents: 114
diff changeset
448 if (this->position_next.hop_channel - this->position_current.hop_channel >= HOP_SEEK) {
195
6b1bfe8f5283 Start some cleanups.
jcdutton
parents: 194
diff changeset
449 int32_t num_angles = 0, current;
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
450
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
451 /* we seeked -> check for multiple angles */
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
452 vm_get_angle_info(this->vm, &current, &num_angles);
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
453 if (num_angles > 1) {
195
6b1bfe8f5283 Start some cleanups.
jcdutton
parents: 194
diff changeset
454 int32_t result, block;
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
455 /* we have to skip the first VOBU when seeking in a multiangle feature,
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
456 * because it might belong to the wrong angle */
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
457 block = this->position_next.cell_start + this->position_next.block;
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
458 result = dvdnav_read_cache_block(this->cache, block, 1, buf);
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
459 if(result <= 0) {
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
460 printerr("Error reading NAV packet.");
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
461 pthread_mutex_unlock(&this->vm_lock);
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 191
diff changeset
462 return DVDNAV_STATUS_ERR;
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
463 }
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
464 /* Decode nav into pci and dsi. Then get next VOBU info. */
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
465 if(!dvdnav_decode_packet(this, *buf, &this->dsi, &this->pci)) {
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
466 printerr("Expected NAV packet but none found.");
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
467 pthread_mutex_unlock(&this->vm_lock);
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 191
diff changeset
468 return DVDNAV_STATUS_ERR;
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
469 }
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
470 dvdnav_get_vobu(this, &this->dsi, &this->pci, &this->vobu);
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
471 /* skip to next, if there is a next */
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
472 if (this->vobu.vobu_next != SRI_END_OF_CELL) {
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
473 this->vobu.vobu_start += this->vobu.vobu_next;
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
474 this->vobu.vobu_next = 0;
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
475 }
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
476 /* update VM state */
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
477 this->vm->state.blockN = this->vobu.vobu_start - this->position_next.cell_start;
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
478 }
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
479 }
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
480 this->position_current.hop_channel = this->position_next.hop_channel;
141
8f63f4c25f2f update position on HOP_CHANNEL, do not rely on a following CELL_CHANGE
mroi
parents: 135
diff changeset
481 /* update VOBU info */
8f63f4c25f2f update position on HOP_CHANNEL, do not rely on a following CELL_CHANGE
mroi
parents: 135
diff changeset
482 this->vobu.vobu_start = this->position_next.cell_start + this->position_next.block;
8f63f4c25f2f update position on HOP_CHANNEL, do not rely on a following CELL_CHANGE
mroi
parents: 135
diff changeset
483 this->vobu.vobu_next = 0;
127
f2e86078a5dc start blockN from 0
mroi
parents: 126
diff changeset
484 /* Make blockN == vobu_length to do expected_nav */
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
485 this->vobu.vobu_length = 0;
127
f2e86078a5dc start blockN from 0
mroi
parents: 126
diff changeset
486 this->vobu.blockN = 0;
116
4d711d0518e9 new event DVDNAV_WAIT
mroi
parents: 115
diff changeset
487 this->sync_wait = 0;
30
630b6733e492 Some more cleanups.
jcdutton
parents: 28
diff changeset
488 pthread_mutex_unlock(&this->vm_lock);
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 191
diff changeset
489 return DVDNAV_STATUS_OK;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
490 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
491
116
4d711d0518e9 new event DVDNAV_WAIT
mroi
parents: 115
diff changeset
492 /* Check the HIGHLIGHT flag */
4d711d0518e9 new event DVDNAV_WAIT
mroi
parents: 115
diff changeset
493 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
494 dvdnav_highlight_event_t *hevent = (dvdnav_highlight_event_t *)*buf;
116
4d711d0518e9 new event DVDNAV_WAIT
mroi
parents: 115
diff changeset
495
4d711d0518e9 new event DVDNAV_WAIT
mroi
parents: 115
diff changeset
496 (*event) = DVDNAV_HIGHLIGHT;
4d711d0518e9 new event DVDNAV_WAIT
mroi
parents: 115
diff changeset
497 #ifdef LOG_DEBUG
4d711d0518e9 new event DVDNAV_WAIT
mroi
parents: 115
diff changeset
498 fprintf(MSG_OUT, "libdvdnav: HIGHLIGHT\n");
4d711d0518e9 new event DVDNAV_WAIT
mroi
parents: 115
diff changeset
499 #endif
134
d9d75a22a061 - new event on cell changes to report program and cell number and some time info
mroi
parents: 127
diff changeset
500 (*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
501 hevent->display = 1;
d9d75a22a061 - new event on cell changes to report program and cell number and some time info
mroi
parents: 127
diff changeset
502 hevent->buttonN = this->position_next.button;
116
4d711d0518e9 new event DVDNAV_WAIT
mroi
parents: 115
diff changeset
503 this->position_current.button = this->position_next.button;
4d711d0518e9 new event DVDNAV_WAIT
mroi
parents: 115
diff changeset
504 pthread_mutex_unlock(&this->vm_lock);
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 191
diff changeset
505 return DVDNAV_STATUS_OK;
116
4d711d0518e9 new event DVDNAV_WAIT
mroi
parents: 115
diff changeset
506 }
4d711d0518e9 new event DVDNAV_WAIT
mroi
parents: 115
diff changeset
507
4d711d0518e9 new event DVDNAV_WAIT
mroi
parents: 115
diff changeset
508 /* Check the WAIT flag */
4d711d0518e9 new event DVDNAV_WAIT
mroi
parents: 115
diff changeset
509 if(this->sync_wait) {
4d711d0518e9 new event DVDNAV_WAIT
mroi
parents: 115
diff changeset
510 (*event) = DVDNAV_WAIT;
4d711d0518e9 new event DVDNAV_WAIT
mroi
parents: 115
diff changeset
511 #ifdef LOG_DEBUG
4d711d0518e9 new event DVDNAV_WAIT
mroi
parents: 115
diff changeset
512 fprintf(MSG_OUT, "libdvdnav: WAIT\n");
4d711d0518e9 new event DVDNAV_WAIT
mroi
parents: 115
diff changeset
513 #endif
4d711d0518e9 new event DVDNAV_WAIT
mroi
parents: 115
diff changeset
514 (*len) = 0;
4d711d0518e9 new event DVDNAV_WAIT
mroi
parents: 115
diff changeset
515 pthread_mutex_unlock(&this->vm_lock);
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 191
diff changeset
516 return DVDNAV_STATUS_OK;
116
4d711d0518e9 new event DVDNAV_WAIT
mroi
parents: 115
diff changeset
517 }
4d711d0518e9 new event DVDNAV_WAIT
mroi
parents: 115
diff changeset
518
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
519 /* 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
520 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
521 (this->position_current.domain != this->position_next.domain)) {
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
522 dvd_read_domain_t domain;
195
6b1bfe8f5283 Start some cleanups.
jcdutton
parents: 194
diff changeset
523 int32_t vtsN;
134
d9d75a22a061 - new event on cell changes to report program and cell number and some time info
mroi
parents: 127
diff changeset
524 dvdnav_vts_change_event_t *vts_event = (dvdnav_vts_change_event_t *)*buf;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
525
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
526 if(this->file) {
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
527 DVDCloseFile(this->file);
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
528 this->file = NULL;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
529 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
530
217
eb503714e1c2 these variables are not needed any more
mroi
parents: 198
diff changeset
531 vts_event->old_vtsN = this->position_current.vts;
eb503714e1c2 these variables are not needed any more
mroi
parents: 198
diff changeset
532 vts_event->old_domain = this->position_current.domain;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
533
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
534 /* 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
535 switch(this->position_next.domain) {
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
536 case FP_DOMAIN:
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
537 case VMGM_DOMAIN:
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
538 domain = DVD_READ_MENU_VOBS;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
539 vtsN = 0;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
540 break;
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
541 case VTSM_DOMAIN:
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
542 domain = DVD_READ_MENU_VOBS;
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
543 vtsN = this->position_next.vts;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
544 break;
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
545 case VTS_DOMAIN:
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
546 domain = DVD_READ_TITLE_VOBS;
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
547 vtsN = this->position_next.vts;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
548 break;
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
549 default:
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
550 printerr("Unknown domain when changing VTS.");
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
551 pthread_mutex_unlock(&this->vm_lock);
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 191
diff changeset
552 return DVDNAV_STATUS_ERR;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
553 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
554
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
555 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
556 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
557 dvdnav_read_cache_clear(this->cache);
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
558 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
559 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
560 vts_event->new_domain = this->position_next.domain;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
561
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
562 /* 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
563 if(this->file == NULL) {
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
564 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
565 pthread_mutex_unlock(&this->vm_lock);
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 191
diff changeset
566 return DVDNAV_STATUS_ERR;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
567 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
568
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
569 /* File opened successfully so return a VTS change event */
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
570 (*event) = DVDNAV_VTS_CHANGE;
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
571 #ifdef LOG_DEBUG
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
572 fprintf(MSG_OUT, "libdvdnav: VTS_CHANGE\n");
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
573 #endif
134
d9d75a22a061 - new event on cell changes to report program and cell number and some time info
mroi
parents: 127
diff changeset
574 (*len) = sizeof(dvdnav_vts_change_event_t);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
575
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
576 this->spu_clut_changed = 1;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
577 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
578 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
579 this->position_current.audio_channel = -1; /* Force an update */;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
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);
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 191
diff changeset
582 return DVDNAV_STATUS_OK;
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
583 }
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
584
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
585 /* Check if the cell changed */
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
586 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
587 (this->position_current.cell_restart != this->position_next.cell_restart) ||
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
588 (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
589 dvdnav_cell_change_event_t *cell_event = (dvdnav_cell_change_event_t *)*buf;
195
6b1bfe8f5283 Start some cleanups.
jcdutton
parents: 194
diff changeset
590 int32_t first_cell_nr, last_cell_nr, i;
134
d9d75a22a061 - new event on cell changes to report program and cell number and some time info
mroi
parents: 127
diff changeset
591 dvd_state_t *state = &this->vm->state;
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
592
269
77e472cef5f8 implemented dvdnav_get_current_time() with obvious meaning
nicodvb
parents: 266
diff changeset
593 this->cur_cell_time = 0;
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
594 (*event) = DVDNAV_CELL_CHANGE;
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
595 #ifdef LOG_DEBUG
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
596 fprintf(MSG_OUT, "libdvdnav: CELL_CHANGE\n");
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
597 #endif
134
d9d75a22a061 - new event on cell changes to report program and cell number and some time info
mroi
parents: 127
diff changeset
598 (*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
599
d9d75a22a061 - new event on cell changes to report program and cell number and some time info
mroi
parents: 127
diff changeset
600 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
601 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
602 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
603 dvdnav_convert_time(&state->pgc->cell_playback[state->cellN-1].playback_time);
161
81b9602f780c report start of PG as well
mroi
parents: 151
diff changeset
604
134
d9d75a22a061 - new event on cell changes to report program and cell number and some time info
mroi
parents: 127
diff changeset
605 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
606 /* 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
607 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
608 /* 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
609 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
610 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
611 else
d9d75a22a061 - new event on cell changes to report program and cell number and some time info
mroi
parents: 127
diff changeset
612 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
613 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
614 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
615 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
616 cell_event->pgc_length = dvdnav_convert_time(&state->pgc->playback_time);
151
6439d00b1363 fill in new timing member in cell_change event
mroi
parents: 143
diff changeset
617
6439d00b1363 fill in new timing member in cell_change event
mroi
parents: 143
diff changeset
618 cell_event->cell_start = 0;
6439d00b1363 fill in new timing member in cell_change event
mroi
parents: 143
diff changeset
619 for (i = 1; i < state->cellN; i++)
6439d00b1363 fill in new timing member in cell_change event
mroi
parents: 143
diff changeset
620 cell_event->cell_start +=
6439d00b1363 fill in new timing member in cell_change event
mroi
parents: 143
diff changeset
621 dvdnav_convert_time(&state->pgc->cell_playback[i - 1].playback_time);
161
81b9602f780c report start of PG as well
mroi
parents: 151
diff changeset
622
81b9602f780c report start of PG as well
mroi
parents: 151
diff changeset
623 cell_event->pg_start = 0;
81b9602f780c report start of PG as well
mroi
parents: 151
diff changeset
624 for (i = 1; i < state->pgc->program_map[state->pgN-1]; i++)
81b9602f780c report start of PG as well
mroi
parents: 151
diff changeset
625 cell_event->pg_start +=
81b9602f780c report start of PG as well
mroi
parents: 151
diff changeset
626 dvdnav_convert_time(&state->pgc->cell_playback[i - 1].playback_time);
81b9602f780c report start of PG as well
mroi
parents: 151
diff changeset
627
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
628 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
629 this->position_current.cell_restart = this->position_next.cell_restart;
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
630 this->position_current.cell_start = this->position_next.cell_start;
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
631 this->position_current.block = this->position_next.block;
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
632
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
633 /* vobu info is used for mid cell resumes */
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
634 this->vobu.vobu_start = this->position_next.cell_start + this->position_next.block;
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
635 this->vobu.vobu_next = 0;
127
f2e86078a5dc start blockN from 0
mroi
parents: 126
diff changeset
636 /* Make blockN == vobu_length to do expected_nav */
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
637 this->vobu.vobu_length = 0;
127
f2e86078a5dc start blockN from 0
mroi
parents: 126
diff changeset
638 this->vobu.blockN = 0;
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
639
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
640 /* update the spu palette at least on PGC changes */
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
641 this->spu_clut_changed = 1;
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
642 this->position_current.spu_channel = -1; /* Force an update */
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
643 this->position_current.audio_channel = -1; /* Force an update */
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
644
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
645 pthread_mutex_unlock(&this->vm_lock);
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 191
diff changeset
646 return DVDNAV_STATUS_OK;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
647 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
648
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
649 /* has the CLUT changed? */
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
650 if(this->spu_clut_changed) {
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
651 (*event) = DVDNAV_SPU_CLUT_CHANGE;
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
652 #ifdef LOG_DEBUG
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
653 fprintf(MSG_OUT, "libdvdnav: SPU_CLUT_CHANGE\n");
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
654 #endif
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
655 (*len) = 16 * sizeof(uint32_t);
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
656 memcpy(*buf, &(state->pgc->palette), 16 * sizeof(uint32_t));
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
657 this->spu_clut_changed = 0;
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
658 pthread_mutex_unlock(&this->vm_lock);
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 191
diff changeset
659 return DVDNAV_STATUS_OK;
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
660 }
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
661
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
662 /* has the SPU channel changed? */
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
663 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
664 dvdnav_spu_stream_change_event_t *stream_change = (dvdnav_spu_stream_change_event_t *)*buf;
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
665
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
666 (*event) = DVDNAV_SPU_STREAM_CHANGE;
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
667 #ifdef LOG_DEBUG
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
668 fprintf(MSG_OUT, "libdvdnav: SPU_STREAM_CHANGE\n");
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
669 #endif
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
670 (*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
671 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
672 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
673 stream_change->physical_pan_scan = vm_get_subp_active_stream(this->vm, 2);
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
674 this->position_current.spu_channel = this->position_next.spu_channel;
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
675 #ifdef LOG_DEBUG
143
0b302ca31859 merge James fixes from xine-lib cvs back into libdvdnav cvs so they will not be lost
mroi
parents: 142
diff changeset
676 fprintf(MSG_OUT, "libdvdnav: SPU_STREAM_CHANGE stream_id_wide=%d\n",stream_change->physical_wide);
0b302ca31859 merge James fixes from xine-lib cvs back into libdvdnav cvs so they will not be lost
mroi
parents: 142
diff changeset
677 fprintf(MSG_OUT, "libdvdnav: SPU_STREAM_CHANGE stream_id_letterbox=%d\n",stream_change->physical_letterbox);
0b302ca31859 merge James fixes from xine-lib cvs back into libdvdnav cvs so they will not be lost
mroi
parents: 142
diff changeset
678 fprintf(MSG_OUT, "libdvdnav: SPU_STREAM_CHANGE stream_id_pan_scan=%d\n",stream_change->physical_pan_scan);
249
5d643668f1e3 I added this code myself a long time ago, but now I am quite convinced that
mroi
parents: 231
diff changeset
679 fprintf(MSG_OUT, "libdvdnav: SPU_STREAM_CHANGE returning DVDNAV_STATUS_OK\n");
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
680 #endif
249
5d643668f1e3 I added this code myself a long time ago, but now I am quite convinced that
mroi
parents: 231
diff changeset
681 pthread_mutex_unlock(&this->vm_lock);
5d643668f1e3 I added this code myself a long time ago, but now I am quite convinced that
mroi
parents: 231
diff changeset
682 return DVDNAV_STATUS_OK;
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
683 }
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
684
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
685 /* has the audio channel changed? */
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
686 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
687 dvdnav_audio_stream_change_event_t *stream_change = (dvdnav_audio_stream_change_event_t *)*buf;
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
688
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
689 (*event) = DVDNAV_AUDIO_STREAM_CHANGE;
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
690 #ifdef LOG_DEBUG
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
691 fprintf(MSG_OUT, "libdvdnav: AUDIO_STREAM_CHANGE\n");
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
692 #endif
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
693 (*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
694 stream_change->physical = vm_get_audio_active_stream( this->vm );
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
695 this->position_current.audio_channel = this->position_next.audio_channel;
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
696 #ifdef LOG_DEBUG
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 191
diff changeset
697 fprintf(MSG_OUT, "libdvdnav: AUDIO_STREAM_CHANGE stream_id=%d returning DVDNAV_STATUS_OK\n",stream_change->physical);
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
698 #endif
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
699 pthread_mutex_unlock(&this->vm_lock);
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 191
diff changeset
700 return DVDNAV_STATUS_OK;
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
701 }
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
702
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
703 /* Check the STILLFRAME flag */
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
704 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
705 dvdnav_still_event_t *still_event = (dvdnav_still_event_t *)*buf;
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
706
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
707 (*event) = DVDNAV_STILL_FRAME;
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
708 #ifdef LOG_DEBUG
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
709 fprintf(MSG_OUT, "libdvdnav: STILL_FRAME\n");
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
710 #endif
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
711 (*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
712 still_event->length = this->position_current.still;
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
713 pthread_mutex_unlock(&this->vm_lock);
194
0ee10bd2292a Oops! We like still menus really.
jcdutton
parents: 193
diff changeset
714 return DVDNAV_STATUS_OK;
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
715 }
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
716
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
717 /* Have we reached the end of a VOBU? */
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
718 if (this->vobu.blockN >= this->vobu.vobu_length) {
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
719
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
720 /* 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
721 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
722 /* End of Cell from NAV DSI info */
31
8b08ee66cbff Quiet please!!!
jcdutton
parents: 30
diff changeset
723 #ifdef LOG_DEBUG
76
0e2abe7083de more consistent console output
mroi
parents: 73
diff changeset
724 fprintf(MSG_OUT, "libdvdnav: Still set to %x\n", this->position_next.still);
31
8b08ee66cbff Quiet please!!!
jcdutton
parents: 30
diff changeset
725 #endif
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
726 this->position_current.still = this->position_next.still;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
727
116
4d711d0518e9 new event DVDNAV_WAIT
mroi
parents: 115
diff changeset
728 /* we are about to leave a cell, so a lot of state changes could occur;
4d711d0518e9 new event DVDNAV_WAIT
mroi
parents: 115
diff changeset
729 * under certain conditions, the application should get in sync with us before this,
4d711d0518e9 new event DVDNAV_WAIT
mroi
parents: 115
diff changeset
730 * otherwise it might show stills or menus too shortly */
4d711d0518e9 new event DVDNAV_WAIT
mroi
parents: 115
diff changeset
731 if ((this->position_current.still || this->pci.hli.hl_gi.hli_ss) && !this->sync_wait_skip) {
4d711d0518e9 new event DVDNAV_WAIT
mroi
parents: 115
diff changeset
732 this->sync_wait = 1;
4d711d0518e9 new event DVDNAV_WAIT
mroi
parents: 115
diff changeset
733 } else {
4d711d0518e9 new event DVDNAV_WAIT
mroi
parents: 115
diff changeset
734 if( this->position_current.still == 0 || this->skip_still ) {
4d711d0518e9 new event DVDNAV_WAIT
mroi
parents: 115
diff changeset
735 /* no active cell still -> get us to the next cell */
4d711d0518e9 new event DVDNAV_WAIT
mroi
parents: 115
diff changeset
736 vm_get_next_cell(this->vm);
4d711d0518e9 new event DVDNAV_WAIT
mroi
parents: 115
diff changeset
737 this->position_current.still = 0; /* still gets activated at end of cell */
4d711d0518e9 new event DVDNAV_WAIT
mroi
parents: 115
diff changeset
738 this->skip_still = 0;
4d711d0518e9 new event DVDNAV_WAIT
mroi
parents: 115
diff changeset
739 this->sync_wait_skip = 0;
4d711d0518e9 new event DVDNAV_WAIT
mroi
parents: 115
diff changeset
740 }
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
741 }
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
742 /* handle related state changes in next iteration */
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
743 (*event) = DVDNAV_NOP;
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
744 (*len) = 0;
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
745 pthread_mutex_unlock(&this->vm_lock);
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 191
diff changeset
746 return DVDNAV_STATUS_OK;
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
747 }
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
748
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
749 /* Perform remapping jump if necessary (this is always a
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
750 * VOBU boundary). */
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
751 if (this->vm->map) {
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
752 this->vobu.vobu_next = remap_block( this->vm->map,
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
753 this->vm->state.domain, this->vm->state.TTN_REG,
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
754 this->vm->state.pgN,
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
755 this->vobu.vobu_start, this->vobu.vobu_next);
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
756 }
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
757
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
758 /* at the start of the next VOBU -> expecting NAV packet */
45
7bf97b8922b4 Revert back to old read_cache method.
jcdutton
parents: 43
diff changeset
759 result = dvdnav_read_cache_block(this->cache, this->vobu.vobu_start + this->vobu.vobu_next, 1, buf);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
760
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
761 if(result <= 0) {
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
762 printerr("Error reading NAV packet.");
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
763 pthread_mutex_unlock(&this->vm_lock);
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 191
diff changeset
764 return DVDNAV_STATUS_ERR;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
765 }
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
766 /* Decode nav into pci and dsi. Then get next VOBU info. */
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
767 if(!dvdnav_decode_packet(this, *buf, &this->dsi, &this->pci)) {
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
768 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
769 pthread_mutex_unlock(&this->vm_lock);
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 191
diff changeset
770 return DVDNAV_STATUS_ERR;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
771 }
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
772 /* We need to update the vm state->blockN with which VOBU we are in.
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
773 * This is so RSM resumes to the VOBU level and not just the CELL level.
28
da60d6379f95 Add some comments, FIXMEs.
jcdutton
parents: 26
diff changeset
774 */
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
775 this->vm->state.blockN = this->vobu.vobu_start - this->position_current.cell_start;
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
776
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
777 dvdnav_get_vobu(this, &this->dsi, &this->pci, &this->vobu);
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
778 this->vobu.blockN = 0;
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
779 /* Give the cache a hint about the size of next VOBU.
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
780 * This improves pre-caching, because the VOBU will almost certainly be read entirely.
45
7bf97b8922b4 Revert back to old read_cache method.
jcdutton
parents: 43
diff changeset
781 */
7bf97b8922b4 Revert back to old read_cache method.
jcdutton
parents: 43
diff changeset
782 dvdnav_pre_cache_blocks(this->cache, this->vobu.vobu_start+1, this->vobu.vobu_length+1);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
783
191
dbea22936623 when a command has been issued to leave a menu, filter all further commands
mroi
parents: 179
diff changeset
784 /* release NAV menu filter, when we reach the same NAV packet again */
dbea22936623 when a command has been issued to leave a menu, filter all further commands
mroi
parents: 179
diff changeset
785 if (this->last_cmd_nav_lbn == this->pci.pci_gi.nv_pck_lbn)
198
373f27da196b This one should also be reset to an invalid value, but 0 is not invalid.
mroi
parents: 197
diff changeset
786 this->last_cmd_nav_lbn = SRI_END_OF_CELL;
191
dbea22936623 when a command has been issued to leave a menu, filter all further commands
mroi
parents: 179
diff changeset
787
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
788 /* Successfully got a NAV packet */
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
789 (*event) = DVDNAV_NAV_PACKET;
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
790 #ifdef LOG_DEBUG
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
791 fprintf(MSG_OUT, "libdvdnav: NAV_PACKET\n");
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
792 #endif
3
328eadb3f37e Added initial example programs directory and make sure all debug/error output goes to stderr.
richwareham
parents: 0
diff changeset
793 (*len) = 2048;
269
77e472cef5f8 implemented dvdnav_get_current_time() with obvious meaning
nicodvb
parents: 266
diff changeset
794 this->cur_cell_time = dvdnav_convert_time(&this->dsi.dsi_gi.c_eltm);
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
795 pthread_mutex_unlock(&this->vm_lock);
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 191
diff changeset
796 return DVDNAV_STATUS_OK;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
797 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
798
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
799 /* 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
800 if(!this->file) {
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
801 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
802 pthread_mutex_unlock(&this->vm_lock);
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 191
diff changeset
803 return DVDNAV_STATUS_ERR;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
804 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
805
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
806 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
807 result = dvdnav_read_cache_block(this->cache, this->vobu.vobu_start + this->vobu.blockN, 1, buf);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
808 if(result <= 0) {
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
809 printerr("Error reading from DVD.");
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
810 pthread_mutex_unlock(&this->vm_lock);
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 191
diff changeset
811 return DVDNAV_STATUS_ERR;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
812 }
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
813 (*event) = DVDNAV_BLOCK_OK;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
814 (*len) = 2048;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
815
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
816 pthread_mutex_unlock(&this->vm_lock);
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 191
diff changeset
817 return DVDNAV_STATUS_OK;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
818 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
819
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
820 dvdnav_status_t dvdnav_get_title_string(dvdnav_t *this, const char **title_str) {
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
821 (*title_str) = this->vm->dvd_name;
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 191
diff changeset
822 return DVDNAV_STATUS_OK;
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
823 }
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
824
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
825 uint8_t dvdnav_get_video_aspect(dvdnav_t *this) {
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
826 uint8_t retval;
273
bd734ab914d0 removed nonsensical checks on the sanity of dvdnav_t *this
nicodvb
parents: 272
diff changeset
827
142
e375b765ebf5 some more sanity checking will prevent segfaults in these functions
mroi
parents: 141
diff changeset
828 if(!this->started) {
e375b765ebf5 some more sanity checking will prevent segfaults in these functions
mroi
parents: 141
diff changeset
829 printerr("Virtual DVD machine not started.");
e375b765ebf5 some more sanity checking will prevent segfaults in these functions
mroi
parents: 141
diff changeset
830 return -1;
e375b765ebf5 some more sanity checking will prevent segfaults in these functions
mroi
parents: 141
diff changeset
831 }
e375b765ebf5 some more sanity checking will prevent segfaults in these functions
mroi
parents: 141
diff changeset
832
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
833 pthread_mutex_lock(&this->vm_lock);
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
834 retval = (uint8_t)vm_get_video_aspect(this->vm);
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
835 pthread_mutex_unlock(&this->vm_lock);
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
836
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
837 return retval;
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
838 }
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
839
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
840 uint8_t dvdnav_get_video_scale_permission(dvdnav_t *this) {
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
841 uint8_t retval;
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
842
142
e375b765ebf5 some more sanity checking will prevent segfaults in these functions
mroi
parents: 141
diff changeset
843 if(!this->started) {
e375b765ebf5 some more sanity checking will prevent segfaults in these functions
mroi
parents: 141
diff changeset
844 printerr("Virtual DVD machine not started.");
e375b765ebf5 some more sanity checking will prevent segfaults in these functions
mroi
parents: 141
diff changeset
845 return -1;
e375b765ebf5 some more sanity checking will prevent segfaults in these functions
mroi
parents: 141
diff changeset
846 }
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
847
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
848 pthread_mutex_lock(&this->vm_lock);
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
849 retval = (uint8_t)vm_get_video_scale_permission(this->vm);
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
850 pthread_mutex_unlock(&this->vm_lock);
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
851
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
852 return retval;
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
853 }
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
854
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
855 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
856 audio_attr_t attr;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
857
142
e375b765ebf5 some more sanity checking will prevent segfaults in these functions
mroi
parents: 141
diff changeset
858 if(!this->started) {
e375b765ebf5 some more sanity checking will prevent segfaults in these functions
mroi
parents: 141
diff changeset
859 printerr("Virtual DVD machine not started.");
e375b765ebf5 some more sanity checking will prevent segfaults in these functions
mroi
parents: 141
diff changeset
860 return -1;
e375b765ebf5 some more sanity checking will prevent segfaults in these functions
mroi
parents: 141
diff changeset
861 }
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
862
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
863 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
864 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
865 pthread_mutex_unlock(&this->vm_lock);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
866
25
df024077cbc1 Why rewrite vm function, use it instead (this remark is for me, of course ;-) ).
f1rmb
parents: 24
diff changeset
867 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
868 return 0xffff;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
869
25
df024077cbc1 Why rewrite vm function, use it instead (this remark is for me, of course ;-) ).
f1rmb
parents: 24
diff changeset
870 return attr.lang_code;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
871 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
872
266
21ba13a7b77a Implement:
jcdutton
parents: 265
diff changeset
873 uint16_t dvdnav_audio_stream_format(dvdnav_t *this, uint8_t stream) {
21ba13a7b77a Implement:
jcdutton
parents: 265
diff changeset
874 audio_attr_t attr;
21ba13a7b77a Implement:
jcdutton
parents: 265
diff changeset
875 uint16_t format;
21ba13a7b77a Implement:
jcdutton
parents: 265
diff changeset
876
21ba13a7b77a Implement:
jcdutton
parents: 265
diff changeset
877 if(!this->started) {
21ba13a7b77a Implement:
jcdutton
parents: 265
diff changeset
878 printerr("Virtual DVD machine not started.");
21ba13a7b77a Implement:
jcdutton
parents: 265
diff changeset
879 return -1; /* 0xffff */
21ba13a7b77a Implement:
jcdutton
parents: 265
diff changeset
880 }
21ba13a7b77a Implement:
jcdutton
parents: 265
diff changeset
881
21ba13a7b77a Implement:
jcdutton
parents: 265
diff changeset
882 pthread_mutex_lock(&this->vm_lock);
21ba13a7b77a Implement:
jcdutton
parents: 265
diff changeset
883 attr = vm_get_audio_attr(this->vm, stream);
21ba13a7b77a Implement:
jcdutton
parents: 265
diff changeset
884 pthread_mutex_unlock(&this->vm_lock);
21ba13a7b77a Implement:
jcdutton
parents: 265
diff changeset
885
21ba13a7b77a Implement:
jcdutton
parents: 265
diff changeset
886 switch(attr.audio_format) {
21ba13a7b77a Implement:
jcdutton
parents: 265
diff changeset
887 case 0:
21ba13a7b77a Implement:
jcdutton
parents: 265
diff changeset
888 format = DVDNAV_FORMAT_AC3;
21ba13a7b77a Implement:
jcdutton
parents: 265
diff changeset
889 break;
21ba13a7b77a Implement:
jcdutton
parents: 265
diff changeset
890 case 2: /* MPEG-1 or MPEG-2 without extension bitstream. */
21ba13a7b77a Implement:
jcdutton
parents: 265
diff changeset
891 case 3: /* MPEG-2 with extension bitstream. */
21ba13a7b77a Implement:
jcdutton
parents: 265
diff changeset
892 format = DVDNAV_FORMAT_MPEGAUDIO;
21ba13a7b77a Implement:
jcdutton
parents: 265
diff changeset
893 break;
21ba13a7b77a Implement:
jcdutton
parents: 265
diff changeset
894 case 4:
21ba13a7b77a Implement:
jcdutton
parents: 265
diff changeset
895 format = DVDNAV_FORMAT_LPCM;
21ba13a7b77a Implement:
jcdutton
parents: 265
diff changeset
896 break;
21ba13a7b77a Implement:
jcdutton
parents: 265
diff changeset
897 case 6:
21ba13a7b77a Implement:
jcdutton
parents: 265
diff changeset
898 format = DVDNAV_FORMAT_DTS;
21ba13a7b77a Implement:
jcdutton
parents: 265
diff changeset
899 break;
21ba13a7b77a Implement:
jcdutton
parents: 265
diff changeset
900 case 7:
21ba13a7b77a Implement:
jcdutton
parents: 265
diff changeset
901 format = DVDNAV_FORMAT_SDDS;
21ba13a7b77a Implement:
jcdutton
parents: 265
diff changeset
902 break;
21ba13a7b77a Implement:
jcdutton
parents: 265
diff changeset
903 default:
21ba13a7b77a Implement:
jcdutton
parents: 265
diff changeset
904 format = 0xffff;
21ba13a7b77a Implement:
jcdutton
parents: 265
diff changeset
905 break;
21ba13a7b77a Implement:
jcdutton
parents: 265
diff changeset
906 }
21ba13a7b77a Implement:
jcdutton
parents: 265
diff changeset
907
21ba13a7b77a Implement:
jcdutton
parents: 265
diff changeset
908 return format;
21ba13a7b77a Implement:
jcdutton
parents: 265
diff changeset
909 }
21ba13a7b77a Implement:
jcdutton
parents: 265
diff changeset
910
272
baec6f29fb76 added dvdnav_audio_stream_channels(); patch by Andreas Oman (andreas olebyn nu)
nicodvb
parents: 269
diff changeset
911 uint16_t dvdnav_audio_stream_channels(dvdnav_t *this, uint8_t stream) {
baec6f29fb76 added dvdnav_audio_stream_channels(); patch by Andreas Oman (andreas olebyn nu)
nicodvb
parents: 269
diff changeset
912 audio_attr_t attr;
baec6f29fb76 added dvdnav_audio_stream_channels(); patch by Andreas Oman (andreas olebyn nu)
nicodvb
parents: 269
diff changeset
913
baec6f29fb76 added dvdnav_audio_stream_channels(); patch by Andreas Oman (andreas olebyn nu)
nicodvb
parents: 269
diff changeset
914 if(!this->started) {
baec6f29fb76 added dvdnav_audio_stream_channels(); patch by Andreas Oman (andreas olebyn nu)
nicodvb
parents: 269
diff changeset
915 printerr("Virtual DVD machine not started.");
baec6f29fb76 added dvdnav_audio_stream_channels(); patch by Andreas Oman (andreas olebyn nu)
nicodvb
parents: 269
diff changeset
916 return -1; /* 0xffff */
baec6f29fb76 added dvdnav_audio_stream_channels(); patch by Andreas Oman (andreas olebyn nu)
nicodvb
parents: 269
diff changeset
917 }
baec6f29fb76 added dvdnav_audio_stream_channels(); patch by Andreas Oman (andreas olebyn nu)
nicodvb
parents: 269
diff changeset
918
baec6f29fb76 added dvdnav_audio_stream_channels(); patch by Andreas Oman (andreas olebyn nu)
nicodvb
parents: 269
diff changeset
919 pthread_mutex_lock(&this->vm_lock);
baec6f29fb76 added dvdnav_audio_stream_channels(); patch by Andreas Oman (andreas olebyn nu)
nicodvb
parents: 269
diff changeset
920 attr = vm_get_audio_attr(this->vm, stream);
baec6f29fb76 added dvdnav_audio_stream_channels(); patch by Andreas Oman (andreas olebyn nu)
nicodvb
parents: 269
diff changeset
921 pthread_mutex_unlock(&this->vm_lock);
baec6f29fb76 added dvdnav_audio_stream_channels(); patch by Andreas Oman (andreas olebyn nu)
nicodvb
parents: 269
diff changeset
922
baec6f29fb76 added dvdnav_audio_stream_channels(); patch by Andreas Oman (andreas olebyn nu)
nicodvb
parents: 269
diff changeset
923 return attr.channels + 1;
baec6f29fb76 added dvdnav_audio_stream_channels(); patch by Andreas Oman (andreas olebyn nu)
nicodvb
parents: 269
diff changeset
924 }
baec6f29fb76 added dvdnav_audio_stream_channels(); patch by Andreas Oman (andreas olebyn nu)
nicodvb
parents: 269
diff changeset
925
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
926 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
927 subp_attr_t attr;
21
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
928
142
e375b765ebf5 some more sanity checking will prevent segfaults in these functions
mroi
parents: 141
diff changeset
929 if(!this->started) {
e375b765ebf5 some more sanity checking will prevent segfaults in these functions
mroi
parents: 141
diff changeset
930 printerr("Virtual DVD machine not started.");
e375b765ebf5 some more sanity checking will prevent segfaults in these functions
mroi
parents: 141
diff changeset
931 return -1;
e375b765ebf5 some more sanity checking will prevent segfaults in these functions
mroi
parents: 141
diff changeset
932 }
21
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
933
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
934 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
935 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
936 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
937
25
df024077cbc1 Why rewrite vm function, use it instead (this remark is for me, of course ;-) ).
f1rmb
parents: 24
diff changeset
938 if(attr.type != 1)
21
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
939 return 0xffff;
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
940
25
df024077cbc1 Why rewrite vm function, use it instead (this remark is for me, of course ;-) ).
f1rmb
parents: 24
diff changeset
941 return attr.lang_code;
21
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
942 }
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
943
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
944 int8_t dvdnav_get_audio_logical_stream(dvdnav_t *this, uint8_t audio_num) {
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
945 int8_t retval;
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
946
142
e375b765ebf5 some more sanity checking will prevent segfaults in these functions
mroi
parents: 141
diff changeset
947 if(!this->started) {
e375b765ebf5 some more sanity checking will prevent segfaults in these functions
mroi
parents: 141
diff changeset
948 printerr("Virtual DVD machine not started.");
e375b765ebf5 some more sanity checking will prevent segfaults in these functions
mroi
parents: 141
diff changeset
949 return -1;
e375b765ebf5 some more sanity checking will prevent segfaults in these functions
mroi
parents: 141
diff changeset
950 }
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
951
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
952 pthread_mutex_lock(&this->vm_lock);
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
953 if (!this->vm->state.pgc) {
142
e375b765ebf5 some more sanity checking will prevent segfaults in these functions
mroi
parents: 141
diff changeset
954 printerr("No current PGC.");
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
955 pthread_mutex_unlock(&this->vm_lock);
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
956 return -1;
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
957 }
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
958 retval = vm_get_audio_stream(this->vm, audio_num);
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
959 pthread_mutex_unlock(&this->vm_lock);
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
960
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
961 return retval;
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
962 }
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
963
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
964 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
965 int8_t retval;
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
966
142
e375b765ebf5 some more sanity checking will prevent segfaults in these functions
mroi
parents: 141
diff changeset
967 if(!this->started) {
e375b765ebf5 some more sanity checking will prevent segfaults in these functions
mroi
parents: 141
diff changeset
968 printerr("Virtual DVD machine not started.");
e375b765ebf5 some more sanity checking will prevent segfaults in these functions
mroi
parents: 141
diff changeset
969 return -1;
e375b765ebf5 some more sanity checking will prevent segfaults in these functions
mroi
parents: 141
diff changeset
970 }
21
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
971
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
972 pthread_mutex_lock(&this->vm_lock);
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
973 if (!this->vm->state.pgc) {
142
e375b765ebf5 some more sanity checking will prevent segfaults in these functions
mroi
parents: 141
diff changeset
974 printerr("No current PGC.");
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
975 pthread_mutex_unlock(&this->vm_lock);
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
976 return -1;
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
977 }
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
978 retval = vm_get_subp_stream(this->vm, subp_num, 0);
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
979 pthread_mutex_unlock(&this->vm_lock);
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
980
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
981 return retval;
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
982 }
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
983
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
984 int8_t dvdnav_get_active_audio_stream(dvdnav_t *this) {
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
985 int8_t retval;
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
986
142
e375b765ebf5 some more sanity checking will prevent segfaults in these functions
mroi
parents: 141
diff changeset
987 if(!this->started) {
e375b765ebf5 some more sanity checking will prevent segfaults in these functions
mroi
parents: 141
diff changeset
988 printerr("Virtual DVD machine not started.");
e375b765ebf5 some more sanity checking will prevent segfaults in these functions
mroi
parents: 141
diff changeset
989 return -1;
e375b765ebf5 some more sanity checking will prevent segfaults in these functions
mroi
parents: 141
diff changeset
990 }
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
991
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
992 pthread_mutex_lock(&this->vm_lock);
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
993 if (!this->vm->state.pgc) {
142
e375b765ebf5 some more sanity checking will prevent segfaults in these functions
mroi
parents: 141
diff changeset
994 printerr("No current PGC.");
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
995 pthread_mutex_unlock(&this->vm_lock);
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
996 return -1;
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
997 }
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
998 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
999 pthread_mutex_unlock(&this->vm_lock);
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
1000
21
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
1001 return retval;
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
1002 }
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
1003
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
1004 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
1005 int8_t retval;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1006
142
e375b765ebf5 some more sanity checking will prevent segfaults in these functions
mroi
parents: 141
diff changeset
1007 if(!this->started) {
e375b765ebf5 some more sanity checking will prevent segfaults in these functions
mroi
parents: 141
diff changeset
1008 printerr("Virtual DVD machine not started.");
e375b765ebf5 some more sanity checking will prevent segfaults in these functions
mroi
parents: 141
diff changeset
1009 return -1;
e375b765ebf5 some more sanity checking will prevent segfaults in these functions
mroi
parents: 141
diff changeset
1010 }
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1011
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
1012 pthread_mutex_lock(&this->vm_lock);
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
1013 if (!this->vm->state.pgc) {
142
e375b765ebf5 some more sanity checking will prevent segfaults in these functions
mroi
parents: 141
diff changeset
1014 printerr("No current PGC.");
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
1015 pthread_mutex_unlock(&this->vm_lock);
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
1016 return -1;
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
1017 }
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
1018 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
1019 pthread_mutex_unlock(&this->vm_lock);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1020
21
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
1021 return retval;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1022 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1023
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
1024 static int8_t dvdnav_is_domain(dvdnav_t *this, domain_t domain) {
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
1025 int8_t retval;
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
1026
142
e375b765ebf5 some more sanity checking will prevent segfaults in these functions
mroi
parents: 141
diff changeset
1027 if(!this->started) {
e375b765ebf5 some more sanity checking will prevent segfaults in these functions
mroi
parents: 141
diff changeset
1028 printerr("Virtual DVD machine not started.");
e375b765ebf5 some more sanity checking will prevent segfaults in these functions
mroi
parents: 141
diff changeset
1029 return -1;
e375b765ebf5 some more sanity checking will prevent segfaults in these functions
mroi
parents: 141
diff changeset
1030 }
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
1031
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
1032 pthread_mutex_lock(&this->vm_lock);
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
1033 retval = (this->vm->state.domain == domain);
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
1034 pthread_mutex_unlock(&this->vm_lock);
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
1035
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
1036 return retval;
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
1037 }
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
1038
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1039 /* First Play domain. (Menu) */
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
1040 int8_t dvdnav_is_domain_fp(dvdnav_t *this) {
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
1041 return dvdnav_is_domain(this, FP_DOMAIN);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1042 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1043 /* Video management Menu domain. (Menu) */
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
1044 int8_t dvdnav_is_domain_vmgm(dvdnav_t *this) {
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
1045 return dvdnav_is_domain(this, VMGM_DOMAIN);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1046 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1047 /* Video Title Menu domain (Menu) */
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
1048 int8_t dvdnav_is_domain_vtsm(dvdnav_t *this) {
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
1049 return dvdnav_is_domain(this, VTSM_DOMAIN);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1050 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1051 /* Video Title domain (playing movie). */
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
1052 int8_t dvdnav_is_domain_vts(dvdnav_t *this) {
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
1053 return dvdnav_is_domain(this, VTS_DOMAIN);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1054 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1055
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
1056 /* Generally delegate angle information handling to VM */
195
6b1bfe8f5283 Start some cleanups.
jcdutton
parents: 194
diff changeset
1057 dvdnav_status_t dvdnav_angle_change(dvdnav_t *this, int32_t angle) {
6b1bfe8f5283 Start some cleanups.
jcdutton
parents: 194
diff changeset
1058 int32_t num, current;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1059
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
1060 pthread_mutex_lock(&this->vm_lock);
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
1061 vm_get_angle_info(this->vm, &current, &num);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1062 /* Set angle SPRM if valid */
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1063 if((angle > 0) && (angle <= num)) {
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
1064 this->vm->state.AGL_REG = angle;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1065 } else {
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
1066 printerr("Passed an invalid angle number.");
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
1067 pthread_mutex_unlock(&this->vm_lock);
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 191
diff changeset
1068 return DVDNAV_STATUS_ERR;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1069 }
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
1070 pthread_mutex_unlock(&this->vm_lock);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1071
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 191
diff changeset
1072 return DVDNAV_STATUS_OK;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1073 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1074
195
6b1bfe8f5283 Start some cleanups.
jcdutton
parents: 194
diff changeset
1075 dvdnav_status_t dvdnav_get_angle_info(dvdnav_t *this, int32_t *current_angle,
6b1bfe8f5283 Start some cleanups.
jcdutton
parents: 194
diff changeset
1076 int32_t *number_of_angles) {
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
1077 pthread_mutex_lock(&this->vm_lock);
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
1078 vm_get_angle_info(this->vm, current_angle, number_of_angles);
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
1079 pthread_mutex_unlock(&this->vm_lock);
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
1080
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 191
diff changeset
1081 return DVDNAV_STATUS_OK;
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
1082 }
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1083
67
61c0ee1bbb7a Moved get_current_nav_pci into dvdnac.c, changed example to use it instead of 'home-rolled'
richwareham
parents: 66
diff changeset
1084 pci_t* dvdnav_get_current_nav_pci(dvdnav_t *this) {
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
1085 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
1086 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
1087 }
61c0ee1bbb7a Moved get_current_nav_pci into dvdnac.c, changed example to use it instead of 'home-rolled'
richwareham
parents: 66
diff changeset
1088
66
2bd4a78eefce Patch from aschultz@cs.uni-magdeburg.de to allow for still-frame 'peek-ahead'
richwareham
parents: 60
diff changeset
1089 dsi_t* dvdnav_get_current_nav_dsi(dvdnav_t *this) {
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
1090 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
1091 return &this->dsi;
2bd4a78eefce Patch from aschultz@cs.uni-magdeburg.de to allow for still-frame 'peek-ahead'
richwareham
parents: 60
diff changeset
1092 }
2bd4a78eefce Patch from aschultz@cs.uni-magdeburg.de to allow for still-frame 'peek-ahead'
richwareham
parents: 60
diff changeset
1093
2bd4a78eefce Patch from aschultz@cs.uni-magdeburg.de to allow for still-frame 'peek-ahead'
richwareham
parents: 60
diff changeset
1094 uint32_t dvdnav_get_next_still_flag(dvdnav_t *this) {
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 106
diff changeset
1095 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
1096 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
1097 }
2bd4a78eefce Patch from aschultz@cs.uni-magdeburg.de to allow for still-frame 'peek-ahead'
richwareham
parents: 60
diff changeset
1098
262
7708d2fc1745 added dvdnav_get_restrictions()
mrouthier
parents: 256
diff changeset
1099 user_ops_t dvdnav_get_restrictions(dvdnav_t* this) {
7708d2fc1745 added dvdnav_get_restrictions()
mrouthier
parents: 256
diff changeset
1100 /*
7708d2fc1745 added dvdnav_get_restrictions()
mrouthier
parents: 256
diff changeset
1101 * user_ops_t is a structure of 32 bits. We want to compute
7708d2fc1745 added dvdnav_get_restrictions()
mrouthier
parents: 256
diff changeset
1102 * the union of two of those bitfields so to make this quicker
7708d2fc1745 added dvdnav_get_restrictions()
mrouthier
parents: 256
diff changeset
1103 * than performing 32 ORs, we will access them as 32bits words.
7708d2fc1745 added dvdnav_get_restrictions()
mrouthier
parents: 256
diff changeset
1104 */
264
8c86b61eb06f fix compiler warnings related to aliasing violations
mroi
parents: 263
diff changeset
1105 union {
8c86b61eb06f fix compiler warnings related to aliasing violations
mroi
parents: 263
diff changeset
1106 user_ops_t ops_struct;
8c86b61eb06f fix compiler warnings related to aliasing violations
mroi
parents: 263
diff changeset
1107 uint32_t ops_int;
8c86b61eb06f fix compiler warnings related to aliasing violations
mroi
parents: 263
diff changeset
1108 } ops;
8c86b61eb06f fix compiler warnings related to aliasing violations
mroi
parents: 263
diff changeset
1109
8c86b61eb06f fix compiler warnings related to aliasing violations
mroi
parents: 263
diff changeset
1110 ops.ops_int = 0;
262
7708d2fc1745 added dvdnav_get_restrictions()
mrouthier
parents: 256
diff changeset
1111
263
d999338cab17 prevent races
mroi
parents: 262
diff changeset
1112 if(!this->started) {
d999338cab17 prevent races
mroi
parents: 262
diff changeset
1113 printerr("Virtual DVD machine not started.");
264
8c86b61eb06f fix compiler warnings related to aliasing violations
mroi
parents: 263
diff changeset
1114 return ops.ops_struct;
263
d999338cab17 prevent races
mroi
parents: 262
diff changeset
1115 }
d999338cab17 prevent races
mroi
parents: 262
diff changeset
1116
d999338cab17 prevent races
mroi
parents: 262
diff changeset
1117 pthread_mutex_lock(&this->vm_lock);
264
8c86b61eb06f fix compiler warnings related to aliasing violations
mroi
parents: 263
diff changeset
1118 ops.ops_int |= *(uint32_t*)&this->pci.pci_gi.vobu_uop_ctl;
262
7708d2fc1745 added dvdnav_get_restrictions()
mrouthier
parents: 256
diff changeset
1119
7708d2fc1745 added dvdnav_get_restrictions()
mrouthier
parents: 256
diff changeset
1120 if(this->vm && this->vm->state.pgc)
264
8c86b61eb06f fix compiler warnings related to aliasing violations
mroi
parents: 263
diff changeset
1121 ops.ops_int |= *(uint32_t*)&this->vm->state.pgc->prohibited_ops;
263
d999338cab17 prevent races
mroi
parents: 262
diff changeset
1122 pthread_mutex_unlock(&this->vm_lock);
262
7708d2fc1745 added dvdnav_get_restrictions()
mrouthier
parents: 256
diff changeset
1123
264
8c86b61eb06f fix compiler warnings related to aliasing violations
mroi
parents: 263
diff changeset
1124 return ops.ops_struct;
262
7708d2fc1745 added dvdnav_get_restrictions()
mrouthier
parents: 256
diff changeset
1125 }