annotate dvdnav.c @ 274:12beff7f4482 src

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