annotate dvdnav.c @ 28:da60d6379f95 src

Add some comments, FIXMEs. The main point being that dvdnav_get_next_block is almost in a state where it can be optional whether the application programmer uses it, or implements their own version of the function. That is been the main reason for the re-write of this function recently.
author jcdutton
date Tue, 23 Apr 2002 13:26:08 +0000
parents 794d2e16a4d4
children 630b6733e492
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
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
28 #include <pthread.h>
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
29 #include <dvdnav.h>
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
30 #include "dvdnav_internal.h"
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
31 #include "read_cache.h"
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
32
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
33 #include <dvdread/nav_read.h>
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
34
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
35 #include <stdlib.h>
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
36 #include <stdio.h>
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
37
21
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
38 /*
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
39 * NOTE:
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
40 * All NLCK_*() function are not mutex locked, this made them reusable in
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
41 * a locked context. Take care.
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
42 *
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
43 */
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
44
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
45 /* Current domain (backend to dvdnav_is_domain_() funcs) */
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
46 static int8_t NLCK_dvdnav_is_domain(dvdnav_t *this, domain_t domain) {
21
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
47 dvd_state_t *state;
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
48
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
49 if((!this) || (!this->started) || (!this->vm))
21
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
50 return -1;
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
51
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
52 state = &(this->vm->state);
21
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
53
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
54 if(!state)
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
55 return -1;
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
56
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
57 return (state->domain == domain) ? 1 : 0;
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
58 }
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
59
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
60 static int8_t _dvdnav_is_domain(dvdnav_t *this, domain_t domain) {
21
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
61 int8_t retval;
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
62
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
63 pthread_mutex_lock(&this->vm_lock);
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
64 retval = NLCK_dvdnav_is_domain(this, domain);
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
65 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
66
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
67 return retval;
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
68 }
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
69
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
70 static int8_t NCLK_dvdnav_get_audio_logical_stream(dvdnav_t *this, uint8_t audio_num) {
21
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
71 dvd_state_t *state;
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
72 int8_t logical = -1;
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
73
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
74 if(!NLCK_dvdnav_is_domain(this, VTS_DOMAIN))
21
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
75 audio_num = 0;
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
76
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
77 state = &(this->vm->state);
21
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
78
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
79 if(audio_num < 8) {
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
80 if(state->pgc->audio_control[audio_num] & (1 << 15)) {
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
81 logical = (state->pgc->audio_control[audio_num] >> 8) & 0x07;
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
82 }
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
83 }
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
84
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
85 return logical;
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
86 }
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
87
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
88 static int8_t NCLK_dvdnav_get_spu_logical_stream(dvdnav_t *this, uint8_t subp_num) {
25
df024077cbc1 Why rewrite vm function, use it instead (this remark is for me, of course ;-) ).
f1rmb
parents: 24
diff changeset
89 dvd_state_t *state;
df024077cbc1 Why rewrite vm function, use it instead (this remark is for me, of course ;-) ).
f1rmb
parents: 24
diff changeset
90 ifo_handle_t *vtsi;
21
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
91
25
df024077cbc1 Why rewrite vm function, use it instead (this remark is for me, of course ;-) ).
f1rmb
parents: 24
diff changeset
92 if(!this)
df024077cbc1 Why rewrite vm function, use it instead (this remark is for me, of course ;-) ).
f1rmb
parents: 24
diff changeset
93 return -1;
21
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
94
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
95 state = &(this->vm->state);
25
df024077cbc1 Why rewrite vm function, use it instead (this remark is for me, of course ;-) ).
f1rmb
parents: 24
diff changeset
96 vtsi = this->vm->vtsi;
21
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
97
25
df024077cbc1 Why rewrite vm function, use it instead (this remark is for me, of course ;-) ).
f1rmb
parents: 24
diff changeset
98 if(subp_num >= vtsi->vtsi_mat->nr_of_vts_subp_streams)
df024077cbc1 Why rewrite vm function, use it instead (this remark is for me, of course ;-) ).
f1rmb
parents: 24
diff changeset
99 return -1;
21
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
100
25
df024077cbc1 Why rewrite vm function, use it instead (this remark is for me, of course ;-) ).
f1rmb
parents: 24
diff changeset
101 return vm_get_subp_stream(this->vm, subp_num);
21
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
102 }
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
103
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
104 static int8_t NLCK_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
105 dvd_state_t *state;
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
106 int8_t subp_num;
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
107 int stream_num;
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
108
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
109 state = &(this->vm->state);
21
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
110 subp_num = state->SPST_REG & ~0x40;
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
111 stream_num = NCLK_dvdnav_get_spu_logical_stream(this, subp_num);
21
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
112
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
113 if(stream_num == -1)
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
114 for(subp_num = 0; subp_num < 32; subp_num++)
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
115 if(state->pgc->subp_control[subp_num] & (1 << 31)) {
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
116 stream_num = NCLK_dvdnav_get_spu_logical_stream(this, subp_num);
21
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
117 break;
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
118 }
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
119
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
120 return stream_num;
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
121 }
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
122
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
123 uint8_t dvdnav_get_video_aspect(dvdnav_t *this) {
21
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
124 uint8_t retval;
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
125
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
126 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
127 retval = (uint8_t) vm_get_video_aspect(this->vm);
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
128 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
129
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
130 return retval;
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
131 }
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
132
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
133 dvdnav_status_t dvdnav_clear(dvdnav_t * this) {
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
134 if (!this) {
4
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
135 printerr("Passed a NULL pointer");
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
136 return S_ERR;
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
137 }
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
138 /* clear everything except path, file, vm, mutex, readahead */
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
139
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
140 // path
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
141 if (this->file) DVDCloseFile(this->file);
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
142 this->file = NULL;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
143 this->open_vtsN = -1;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
144 this->open_domain = -1;
4
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
145
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
146 memset(&this->pci,0,sizeof(this->pci));
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
147 memset(&this->dsi,0,sizeof(this->dsi));
4
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
148
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
149 /* Set initial values of flags */
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
150 this->position_current.still = 0;
23
c2d40c38e12f Name stills work better.
jcdutton
parents: 22
diff changeset
151 this->skip_still = 0;
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
152 this->stop = 0;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
153 this->spu_clut_changed = 0;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
154 this->started=0;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
155 // this->use_read_ahead
4
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
156
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
157 this->hli_state=0;
4
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
158
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
159 this->cache_start_sector = -1;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
160 this->cache_block_count = 0;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
161 this->cache_valid = 0;
4
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
162
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
163 return S_OK;
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
164 }
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
165
17
a68c6da98b73 Actually fix the const this time!
jcdutton
parents: 8
diff changeset
166 dvdnav_status_t dvdnav_open(dvdnav_t** dest, char *path) {
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
167 dvdnav_t *this;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
168
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
169 /* Create a new structure */
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
170 (*dest) = NULL;
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
171 this = (dvdnav_t*)malloc(sizeof(dvdnav_t));
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
172 if(!this)
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
173 return S_ERR;
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
174 memset(this, 0, (sizeof(dvdnav_t) ) ); /* Make sure this structure is clean */
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
175
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
176 pthread_mutex_init(&this->vm_lock, NULL);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
177 /* Initialise the error string */
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
178 printerr("");
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
179
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
180 /* Initialise the VM */
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
181 this->vm = vm_new_vm();
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
182 if(!this->vm) {
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
183 printerr("Error initialising the DVD VM");
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
184 return S_ERR;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
185 }
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
186 if(vm_reset(this->vm, path) == -1) {
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
187 printerr("Error starting the VM / opening the DVD device");
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
188 return S_ERR;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
189 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
190
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
191 /* 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
192 strncpy(this->path, path, MAX_PATH_LEN);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
193
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
194 dvdnav_clear(this);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
195
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
196 /* 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
197 this->file = DVDOpenFile(vm_get_dvd_reader(this->vm), 0, DVD_READ_MENU_VOBS);
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
198 if (this->file) DVDCloseFile(this->file);
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
199 this->file = NULL;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
200
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
201 if(!this->started) {
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
202 /* Start the VM */
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
203 vm_start(this->vm);
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
204 this->started = 1;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
205 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
206
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
207 (*dest) = this;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
208 return S_OK;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
209 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
210
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
211 dvdnav_status_t dvdnav_close(dvdnav_t *this) {
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
212 if(!this) {
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
213 printerr("Passed a NULL pointer");
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
214 return S_ERR;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
215 }
3
328eadb3f37e Added initial example programs directory and make sure all debug/error output goes to stderr.
richwareham
parents: 0
diff changeset
216 fprintf(stderr,"dvdnav:close:called\n");
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
217 if (this->file) {
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
218 DVDCloseFile(this->file);
3
328eadb3f37e Added initial example programs directory and make sure all debug/error output goes to stderr.
richwareham
parents: 0
diff changeset
219 fprintf(stderr,"dvdnav:close:file closing\n");
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
220 this->file = NULL;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
221 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
222
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
223 /* Free the VM */
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
224 if(this->vm) {
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
225 vm_free_vm(this->vm);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
226 }
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
227 if (this->file) {
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
228 DVDCloseFile(this->file);
3
328eadb3f37e Added initial example programs directory and make sure all debug/error output goes to stderr.
richwareham
parents: 0
diff changeset
229 fprintf(stderr,"dvdnav:close2:file closing\n");
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
230 this->file = NULL;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
231 }
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
232 pthread_mutex_destroy(&this->vm_lock);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
233 /* Finally free the entire structure */
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
234 free(this);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
235
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
236 return S_OK;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
237 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
238
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
239 dvdnav_status_t dvdnav_reset(dvdnav_t *this) {
4
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
240 dvdnav_status_t result;
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
241
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
242 printf("dvdnav:reset:called\n");
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
243 if(!this) {
4
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
244 printerr("Passed a NULL pointer");
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
245 return S_ERR;
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
246 }
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
247 printf("getting lock\n");
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
248 pthread_mutex_lock(&this->vm_lock);
4
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
249 printf("reseting vm\n");
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
250 if(vm_reset(this->vm, NULL) == -1) {
4
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
251 printerr("Error restarting the VM");
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
252 pthread_mutex_unlock(&this->vm_lock);
4
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
253 return S_ERR;
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
254 }
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
255 printf("clearing dvdnav\n");
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
256 result=dvdnav_clear(this);
4
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
257 printf("starting vm\n");
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
258 if(!this->started) {
4
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
259 /* Start the VM */
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
260 vm_start(this->vm);
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
261 this->started = 1;
4
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
262 }
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
263 printf("unlocking\n");
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
264 pthread_mutex_unlock(&this->vm_lock);
4
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
265 return result;
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
266 }
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
267
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
268 dvdnav_status_t dvdnav_path(dvdnav_t *this, char** path) {
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
269 if(!this || !path || !(*path)) {
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
270 return S_ERR;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
271 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
272
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
273 /* FIXME: Is shallow copy 'right'? */
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
274 (*path) = this->path;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
275
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
276 return S_OK;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
277 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
278
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
279 char* dvdnav_err_to_string(dvdnav_t *this) {
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
280 if(!this) {
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
281 /* Shold this be "passed a NULL pointer?" */
3
328eadb3f37e Added initial example programs directory and make sure all debug/error output goes to stderr.
richwareham
parents: 0
diff changeset
282 return "Hey! You gave me a NULL pointer you naughty person!";
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
283 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
284
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
285 return this->err_str;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
286 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
287
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
288 /**
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
289 * Returns 1 if block contains NAV packet, 0 otherwise.
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
290 * Precesses said NAV packet if present.
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
291 *
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
292 * Most of the code in here is copied from xine's MPEG demuxer
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
293 * so any bugs which are found in that should be corrected here also.
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
294 */
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
295 int dvdnav_decode_packet(dvdnav_t *this, uint8_t *p, dsi_t* nav_dsi, pci_t* nav_pci) {
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
296 int bMpeg1=0;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
297 uint32_t nHeaderLen;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
298 uint32_t nPacketLen;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
299 uint32_t nStreamID;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
300 /* uint8_t *p_start=p; */
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
301
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
302
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
303 if (p==NULL) {
3
328eadb3f37e Added initial example programs directory and make sure all debug/error output goes to stderr.
richwareham
parents: 0
diff changeset
304 fprintf(stderr,"Passed a NULL pointer.\n");
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
305 return 0;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
306 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
307
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
308 /* dprint("Checking packet...\n"); */
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
309
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
310 if (p[3] == 0xBA) { /* program stream pack header */
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
311
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
312 int nStuffingBytes;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
313
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
314 /* xprintf (VERBOSE|DEMUX, "program stream pack header\n"); */
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
315
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
316 bMpeg1 = (p[4] & 0x40) == 0;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
317
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
318 if (bMpeg1) {
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
319 p += 12;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
320 } else { /* mpeg2 */
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
321 nStuffingBytes = p[0xD] & 0x07;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
322 p += 14 + nStuffingBytes;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
323 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
324 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
325
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
326
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
327 if (p[3] == 0xbb) { /* program stream system header */
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
328 int nHeaderLen;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
329
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
330 nHeaderLen = (p[4] << 8) | p[5];
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
331 p += 6 + nHeaderLen;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
332 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
333
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
334 /* we should now have a PES packet here */
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
335
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
336 if (p[0] || p[1] || (p[2] != 1)) {
3
328eadb3f37e Added initial example programs directory and make sure all debug/error output goes to stderr.
richwareham
parents: 0
diff changeset
337 fprintf(stderr,"demux error! %02x %02x %02x (should be 0x000001) \n",p[0],p[1],p[2]);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
338 return 0;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
339 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
340
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
341 nPacketLen = p[4] << 8 | p[5];
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
342 nStreamID = p[3];
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
343
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
344 nHeaderLen = 6;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
345 p += nHeaderLen;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
346
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
347 if (nStreamID == 0xbf) { /* Private stream 2 */
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
348 /*
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
349 * int i;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
350 * printf("dvdnav:nav packet=%u\n",p-p_start-6);
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
351 * for(i=0;i<80;i++) {
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
352 * printf("%02x ",p[i-6]);
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
353 * }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
354 * printf("\n");
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
355 */
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
356 if(p[0] == 0x00) {
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
357 #ifdef HAVE_DVDREAD9
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
358 navRead_PCI(nav_pci, p+1);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
359 #else
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
360 navRead_PCI(nav_pci, p+1, nPacketLen - 1);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
361 #endif
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
362 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
363
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
364 p += nPacketLen;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
365
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
366 /* We should now have a DSI packet. */
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
367 if(p[6] == 0x01) {
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
368 nPacketLen = p[4] << 8 | p[5];
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
369 p += 6;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
370 /* dprint("NAV DSI packet\n"); */
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
371 #ifdef HAVE_DVDREAD9
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
372 navRead_DSI(nav_dsi, p+1);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
373 #else
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
374 navRead_DSI(nav_dsi, p+1, sizeof(dsi_t));
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
375 #endif
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
376 }
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
377 return 1;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
378 }
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
379 return 0;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
380 }
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
381 /* Some angle suff */
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
382 // dvdnav_get_angle_info(this, &current, &num);
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
383 // if(num == 1) {
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
384 /* This is to switch back to angle one when we
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
385 * finish */
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
386 // dvdnav_angle_change(this, 1);
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
387 // }
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
388 /* DSI is used for most angle stuff.
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
389 * 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
390 */
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
391 int dvdnav_get_vobu(dsi_t* nav_dsi, pci_t* nav_pci, int angle, dvdnav_vobu_t* vobu) {
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
392 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
393 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
394
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
395 /**
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
396 * 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
397 * 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
398 * 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
399 * 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
400 * really happy.
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
401 *
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
402 * 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
403 * 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
404 * Should really assert if bit 31 != 1
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
405 */
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
406 /* Relative offset from vobu_start */
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
407 vobu->vobu_next = ( nav_dsi->vobu_sri.next_vobu & 0x3fffffff );
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
408
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
409 if(angle != 0) {
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
410 /* FIXME: Angles need checking */
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
411 uint32_t next = nav_pci->nsml_agli.nsml_agl_dsta[angle-1];
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
412
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
413 if(next != 0) {
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
414 if(next & 0x80000000) {
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
415 vobu->vobu_next = - (next & 0x3fffffff);
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
416 } else {
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
417 vobu->vobu_next = + (next & 0x3fffffff);
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
418 }
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
419
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
420 } else if( nav_dsi->sml_agli.data[angle-1].address != 0 ) {
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
421 next = nav_dsi->sml_agli.data[angle-1].address;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
422 vobu->vobu_length = nav_dsi->sml_pbi.ilvu_ea;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
423
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
424 if((next & 0x80000000) && (next != 0x7fffffff)) {
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
425 vobu->vobu_next = - (next & 0x3fffffff);
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
426 } else {
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
427 vobu->vobu_next = + (next & 0x3fffffff);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
428 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
429 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
430 }
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
431 return 1;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
432 }
28
da60d6379f95 Add some comments, FIXMEs.
jcdutton
parents: 26
diff changeset
433 /* This is the main get_next_block function which actually gets the media stream video and audio etc.
da60d6379f95 Add some comments, FIXMEs.
jcdutton
parents: 26
diff changeset
434 * The use of this function is optional, with the application programmer
da60d6379f95 Add some comments, FIXMEs.
jcdutton
parents: 26
diff changeset
435 * free to implement their own version of this function
da60d6379f95 Add some comments, FIXMEs.
jcdutton
parents: 26
diff changeset
436 * FIXME: Make the function calls from here public API calls.
da60d6379f95 Add some comments, FIXMEs.
jcdutton
parents: 26
diff changeset
437 */
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
438 dvdnav_status_t dvdnav_get_next_block(dvdnav_t *this, unsigned char *buf,
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
439 int *event, int *len) {
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
440 dvd_state_t *state;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
441 int result;
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
442 if(!this || !event || !len || !buf) {
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
443 printerr("Passed a NULL pointer");
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
444 return S_ERR;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
445 }
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
446 pthread_mutex_lock(&this->vm_lock);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
447
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
448 if(!this->started) {
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
449 /* Start the VM */
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
450 vm_start(this->vm);
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
451 this->started = 1;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
452 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
453
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
454 state = &(this->vm->state);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
455 (*event) = DVDNAV_NOP;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
456 (*len) = 0;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
457
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
458 /* Check the STOP flag */
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
459 if(this->stop) {
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
460 (*event) = DVDNAV_STOP;
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
461 pthread_mutex_unlock(&this->vm_lock);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
462 return S_OK;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
463 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
464
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
465 /* Check the STILLFRAME flag */
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
466 //FIXME: Still cell, not still frame
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
467 if(this->position_current.still != 0) {
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
468 dvdnav_still_event_t still_event;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
469
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
470 still_event.length = this->position_current.still;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
471
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
472 (*event) = DVDNAV_STILL_FRAME;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
473 (*len) = sizeof(dvdnav_still_event_t);
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
474 memcpy(buf, &(still_event), sizeof(dvdnav_still_event_t));
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
475
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
476 pthread_mutex_unlock(&this->vm_lock);
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
477 return S_OK;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
478 }
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
479
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
480 vm_position_get(this->vm,&this->position_next);
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
481 /**********
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
482 fprintf(stderr, "POS-NEXT ");
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
483 vm_position_print(this->vm, &this->position_next);
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
484 fprintf(stderr, "POS-CUR ");
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
485 vm_position_print(this->vm, &this->position_current);
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
486 **********/
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
487
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
488 if(this->position_current.hop_channel != this->position_next.hop_channel) {
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
489 this->position_current.hop_channel = this->position_next.hop_channel;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
490 (*event) = DVDNAV_HOP_CHANNEL;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
491 (*len) = 0;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
492 pthread_mutex_unlock(&this->vm_lock);
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
493 return S_OK;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
494 }
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
495
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
496
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
497
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
498 if(this->spu_clut_changed) {
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
499 (*event) = DVDNAV_SPU_CLUT_CHANGE;
3
328eadb3f37e Added initial example programs directory and make sure all debug/error output goes to stderr.
richwareham
parents: 0
diff changeset
500 fprintf(stderr,"libdvdnav:SPU_CLUT_CHANGE\n");
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
501 (*len) = sizeof(dvdnav_still_event_t);
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
502 memcpy(buf, &(state->pgc->palette), 16 * sizeof(uint32_t));
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
503 this->spu_clut_changed = 0;
3
328eadb3f37e Added initial example programs directory and make sure all debug/error output goes to stderr.
richwareham
parents: 0
diff changeset
504 fprintf(stderr,"libdvdnav:SPU_CLUT_CHANGE returning S_OK\n");
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
505 pthread_mutex_unlock(&this->vm_lock);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
506 return S_OK;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
507 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
508
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
509 if(this->position_current.spu_channel != this->position_next.spu_channel) {
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
510 dvdnav_stream_change_event_t stream_change;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
511 (*event) = DVDNAV_SPU_STREAM_CHANGE;
3
328eadb3f37e Added initial example programs directory and make sure all debug/error output goes to stderr.
richwareham
parents: 0
diff changeset
512 fprintf(stderr,"libdvdnav:SPU_STREAM_CHANGE\n");
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
513 (*len) = sizeof(dvdnav_stream_change_event_t);
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
514 stream_change.physical = vm_get_subp_active_stream( this->vm );
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
515 memcpy(buf, &(stream_change), sizeof( dvdnav_stream_change_event_t));
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
516 //this->spu_stream_changed = 0;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
517 this->position_current.spu_channel = this->position_next.spu_channel;
3
328eadb3f37e Added initial example programs directory and make sure all debug/error output goes to stderr.
richwareham
parents: 0
diff changeset
518 fprintf(stderr,"libdvdnav:SPU_STREAM_CHANGE stream_id=%d returning S_OK\n",stream_change.physical);
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
519 pthread_mutex_unlock(&this->vm_lock);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
520 return S_OK;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
521 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
522
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
523 //if(this->audio_stream_changed) {
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
524 if(this->position_current.audio_channel != this->position_next.audio_channel) {
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
525 dvdnav_stream_change_event_t stream_change;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
526 (*event) = DVDNAV_AUDIO_STREAM_CHANGE;
3
328eadb3f37e Added initial example programs directory and make sure all debug/error output goes to stderr.
richwareham
parents: 0
diff changeset
527 fprintf(stderr,"libdvdnav:AUDIO_STREAM_CHANGE\n");
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
528 (*len) = sizeof(dvdnav_stream_change_event_t);
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
529 stream_change.physical= vm_get_audio_active_stream( this->vm );
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
530 memcpy(buf, &(stream_change), sizeof( dvdnav_stream_change_event_t));
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
531 //this->audio_stream_changed = 0;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
532 this->position_current.audio_channel = this->position_next.audio_channel;
3
328eadb3f37e Added initial example programs directory and make sure all debug/error output goes to stderr.
richwareham
parents: 0
diff changeset
533 fprintf(stderr,"libdvdnav:AUDIO_STREAM_CHANGE stream_id=%d returning S_OK\n",stream_change.physical);
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
534 pthread_mutex_unlock(&this->vm_lock);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
535 return S_OK;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
536 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
537
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
538 /* Check the HIGHLIGHT flag */
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
539 /* FIXME: Use BUTTON instead of HIGHLIGHT. */
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
540 //if(this->highlight_changed) {
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
541 if(this->position_current.button != this->position_next.button) {
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
542 // if (0) {
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
543 dvdnav_highlight_event_t hevent;
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
544 dvdnav_highlight_area_t highlight;
23
c2d40c38e12f Name stills work better.
jcdutton
parents: 22
diff changeset
545 dvdnav_status_t status;
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
546
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
547
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
548 /* Fill in highlight struct with appropriate values */
23
c2d40c38e12f Name stills work better.
jcdutton
parents: 22
diff changeset
549 if(this->hli_state != 0) {
c2d40c38e12f Name stills work better.
jcdutton
parents: 22
diff changeset
550 // if (1) {
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
551 hevent.display = 1;
23
c2d40c38e12f Name stills work better.
jcdutton
parents: 22
diff changeset
552 status = dvdnav_get_highlight_area(&this->pci , this->position_next.button, 0,
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
553 &highlight);
23
c2d40c38e12f Name stills work better.
jcdutton
parents: 22
diff changeset
554
c2d40c38e12f Name stills work better.
jcdutton
parents: 22
diff changeset
555 fprintf(stderr,"libdvdnav:read_block_loop: button area status = %d\n", status);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
556 /* Copy current button bounding box. */
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
557 hevent.sx = highlight.sx;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
558 hevent.sy = highlight.sy;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
559 hevent.ex = highlight.ex;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
560 hevent.ey = highlight.ey;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
561
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
562 hevent.palette = highlight.palette;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
563 hevent.pts = highlight.pts;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
564 hevent.buttonN = this->position_next.button;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
565
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
566 } else {
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
567 hevent.display = 0;
23
c2d40c38e12f Name stills work better.
jcdutton
parents: 22
diff changeset
568 status = S_OK;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
569 }
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
570 this->position_current.button = this->position_next.button;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
571
23
c2d40c38e12f Name stills work better.
jcdutton
parents: 22
diff changeset
572 if (status) {
c2d40c38e12f Name stills work better.
jcdutton
parents: 22
diff changeset
573 // FIXME: Change this to DVDNAV_BUTTON
c2d40c38e12f Name stills work better.
jcdutton
parents: 22
diff changeset
574 (*event) = DVDNAV_HIGHLIGHT;
c2d40c38e12f Name stills work better.
jcdutton
parents: 22
diff changeset
575 (*len) = sizeof(hevent);
c2d40c38e12f Name stills work better.
jcdutton
parents: 22
diff changeset
576 memcpy(buf, &(hevent), sizeof(hevent));
c2d40c38e12f Name stills work better.
jcdutton
parents: 22
diff changeset
577 pthread_mutex_unlock(&this->vm_lock);
c2d40c38e12f Name stills work better.
jcdutton
parents: 22
diff changeset
578 return S_OK;
c2d40c38e12f Name stills work better.
jcdutton
parents: 22
diff changeset
579 }
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
580 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
581
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
582 /* 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
583 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
584 (this->position_current.domain != this->position_next.domain)) {
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
585 dvd_read_domain_t domain;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
586 int vtsN;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
587 dvdnav_vts_change_event_t vts_event;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
588
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
589 if(this->file) {
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
590 dvdnav_read_cache_clear(this);
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
591 DVDCloseFile(this->file);
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
592 this->file = NULL;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
593 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
594
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
595 vts_event.old_vtsN = this->open_vtsN;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
596 vts_event.old_domain = this->open_domain;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
597
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
598 /* Use the current 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
599 switch(this->position_next.domain) {
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
600 case FP_DOMAIN:
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
601 case VMGM_DOMAIN:
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
602 domain = DVD_READ_MENU_VOBS;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
603 vtsN = 0;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
604 break;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
605 case VTSM_DOMAIN:
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
606 domain = DVD_READ_MENU_VOBS;
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
607 vtsN = this->position_next.vts;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
608 break;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
609 case VTS_DOMAIN:
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
610 domain = DVD_READ_TITLE_VOBS;
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
611 vtsN = this->position_next.vts;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
612 break;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
613 default:
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
614 printerr("Unknown domain when changing VTS.");
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
615 pthread_mutex_unlock(&this->vm_lock);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
616 return S_ERR;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
617 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
618
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
619 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
620 this->position_current.domain = this->position_next.domain;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
621 dvdnav_read_cache_clear(this);
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
622 this->file = DVDOpenFile(vm_get_dvd_reader(this->vm), vtsN, domain);
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
623 vts_event.new_vtsN = this->position_next.vts;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
624 vts_event.new_domain = this->position_next.domain;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
625
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
626 /* 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
627 if(this->file == NULL) {
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
628 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
629 pthread_mutex_unlock(&this->vm_lock);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
630 return S_ERR;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
631 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
632
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
633 /* File opened successfully so return a VTS change event */
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
634 (*event) = DVDNAV_VTS_CHANGE;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
635 memcpy(buf, &(vts_event), sizeof(vts_event));
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
636 (*len) = sizeof(vts_event);
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
637
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
638 /* On a VTS change, we want to disable any highlights which
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
639 * may have been shown (FIXME: is this valid?) */
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
640 //FIXME: We should be able to remove this
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
641 //this->highlight_changed = 1;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
642 this->spu_clut_changed = 1;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
643 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
644 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
645 this->position_current.audio_channel = -1; /* Force an update */;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
646 //this->hli_state = 0; /* Hide */
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
647
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
648 pthread_mutex_unlock(&this->vm_lock);
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
649 return S_OK;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
650 }
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
651 /* FIXME: Don't really need "cell", we only need vobu_start */
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
652 if( (this->position_current.cell != this->position_next.cell) ||
24
870a0a1eee41 Re-implemented seeking.
jcdutton
parents: 23
diff changeset
653 (this->position_current.vobu_start != this->position_next.vobu_start) ||
870a0a1eee41 Re-implemented seeking.
jcdutton
parents: 23
diff changeset
654 (this->position_current.vobu_next != this->position_next.vobu_next) ) {
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
655 this->position_current.cell = this->position_next.cell;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
656 /* vobu_start changes when PGC or PG changes. */
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
657 this->position_current.vobu_start = this->position_next.vobu_start;
24
870a0a1eee41 Re-implemented seeking.
jcdutton
parents: 23
diff changeset
658 this->position_current.vobu_next = this->position_next.vobu_next;
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
659 /* FIXME: Need to set vobu_start, vobu_next */
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
660 this->vobu.vobu_start = this->position_next.vobu_start;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
661 /* vobu_next is use for mid cell resumes */
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
662 this->vobu.vobu_next = this->position_next.vobu_next;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
663 //this->vobu.vobu_next = 0;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
664 this->vobu.vobu_length = 0;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
665 this->vobu.blockN = this->vobu.vobu_length + 1;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
666 /* Make blockN > vobu_lenght to do expected_nav */
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
667 (*event) = DVDNAV_CELL_CHANGE;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
668 (*len) = 0;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
669 pthread_mutex_unlock(&this->vm_lock);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
670 return S_OK;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
671 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
672
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
673
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
674 if (this->vobu.blockN > this->vobu.vobu_length) {
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
675 /* End of VOBU */
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
676
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
677 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
678 /* End of Cell from NAV DSI info */
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
679 fprintf(stderr, "Still set to %x\n", this->position_next.still);
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
680 this->position_current.still = this->position_next.still;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
681
23
c2d40c38e12f Name stills work better.
jcdutton
parents: 22
diff changeset
682 if( this->position_current.still == 0 || this->skip_still ) {
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
683 vm_get_next_cell(this->vm);
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
684 vm_position_get(this->vm,&this->position_next);
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
685 /* FIXME: Need to set vobu_start, vobu_next */
23
c2d40c38e12f Name stills work better.
jcdutton
parents: 22
diff changeset
686 this->position_current.still = 0; /* still gets activated at end of cell */
c2d40c38e12f Name stills work better.
jcdutton
parents: 22
diff changeset
687 this->skip_still = 0;
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
688 this->position_current.cell = this->position_next.cell;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
689 this->position_current.vobu_start = this->position_next.vobu_start;
24
870a0a1eee41 Re-implemented seeking.
jcdutton
parents: 23
diff changeset
690 this->position_current.vobu_next = this->position_next.vobu_next;
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
691 this->vobu.vobu_start = this->position_next.vobu_start;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
692 /* vobu_next is use for mid cell resumes */
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
693 this->vobu.vobu_next = this->position_next.vobu_next;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
694 //this->vobu.vobu_next = 0;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
695 this->vobu.vobu_length = 0;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
696 this->vobu.blockN = this->vobu.vobu_length + 1;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
697 /* Make blockN > vobu_next to do expected_nav */
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
698 (*event) = DVDNAV_CELL_CHANGE;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
699 (*len) = 0;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
700 pthread_mutex_unlock(&this->vm_lock);
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
701 return S_OK;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
702 } else {
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
703 dvdnav_still_event_t still_event;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
704 still_event.length = this->position_current.still;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
705 (*event) = DVDNAV_STILL_FRAME;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
706 (*len) = sizeof(dvdnav_still_event_t);
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
707 memcpy(buf, &(still_event), sizeof(dvdnav_still_event_t));
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
708 pthread_mutex_unlock(&this->vm_lock);
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
709 return S_OK;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
710 }
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
711
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
712 /* Only set still after whole VOBU has been output. */
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
713 //if(this->position_next.still != 0) {
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
714 // this->position_current.still = this->position_next.still;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
715 //}
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
716
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
717 }
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
718 /* Perform the jump if necessary (this is always a
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
719 * VOBU boundary). */
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
720
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
721 result = DVDReadBlocks(this->file, this->vobu.vobu_start + this->vobu.vobu_next, 1, buf);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
722
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
723 if(result <= 0) {
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
724 printerr("Error reading NAV packet.");
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
725 pthread_mutex_unlock(&this->vm_lock);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
726 return S_ERR;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
727 }
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
728 /* Decode nav into pci and dsi. */
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
729 /* Then get next VOBU info. */
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
730 if(dvdnav_decode_packet(this, buf, &this->dsi, &this->pci) == 0) {
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
731 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
732 pthread_mutex_unlock(&this->vm_lock);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
733 return S_ERR;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
734 }
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
735 dvdnav_get_vobu(&this->dsi,&this->pci, 0, &this->vobu);
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
736 this->vobu.blockN=1;
28
da60d6379f95 Add some comments, FIXMEs.
jcdutton
parents: 26
diff changeset
737 /* FIXME: We need to update the vm state->blockN with which VOBU we are in.
da60d6379f95 Add some comments, FIXMEs.
jcdutton
parents: 26
diff changeset
738 * This is so RSM resumes to the VOBU level and not just the CELL level.
da60d6379f95 Add some comments, FIXMEs.
jcdutton
parents: 26
diff changeset
739 * This should be implemented with a new Public API call.
da60d6379f95 Add some comments, FIXMEs.
jcdutton
parents: 26
diff changeset
740 */
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
741 dvdnav_pre_cache_blocks(this, this->vobu.vobu_start+1, this->vobu.vobu_length);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
742
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
743 /* Successfully got a NAV packet */
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
744 (*event) = DVDNAV_NAV_PACKET;
3
328eadb3f37e Added initial example programs directory and make sure all debug/error output goes to stderr.
richwareham
parents: 0
diff changeset
745 (*len) = 2048;
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
746 pthread_mutex_unlock(&this->vm_lock);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
747 return S_OK;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
748 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
749
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
750 /* 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
751 if(!this->file) {
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
752 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
753 pthread_mutex_unlock(&this->vm_lock);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
754 return S_ERR;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
755 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
756
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
757 result = dvdnav_read_cache_block(this, this->vobu.vobu_start + this->vobu.blockN, 1, buf);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
758 if(result <= 0) {
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
759 printerr("Error reading from DVD.");
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
760 pthread_mutex_unlock(&this->vm_lock);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
761 return S_ERR;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
762 }
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
763 this->vobu.blockN++;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
764 (*len) = 2048;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
765 (*event) = DVDNAV_BLOCK_OK;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
766
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
767 pthread_mutex_unlock(&this->vm_lock);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
768 return S_OK;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
769 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
770
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
771 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
772 audio_attr_t attr;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
773
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
774 if(!this)
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
775 return -1;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
776
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
777 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
778 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
779 pthread_mutex_unlock(&this->vm_lock);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
780
25
df024077cbc1 Why rewrite vm function, use it instead (this remark is for me, of course ;-) ).
f1rmb
parents: 24
diff changeset
781 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
782 return 0xffff;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
783
25
df024077cbc1 Why rewrite vm function, use it instead (this remark is for me, of course ;-) ).
f1rmb
parents: 24
diff changeset
784 return attr.lang_code;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
785 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
786
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
787 int8_t dvdnav_get_audio_logical_stream(dvdnav_t *this, uint8_t audio_num) {
21
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
788 int8_t retval;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
789
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
790 if(!this)
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
791 return -1;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
792
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
793 pthread_mutex_lock(&this->vm_lock);
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
794 retval = NCLK_dvdnav_get_audio_logical_stream(this, audio_num);
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
795 pthread_mutex_unlock(&this->vm_lock);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
796
21
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
797 return retval;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
798 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
799
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
800 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
801 subp_attr_t attr;
21
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
802
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
803 if(!this)
21
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
804 return -1;
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
805
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
806 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
807 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
808 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
809
25
df024077cbc1 Why rewrite vm function, use it instead (this remark is for me, of course ;-) ).
f1rmb
parents: 24
diff changeset
810 if(attr.type != 1)
21
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
811 return 0xffff;
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
812
25
df024077cbc1 Why rewrite vm function, use it instead (this remark is for me, of course ;-) ).
f1rmb
parents: 24
diff changeset
813 return attr.lang_code;
21
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
814 }
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
815
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
816 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
817 int8_t retval;
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
818
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
819 if(!this)
21
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
820 return -1;
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
821
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
822 pthread_mutex_lock(&this->vm_lock);
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
823 retval = NCLK_dvdnav_get_spu_logical_stream(this, subp_num);
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
824 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
825
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
826 return retval;
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
827 }
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
828
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
829 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
830 int8_t retval;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
831
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
832 if(!this)
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
833 return -1;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
834
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
835 pthread_mutex_lock(&this->vm_lock);
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
836 retval = NLCK_dvdnav_get_active_spu_stream(this);
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
837 pthread_mutex_unlock(&this->vm_lock);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
838
21
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
839 return retval;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
840 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
841
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
842 /* First Play domain. (Menu) */
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
843 int8_t dvdnav_is_domain_fp(dvdnav_t *this) {
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
844 return _dvdnav_is_domain(this, FP_DOMAIN);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
845 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
846 /* Video management Menu domain. (Menu) */
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
847 int8_t dvdnav_is_domain_vmgm(dvdnav_t *this) {
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
848 return _dvdnav_is_domain(this, VMGM_DOMAIN);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
849 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
850 /* Video Title Menu domain (Menu) */
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
851 int8_t dvdnav_is_domain_vtsm(dvdnav_t *this) {
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
852 return _dvdnav_is_domain(this, VTSM_DOMAIN);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
853 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
854 /* Video Title domain (playing movie). */
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
855 int8_t dvdnav_is_domain_vts(dvdnav_t *this) {
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
856 return _dvdnav_is_domain(this, VTS_DOMAIN);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
857 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
858
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
859 /* Generally delegate angle information handling to
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
860 * VM */
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
861 dvdnav_status_t dvdnav_angle_change(dvdnav_t *this, int angle) {
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
862 int num, current;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
863
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
864 if(!this) {
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
865 return S_ERR;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
866 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
867
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
868 if(dvdnav_get_angle_info(this, &current, &num) != S_OK) {
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
869 printerr("Error getting angle info");
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
870 return S_ERR;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
871 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
872
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
873 /* Set angle SPRM if valid */
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
874 if((angle > 0) && (angle <= num)) {
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
875 this->vm->state.AGL_REG = angle;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
876 } else {
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
877 printerr("Passed an invalid angle number");
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
878 return S_ERR;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
879 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
880
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
881 return S_OK;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
882 }
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
883 /* FIXME: change order of current_angle, number_of_angles */
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
884 dvdnav_status_t dvdnav_get_angle_info(dvdnav_t *this, int* current_angle,
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
885 int *number_of_angles) {
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
886 if(!this || !this->vm) {
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
887 return S_ERR;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
888 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
889
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
890 if(!current_angle || !number_of_angles) {
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
891 printerr("Passed a NULL pointer");
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
892 return S_ERR;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
893 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
894
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
895 vm_get_angle_info(this->vm, number_of_angles, current_angle);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
896
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
897 return S_OK;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
898 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
899
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
900 dvdnav_status_t dvdnav_get_cell_info(dvdnav_t *this, int* current_angle,
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
901 int *number_of_angles) {
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
902 if(!this || !this->vm) {
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
903 return S_ERR;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
904 }
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
905 *current_angle=this->position_next.cell;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
906 return S_OK;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
907 }
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
908
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
909 /*
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
910 * $Log$
28
da60d6379f95 Add some comments, FIXMEs.
jcdutton
parents: 26
diff changeset
911 * Revision 1.14 2002/04/23 13:26:08 jcdutton
da60d6379f95 Add some comments, FIXMEs.
jcdutton
parents: 26
diff changeset
912 * Add some comments, FIXMEs.
da60d6379f95 Add some comments, FIXMEs.
jcdutton
parents: 26
diff changeset
913 * The main point being that dvdnav_get_next_block is almost in a state where it can be optional whether the application programmer uses it, or implements their own version of the function. That is been the main reason for the re-write of this function recently.
da60d6379f95 Add some comments, FIXMEs.
jcdutton
parents: 26
diff changeset
914 *
26
794d2e16a4d4 Removed un-needed variables.
jcdutton
parents: 25
diff changeset
915 * Revision 1.13 2002/04/23 12:55:40 jcdutton
794d2e16a4d4 Removed un-needed variables.
jcdutton
parents: 25
diff changeset
916 * Removed un-needed variables.
794d2e16a4d4 Removed un-needed variables.
jcdutton
parents: 25
diff changeset
917 * General Clean up.
794d2e16a4d4 Removed un-needed variables.
jcdutton
parents: 25
diff changeset
918 *
25
df024077cbc1 Why rewrite vm function, use it instead (this remark is for me, of course ;-) ).
f1rmb
parents: 24
diff changeset
919 * Revision 1.12 2002/04/23 12:34:39 f1rmb
df024077cbc1 Why rewrite vm function, use it instead (this remark is for me, of course ;-) ).
f1rmb
parents: 24
diff changeset
920 * Why rewrite vm function, use it instead (this remark is for me, of course ;-) ).
df024077cbc1 Why rewrite vm function, use it instead (this remark is for me, of course ;-) ).
f1rmb
parents: 24
diff changeset
921 * Comment unused var, shut compiler warnings.
df024077cbc1 Why rewrite vm function, use it instead (this remark is for me, of course ;-) ).
f1rmb
parents: 24
diff changeset
922 *
24
870a0a1eee41 Re-implemented seeking.
jcdutton
parents: 23
diff changeset
923 * Revision 1.11 2002/04/23 02:12:27 jcdutton
870a0a1eee41 Re-implemented seeking.
jcdutton
parents: 23
diff changeset
924 * Re-implemented seeking.
870a0a1eee41 Re-implemented seeking.
jcdutton
parents: 23
diff changeset
925 *
23
c2d40c38e12f Name stills work better.
jcdutton
parents: 22
diff changeset
926 * Revision 1.10 2002/04/23 00:07:16 jcdutton
c2d40c38e12f Name stills work better.
jcdutton
parents: 22
diff changeset
927 * Name stills work better.
c2d40c38e12f Name stills work better.
jcdutton
parents: 22
diff changeset
928 *
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
929 * Revision 1.9 2002/04/22 22:00:48 jcdutton
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
930 * Start of rewrite of libdvdnav. Still need to re-implement seeking.
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
931 *
21
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
932 * Revision 1.8 2002/04/22 20:57:14 f1rmb
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
933 * Change/fix SPU active stream id. Same for audio. Few new functions, largely
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
934 * inspired from libogle ;-).
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
935 *
17
a68c6da98b73 Actually fix the const this time!
jcdutton
parents: 8
diff changeset
936 * Revision 1.7 2002/04/10 16:45:57 jcdutton
a68c6da98b73 Actually fix the const this time!
jcdutton
parents: 8
diff changeset
937 * Actually fix the const this time!
a68c6da98b73 Actually fix the const this time!
jcdutton
parents: 8
diff changeset
938 *
8
66708b4a1b5e Stop C++ bitching about some things and extend the menus example
richwareham
parents: 7
diff changeset
939 * Revision 1.6 2002/04/07 14:10:11 richwareham
66708b4a1b5e Stop C++ bitching about some things and extend the menus example
richwareham
parents: 7
diff changeset
940 * Stop C++ bitching about some things and extend the menus example
66708b4a1b5e Stop C++ bitching about some things and extend the menus example
richwareham
parents: 7
diff changeset
941 *
7
7fdefafa624f Slight correction to handle quicker menu transitions.
jcdutton
parents: 6
diff changeset
942 * Revision 1.5 2002/04/06 18:42:05 jcdutton
7fdefafa624f Slight correction to handle quicker menu transitions.
jcdutton
parents: 6
diff changeset
943 * Slight correction to handle quicker menu transitions.
7fdefafa624f Slight correction to handle quicker menu transitions.
jcdutton
parents: 6
diff changeset
944 *
6
5f319e02e333 Some cleaning up.
jcdutton
parents: 4
diff changeset
945 * Revision 1.4 2002/04/06 18:31:50 jcdutton
5f319e02e333 Some cleaning up.
jcdutton
parents: 4
diff changeset
946 * Some cleaning up.
5f319e02e333 Some cleaning up.
jcdutton
parents: 4
diff changeset
947 * changed exit(1) to assert(0) so they actually get seen by the user so that it helps developers more.
5f319e02e333 Some cleaning up.
jcdutton
parents: 4
diff changeset
948 *
4
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
949 * Revision 1.3 2002/04/02 18:22:27 richwareham
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
950 * Added reset patch from Kees Cook <kees@outflux.net>
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
951 *
3
328eadb3f37e Added initial example programs directory and make sure all debug/error output goes to stderr.
richwareham
parents: 0
diff changeset
952 * Revision 1.2 2002/04/01 18:56:28 richwareham
328eadb3f37e Added initial example programs directory and make sure all debug/error output goes to stderr.
richwareham
parents: 0
diff changeset
953 * Added initial example programs directory and make sure all debug/error output goes to stderr.
328eadb3f37e Added initial example programs directory and make sure all debug/error output goes to stderr.
richwareham
parents: 0
diff changeset
954 *
328eadb3f37e Added initial example programs directory and make sure all debug/error output goes to stderr.
richwareham
parents: 0
diff changeset
955 * Revision 1.1.1.1 2002/03/12 19:45:57 richwareham
328eadb3f37e Added initial example programs directory and make sure all debug/error output goes to stderr.
richwareham
parents: 0
diff changeset
956 * Initial import
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
957 *
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
958 * Revision 1.28 2002/02/02 23:26:20 richwareham
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
959 * Restored title selection
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
960 *
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
961 * Revision 1.27 2002/02/01 15:48:10 richwareham
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
962 * Re-implemented angle selection and title/chapter display
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
963 *
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
964 * Revision 1.26 2002/01/31 16:53:49 richwareham
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
965 * Big patch from Daniel Caujolle-Bert to (re)implement SPU/Audio language display
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
966 *
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
967 * Revision 1.25 2002/01/24 20:53:50 richwareham
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
968 * Added option to _not_ use DVD read-ahead to options
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
969 *
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
970 * Revision 1.24 2002/01/20 15:54:59 jcdutton
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
971 * Implement seeking.
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
972 * It is still a bit buggy, but works sometimes.
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
973 * I need to find out how to make the jump clean.
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
974 * At the moment, some corruption of the mpeg2 stream occurs,
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
975 * which causes libmpeg2 to crash.
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
976 *
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
977 * Revision 1.23 2002/01/18 00:23:52 jcdutton
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
978 * Support Ejecting of DVD.
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
979 * It will first un-mount the DVD, then eject it.
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
980 *
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
981 * Revision 1.22 2002/01/17 14:50:32 jcdutton
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
982 * Fix corruption of stream during menu transitions.
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
983 * Menu transitions are now clean.
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
984 *
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
985 * Revision 1.21 2002/01/15 00:37:03 jcdutton
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
986 * Just a few cleanups, and a assert fix. (memset fixed it)
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
987 *
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
988 * Revision 1.20 2002/01/13 22:17:57 jcdutton
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
989 * Change logging.
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
990 *
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
991 *
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
992 */