annotate dvdnav.c @ 92:82af243658bd src

fix memleaks in dvdnav_open
author mroi
date Thu, 05 Sep 2002 12:55:05 +0000
parents 0fbef4901e2c
children c1dff1899bda
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1 /*
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
2 * Copyright (C) 2000 Rich Wareham <richwareham@users.sourceforge.net>
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
3 *
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
4 * This file is part of libdvdnav, a DVD navigation library.
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
5 *
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
6 * libdvdnav is free software; you can redistribute it and/or modify
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
7 * it under the terms of the GNU General Public License as published by
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
8 * the Free Software Foundation; either version 2 of the License, or
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
9 * (at your option) any later version.
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
10 *
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
11 * libdvdnav is distributed in the hope that it will be useful,
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
14 * GNU General Public License for more details.
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
15 *
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
16 * You should have received a copy of the GNU General Public License
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
17 * along with this program; if not, write to the Free Software
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
18 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
19 *
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
20 * $Id$
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
21 *
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
22 */
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
23
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
24 #ifdef HAVE_CONFIG_H
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
25 #include "config.h"
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
26 #endif
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
27
31
8b08ee66cbff Quiet please!!!
jcdutton
parents: 30
diff changeset
28 /*
8b08ee66cbff Quiet please!!!
jcdutton
parents: 30
diff changeset
29 #define LOG_DEBUG
8b08ee66cbff Quiet please!!!
jcdutton
parents: 30
diff changeset
30 */
8b08ee66cbff Quiet please!!!
jcdutton
parents: 30
diff changeset
31
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
32 #include <pthread.h>
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
33 #include <dvdnav.h>
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
34 #include "dvdnav_internal.h"
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
35 #include "read_cache.h"
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
36
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
37 #include <dvdread/nav_read.h>
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
38
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
39 #include <stdlib.h>
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
40 #include <stdio.h>
84
ba1121a07120 Properly seed the DVD VM Instruction rand().
jcdutton
parents: 82
diff changeset
41 #include <sys/time.h>
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
42
21
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 * NOTE:
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
45 * 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
46 * a locked context. Take care.
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
47 *
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
48 */
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
49
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
50 /* 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
51 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
52 dvd_state_t *state;
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
53
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
54 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
55 return -1;
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
56
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
57 state = &(this->vm->state);
21
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 if(!state)
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
60 return -1;
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
61
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
62 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
63 }
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
64
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
65 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
66 int8_t retval;
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
67
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
68 pthread_mutex_lock(&this->vm_lock);
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
69 retval = NLCK_dvdnav_is_domain(this, domain);
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
70 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
71
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
72 return retval;
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
73 }
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
74
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
75 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
76 dvd_state_t *state;
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
77 int8_t logical = -1;
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
78
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
79 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
80 audio_num = 0;
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
81
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
82 state = &(this->vm->state);
21
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 if(audio_num < 8) {
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
85 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
86 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
87 }
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
88 }
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
89
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
90 return logical;
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
91 }
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
92
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
93 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
94 dvd_state_t *state;
df024077cbc1 Why rewrite vm function, use it instead (this remark is for me, of course ;-) ).
f1rmb
parents: 24
diff changeset
95 ifo_handle_t *vtsi;
21
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
96
25
df024077cbc1 Why rewrite vm function, use it instead (this remark is for me, of course ;-) ).
f1rmb
parents: 24
diff changeset
97 if(!this)
df024077cbc1 Why rewrite vm function, use it instead (this remark is for me, of course ;-) ).
f1rmb
parents: 24
diff changeset
98 return -1;
21
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
99
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
100 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
101 vtsi = this->vm->vtsi;
21
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
102
25
df024077cbc1 Why rewrite vm function, use it instead (this remark is for me, of course ;-) ).
f1rmb
parents: 24
diff changeset
103 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
104 return -1;
21
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
105
55
5674fbd44f26 report all spu types (widescreen, letterbox and pan&scan), not widescreen
mroi
parents: 54
diff changeset
106 return vm_get_subp_stream(this->vm, subp_num, 0);
21
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
107 }
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 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
110 dvd_state_t *state;
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
111 int8_t subp_num;
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
112 int stream_num;
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
113
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
114 state = &(this->vm->state);
21
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
115 subp_num = state->SPST_REG & ~0x40;
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
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
118 if(stream_num == -1)
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
119 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
120 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
121 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
122 break;
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
123 }
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
124
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
125 return stream_num;
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
126 }
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
127
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
128 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
129 uint8_t retval;
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
130
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
131 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
132 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
133 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
134
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
135 return retval;
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
136 }
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
137
55
5674fbd44f26 report all spu types (widescreen, letterbox and pan&scan), not widescreen
mroi
parents: 54
diff changeset
138 uint8_t dvdnav_get_video_scale_permission(dvdnav_t *this) {
5674fbd44f26 report all spu types (widescreen, letterbox and pan&scan), not widescreen
mroi
parents: 54
diff changeset
139 uint8_t retval;
5674fbd44f26 report all spu types (widescreen, letterbox and pan&scan), not widescreen
mroi
parents: 54
diff changeset
140
5674fbd44f26 report all spu types (widescreen, letterbox and pan&scan), not widescreen
mroi
parents: 54
diff changeset
141 pthread_mutex_lock(&this->vm_lock);
5674fbd44f26 report all spu types (widescreen, letterbox and pan&scan), not widescreen
mroi
parents: 54
diff changeset
142 retval = (uint8_t) vm_get_video_scale_permission(this->vm);
5674fbd44f26 report all spu types (widescreen, letterbox and pan&scan), not widescreen
mroi
parents: 54
diff changeset
143 pthread_mutex_unlock(&this->vm_lock);
5674fbd44f26 report all spu types (widescreen, letterbox and pan&scan), not widescreen
mroi
parents: 54
diff changeset
144
5674fbd44f26 report all spu types (widescreen, letterbox and pan&scan), not widescreen
mroi
parents: 54
diff changeset
145 return retval;
5674fbd44f26 report all spu types (widescreen, letterbox and pan&scan), not widescreen
mroi
parents: 54
diff changeset
146 }
5674fbd44f26 report all spu types (widescreen, letterbox and pan&scan), not widescreen
mroi
parents: 54
diff changeset
147
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
148 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
149 if (!this) {
4
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
150 printerr("Passed a NULL pointer");
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
151 return S_ERR;
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
152 }
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
153 /* clear everything except path, file, vm, mutex, readahead */
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
154
34
1f29402ef2ef 'Objectified' the read-ahead cache in preparation to implement a 'proper' threaded cache a-la that recommended in the DVD Demystified book.
richwareham
parents: 33
diff changeset
155 /* path */
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
156 if (this->file) DVDCloseFile(this->file);
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
157 this->file = NULL;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
158 this->open_vtsN = -1;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
159 this->open_domain = -1;
4
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
160
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
161 memset(&this->pci,0,sizeof(this->pci));
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
162 memset(&this->dsi,0,sizeof(this->dsi));
4
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
163
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
164 /* Set initial values of flags */
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
165 this->position_current.still = 0;
23
c2d40c38e12f Name stills work better.
jcdutton
parents: 22
diff changeset
166 this->skip_still = 0;
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
167 this->stop = 0;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
168 this->spu_clut_changed = 0;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
169 this->started=0;
34
1f29402ef2ef 'Objectified' the read-ahead cache in preparation to implement a 'proper' threaded cache a-la that recommended in the DVD Demystified book.
richwareham
parents: 33
diff changeset
170 /* this->use_read_ahead */
4
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
171
34
1f29402ef2ef 'Objectified' the read-ahead cache in preparation to implement a 'proper' threaded cache a-la that recommended in the DVD Demystified book.
richwareham
parents: 33
diff changeset
172 dvdnav_read_cache_clear(this->cache);
1f29402ef2ef 'Objectified' the read-ahead cache in preparation to implement a 'proper' threaded cache a-la that recommended in the DVD Demystified book.
richwareham
parents: 33
diff changeset
173
4
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
174 return S_OK;
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
175 }
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
176
17
a68c6da98b73 Actually fix the const this time!
jcdutton
parents: 8
diff changeset
177 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
178 dvdnav_t *this;
84
ba1121a07120 Properly seed the DVD VM Instruction rand().
jcdutton
parents: 82
diff changeset
179 struct timeval time;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
180
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
181 /* Create a new structure */
89
0fbef4901e2c Add a comment so I can tell which version of the CVS a user is using.
jcdutton
parents: 84
diff changeset
182 fprintf(MSG_OUT, "libdvdnav: Using dvdnav version (devel-ref:jcd1) from http://dvd.sf.net\n");
82
033f011d8152 Improve some debug messages.
jcdutton
parents: 76
diff changeset
183
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
184 (*dest) = NULL;
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
185 this = (dvdnav_t*)malloc(sizeof(dvdnav_t));
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
186 if(!this)
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
187 return S_ERR;
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
188 memset(this, 0, (sizeof(dvdnav_t) ) ); /* Make sure this structure is clean */
82
033f011d8152 Improve some debug messages.
jcdutton
parents: 76
diff changeset
189 (*dest) = this;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
190
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
191 pthread_mutex_init(&this->vm_lock, NULL);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
192 /* Initialise the error string */
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
193 printerr("");
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
194
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
195 /* Initialise the VM */
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
196 this->vm = vm_new_vm();
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
197 if(!this->vm) {
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
198 printerr("Error initialising the DVD VM");
92
82af243658bd fix memleaks in dvdnav_open
mroi
parents: 89
diff changeset
199 pthread_mutex_destroy(&this->vm_lock);
82af243658bd fix memleaks in dvdnav_open
mroi
parents: 89
diff changeset
200 free(this);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
201 return S_ERR;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
202 }
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
203 if(vm_reset(this->vm, path) == -1) {
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
204 printerr("Error starting the VM / opening the DVD device");
92
82af243658bd fix memleaks in dvdnav_open
mroi
parents: 89
diff changeset
205 pthread_mutex_destroy(&this->vm_lock);
82af243658bd fix memleaks in dvdnav_open
mroi
parents: 89
diff changeset
206 vm_free_vm(this->vm);
82af243658bd fix memleaks in dvdnav_open
mroi
parents: 89
diff changeset
207 free(this);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
208 return S_ERR;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
209 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
210
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
211 /* 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
212 strncpy(this->path, path, MAX_PATH_LEN);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
213
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
214 dvdnav_clear(this);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
215
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
216 /* 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
217 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
218 if (this->file) DVDCloseFile(this->file);
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
219 this->file = NULL;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
220
34
1f29402ef2ef 'Objectified' the read-ahead cache in preparation to implement a 'proper' threaded cache a-la that recommended in the DVD Demystified book.
richwareham
parents: 33
diff changeset
221 /* Start the read-ahead cache. */
1f29402ef2ef 'Objectified' the read-ahead cache in preparation to implement a 'proper' threaded cache a-la that recommended in the DVD Demystified book.
richwareham
parents: 33
diff changeset
222 this->cache = dvdnav_read_cache_new(this);
84
ba1121a07120 Properly seed the DVD VM Instruction rand().
jcdutton
parents: 82
diff changeset
223
ba1121a07120 Properly seed the DVD VM Instruction rand().
jcdutton
parents: 82
diff changeset
224 /* Seed the random numbers. So that the DVD VM Command rand()i
ba1121a07120 Properly seed the DVD VM Instruction rand().
jcdutton
parents: 82
diff changeset
225 * gives a different start value each time a DVD is played.
ba1121a07120 Properly seed the DVD VM Instruction rand().
jcdutton
parents: 82
diff changeset
226 */
ba1121a07120 Properly seed the DVD VM Instruction rand().
jcdutton
parents: 82
diff changeset
227 gettimeofday(&time,NULL);
ba1121a07120 Properly seed the DVD VM Instruction rand().
jcdutton
parents: 82
diff changeset
228 srand(time.tv_usec);
ba1121a07120 Properly seed the DVD VM Instruction rand().
jcdutton
parents: 82
diff changeset
229
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
230 return S_OK;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
231 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
232
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
233 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
234 if(!this) {
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
235 printerr("Passed a NULL pointer");
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
236 return S_ERR;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
237 }
31
8b08ee66cbff Quiet please!!!
jcdutton
parents: 30
diff changeset
238 #ifdef LOG_DEBUG
76
0e2abe7083de more consistent console output
mroi
parents: 73
diff changeset
239 fprintf(MSG_OUT, "libdvdnav: close:called\n");
31
8b08ee66cbff Quiet please!!!
jcdutton
parents: 30
diff changeset
240 #endif
34
1f29402ef2ef 'Objectified' the read-ahead cache in preparation to implement a 'proper' threaded cache a-la that recommended in the DVD Demystified book.
richwareham
parents: 33
diff changeset
241
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
242 if (this->file) {
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
243 DVDCloseFile(this->file);
31
8b08ee66cbff Quiet please!!!
jcdutton
parents: 30
diff changeset
244 #ifdef LOG_DEBUG
76
0e2abe7083de more consistent console output
mroi
parents: 73
diff changeset
245 fprintf(MSG_OUT, "libdvdnav: close:file closing\n");
31
8b08ee66cbff Quiet please!!!
jcdutton
parents: 30
diff changeset
246 #endif
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
247 this->file = NULL;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
248 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
249
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
250 /* Free the VM */
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
251 if(this->vm) {
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
252 vm_free_vm(this->vm);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
253 }
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
254 if (this->file) {
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
255 DVDCloseFile(this->file);
31
8b08ee66cbff Quiet please!!!
jcdutton
parents: 30
diff changeset
256 #ifdef LOG_DEBUG
76
0e2abe7083de more consistent console output
mroi
parents: 73
diff changeset
257 fprintf(MSG_OUT, "libdvdnav: close2:file closing\n");
31
8b08ee66cbff Quiet please!!!
jcdutton
parents: 30
diff changeset
258 #endif
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
259 this->file = NULL;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
260 }
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
261 pthread_mutex_destroy(&this->vm_lock);
60
30995ad032cf use new memcopy'less read ahead cache
mroi
parents: 58
diff changeset
262
30995ad032cf use new memcopy'less read ahead cache
mroi
parents: 58
diff changeset
263 /* We leave the final freeing of the entire structure to the cache,
30995ad032cf use new memcopy'less read ahead cache
mroi
parents: 58
diff changeset
264 * because we don't know, if there are still buffers out in the wild,
30995ad032cf use new memcopy'less read ahead cache
mroi
parents: 58
diff changeset
265 * that must return first. */
30995ad032cf use new memcopy'less read ahead cache
mroi
parents: 58
diff changeset
266 if(this->cache) {
30995ad032cf use new memcopy'less read ahead cache
mroi
parents: 58
diff changeset
267 dvdnav_read_cache_free(this->cache);
30995ad032cf use new memcopy'less read ahead cache
mroi
parents: 58
diff changeset
268 } else free(this);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
269
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
270 return S_OK;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
271 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
272
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
273 dvdnav_status_t dvdnav_reset(dvdnav_t *this) {
4
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
274 dvdnav_status_t result;
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
275
31
8b08ee66cbff Quiet please!!!
jcdutton
parents: 30
diff changeset
276 #ifdef LOG_DEBUG
76
0e2abe7083de more consistent console output
mroi
parents: 73
diff changeset
277 fprintf(MSG_OUT, "libdvdnav: reset:called\n");
31
8b08ee66cbff Quiet please!!!
jcdutton
parents: 30
diff changeset
278 #endif
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
279 if(!this) {
4
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
280 printerr("Passed a NULL pointer");
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
281 return S_ERR;
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
282 }
31
8b08ee66cbff Quiet please!!!
jcdutton
parents: 30
diff changeset
283 #ifdef LOG_DEBUG
76
0e2abe7083de more consistent console output
mroi
parents: 73
diff changeset
284 fprintf(MSG_OUT, "libdvdnav: getting lock\n");
31
8b08ee66cbff Quiet please!!!
jcdutton
parents: 30
diff changeset
285 #endif
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
286 pthread_mutex_lock(&this->vm_lock);
31
8b08ee66cbff Quiet please!!!
jcdutton
parents: 30
diff changeset
287 #ifdef LOG_DEBUG
76
0e2abe7083de more consistent console output
mroi
parents: 73
diff changeset
288 fprintf(MSG_OUT, "libdvdnav: reseting vm\n");
31
8b08ee66cbff Quiet please!!!
jcdutton
parents: 30
diff changeset
289 #endif
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
290 if(vm_reset(this->vm, NULL) == -1) {
4
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
291 printerr("Error restarting the VM");
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
292 pthread_mutex_unlock(&this->vm_lock);
4
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
293 return S_ERR;
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
294 }
31
8b08ee66cbff Quiet please!!!
jcdutton
parents: 30
diff changeset
295 #ifdef LOG_DEBUG
76
0e2abe7083de more consistent console output
mroi
parents: 73
diff changeset
296 fprintf(MSG_OUT, "libdvdnav: clearing dvdnav\n");
31
8b08ee66cbff Quiet please!!!
jcdutton
parents: 30
diff changeset
297 #endif
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
298 result=dvdnav_clear(this);
31
8b08ee66cbff Quiet please!!!
jcdutton
parents: 30
diff changeset
299 #ifdef LOG_DEBUG
76
0e2abe7083de more consistent console output
mroi
parents: 73
diff changeset
300 fprintf(MSG_OUT, "libdvdnav: unlocking\n");
31
8b08ee66cbff Quiet please!!!
jcdutton
parents: 30
diff changeset
301 #endif
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
302 pthread_mutex_unlock(&this->vm_lock);
4
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
303 return result;
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
304 }
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
305
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
306 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
307 if(!this || !path || !(*path)) {
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
308 return S_ERR;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
309 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
310
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
311 /* FIXME: Is shallow copy 'right'? */
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
312 (*path) = this->path;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
313
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
314 return S_OK;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
315 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
316
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
317 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
318 if(!this) {
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
319 /* 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
320 return "Hey! You gave me a NULL pointer you naughty person!";
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
321 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
322
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
323 return this->err_str;
0
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 * Returns 1 if block contains NAV packet, 0 otherwise.
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
328 * Precesses said NAV packet if present.
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
329 *
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
330 * Most of the code in here is copied from xine's MPEG demuxer
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
331 * so any bugs which are found in that should be corrected here also.
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
332 */
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
333 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
334 int bMpeg1=0;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
335 uint32_t nHeaderLen;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
336 uint32_t nPacketLen;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
337 uint32_t nStreamID;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
338 /* uint8_t *p_start=p; */
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
339
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
340
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
341 if (p==NULL) {
76
0e2abe7083de more consistent console output
mroi
parents: 73
diff changeset
342 fprintf(MSG_OUT, "libdvdnav: Passed a NULL pointer.\n");
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
343 return 0;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
344 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
345
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
346 /* dprint("Checking packet...\n"); */
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
347
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
348 if (p[3] == 0xBA) { /* program stream pack header */
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
349
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
350 int nStuffingBytes;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
351
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
352 /* xprintf (VERBOSE|DEMUX, "program stream pack header\n"); */
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
353
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
354 bMpeg1 = (p[4] & 0x40) == 0;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
355
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
356 if (bMpeg1) {
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
357 p += 12;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
358 } else { /* mpeg2 */
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
359 nStuffingBytes = p[0xD] & 0x07;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
360 p += 14 + nStuffingBytes;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
361 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
362 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
363
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
364
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
365 if (p[3] == 0xbb) { /* program stream system header */
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
366 int nHeaderLen;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
367
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
368 nHeaderLen = (p[4] << 8) | p[5];
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
369 p += 6 + nHeaderLen;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
370 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
371
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
372 /* we should now have a PES packet here */
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
373
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
374 if (p[0] || p[1] || (p[2] != 1)) {
76
0e2abe7083de more consistent console output
mroi
parents: 73
diff changeset
375 fprintf(MSG_OUT, "libdvdnav: demux error! %02x %02x %02x (should be 0x000001) \n",p[0],p[1],p[2]);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
376 return 0;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
377 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
378
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
379 nPacketLen = p[4] << 8 | p[5];
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
380 nStreamID = p[3];
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
381
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
382 nHeaderLen = 6;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
383 p += nHeaderLen;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
384
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
385 if (nStreamID == 0xbf) { /* Private stream 2 */
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
386 /*
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
387 * int i;
76
0e2abe7083de more consistent console output
mroi
parents: 73
diff changeset
388 * fprintf(MSG_OUT, "libdvdnav: nav packet=%u\n",p-p_start-6);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
389 * for(i=0;i<80;i++) {
76
0e2abe7083de more consistent console output
mroi
parents: 73
diff changeset
390 * fprintf(MSG_OUT, "%02x ",p[i-6]);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
391 * }
76
0e2abe7083de more consistent console output
mroi
parents: 73
diff changeset
392 * fprintf(MSG_OUT, "\n");
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
393 */
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
394 if(p[0] == 0x00) {
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
395 navRead_PCI(nav_pci, p+1);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
396 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
397
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
398 p += nPacketLen;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
399
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
400 /* We should now have a DSI packet. */
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
401 if(p[6] == 0x01) {
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
402 nPacketLen = p[4] << 8 | p[5];
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
403 p += 6;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
404 /* dprint("NAV DSI packet\n"); */
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
405 navRead_DSI(nav_dsi, p+1);
33
ef2136c4e7b2 Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents: 31
diff changeset
406
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
407 }
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
408 return 1;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
409 }
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
410 return 0;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
411 }
33
ef2136c4e7b2 Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents: 31
diff changeset
412
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
413 /* DSI is used for most angle stuff.
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
414 * 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
415 */
33
ef2136c4e7b2 Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents: 31
diff changeset
416 int dvdnav_get_vobu(dvdnav_t *self, dsi_t* nav_dsi, pci_t* nav_pci, dvdnav_vobu_t* vobu) {
ef2136c4e7b2 Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents: 31
diff changeset
417 uint32_t next;
ef2136c4e7b2 Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents: 31
diff changeset
418 int angle, num_angle;
ef2136c4e7b2 Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents: 31
diff changeset
419
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
420 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
421 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
422
43
0ba15bf3dc25 Biiiiiiig change to let doxygen generate some docs for the library. Note that I'm in no way sure that the autoconf stuff plays nice.
richwareham
parents: 42
diff changeset
423 /*
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
424 * 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
425 * 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
426 * 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
427 * 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
428 * really happy.
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
429 *
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
430 * 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
431 * 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
432 * Should really assert if bit 31 != 1
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
433 */
33
ef2136c4e7b2 Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents: 31
diff changeset
434
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
435 /* Relative offset from vobu_start */
33
ef2136c4e7b2 Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents: 31
diff changeset
436 vobu->vobu_next = ( nav_dsi->vobu_sri.next_vobu & 0x3fffffff );
ef2136c4e7b2 Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents: 31
diff changeset
437
ef2136c4e7b2 Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents: 31
diff changeset
438 /* Old code -- may still be sueful one day
ef2136c4e7b2 Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents: 31
diff changeset
439 if(nav_dsi->vobu_sri.next_vobu != SRI_END_OF_CELL ) {
ef2136c4e7b2 Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents: 31
diff changeset
440 vobu->vobu_next = ( nav_dsi->vobu_sri.next_vobu & 0x3fffffff );
ef2136c4e7b2 Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents: 31
diff changeset
441 } else {
ef2136c4e7b2 Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents: 31
diff changeset
442 vobu->vobu_next = vobu->vobu_length;
ef2136c4e7b2 Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents: 31
diff changeset
443 } */
ef2136c4e7b2 Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents: 31
diff changeset
444
ef2136c4e7b2 Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents: 31
diff changeset
445 dvdnav_get_angle_info(self, &angle, &num_angle);
ef2136c4e7b2 Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents: 31
diff changeset
446 #if 0
ef2136c4e7b2 Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents: 31
diff changeset
447 /* FIMXE: The angle reset doesn't work for some reason for the moment */
ef2136c4e7b2 Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents: 31
diff changeset
448
ef2136c4e7b2 Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents: 31
diff changeset
449 if((num_angle < angle) && (angle != 1)) {
ef2136c4e7b2 Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents: 31
diff changeset
450 printf("OOOOOOO angle ends!\n");
ef2136c4e7b2 Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents: 31
diff changeset
451
ef2136c4e7b2 Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents: 31
diff changeset
452 /* This is to switch back to angle one when we
ef2136c4e7b2 Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents: 31
diff changeset
453 * finish with angles. */
ef2136c4e7b2 Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents: 31
diff changeset
454 dvdnav_angle_change(self, 1);
ef2136c4e7b2 Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents: 31
diff changeset
455 }
ef2136c4e7b2 Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents: 31
diff changeset
456 #endif
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
457
33
ef2136c4e7b2 Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents: 31
diff changeset
458 if(num_angle != 0) {
ef2136c4e7b2 Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents: 31
diff changeset
459 next = nav_pci->nsml_agli.nsml_agl_dsta[angle-1];
ef2136c4e7b2 Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents: 31
diff changeset
460
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
461 if(next != 0) {
33
ef2136c4e7b2 Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents: 31
diff changeset
462 if((next & 0x3fffffff) != 0) {
ef2136c4e7b2 Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents: 31
diff changeset
463 if(next & 0x80000000) {
ef2136c4e7b2 Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents: 31
diff changeset
464 vobu->vobu_next = - (int32_t)(next & 0x3fffffff);
ef2136c4e7b2 Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents: 31
diff changeset
465 } else {
ef2136c4e7b2 Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents: 31
diff changeset
466 vobu->vobu_next = + (int32_t)(next & 0x3fffffff);
ef2136c4e7b2 Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents: 31
diff changeset
467 }
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
468 }
33
ef2136c4e7b2 Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents: 31
diff changeset
469
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
470 } 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
471 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
472 vobu->vobu_length = nav_dsi->sml_pbi.ilvu_ea;
33
ef2136c4e7b2 Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents: 31
diff changeset
473
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
474 if((next & 0x80000000) && (next != 0x7fffffff)) {
33
ef2136c4e7b2 Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents: 31
diff changeset
475 vobu->vobu_next = - (int32_t)(next & 0x3fffffff);
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
476 } else {
33
ef2136c4e7b2 Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents: 31
diff changeset
477 vobu->vobu_next = + (int32_t)(next & 0x3fffffff);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
478 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
479 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
480 }
33
ef2136c4e7b2 Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents: 31
diff changeset
481
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
482 return 1;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
483 }
60
30995ad032cf use new memcopy'less read ahead cache
mroi
parents: 58
diff changeset
484
28
da60d6379f95 Add some comments, FIXMEs.
jcdutton
parents: 26
diff changeset
485 /* 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
486 * The use of this function is optional, with the application programmer
da60d6379f95 Add some comments, FIXMEs.
jcdutton
parents: 26
diff changeset
487 * free to implement their own version of this function
da60d6379f95 Add some comments, FIXMEs.
jcdutton
parents: 26
diff changeset
488 * FIXME: Make the function calls from here public API calls.
da60d6379f95 Add some comments, FIXMEs.
jcdutton
parents: 26
diff changeset
489 */
60
30995ad032cf use new memcopy'less read ahead cache
mroi
parents: 58
diff changeset
490
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
491 dvdnav_status_t dvdnav_get_next_block(dvdnav_t *this, unsigned char *buf,
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
492 int *event, int *len) {
60
30995ad032cf use new memcopy'less read ahead cache
mroi
parents: 58
diff changeset
493 unsigned char *block;
30995ad032cf use new memcopy'less read ahead cache
mroi
parents: 58
diff changeset
494 dvdnav_status_t status;
30995ad032cf use new memcopy'less read ahead cache
mroi
parents: 58
diff changeset
495
30995ad032cf use new memcopy'less read ahead cache
mroi
parents: 58
diff changeset
496 block = buf;
30995ad032cf use new memcopy'less read ahead cache
mroi
parents: 58
diff changeset
497 status = dvdnav_get_next_cache_block(this, &block, event, len);
30995ad032cf use new memcopy'less read ahead cache
mroi
parents: 58
diff changeset
498 if (block != buf) {
30995ad032cf use new memcopy'less read ahead cache
mroi
parents: 58
diff changeset
499 /* we received a block from the cache, copy it, so we can give it back */
30995ad032cf use new memcopy'less read ahead cache
mroi
parents: 58
diff changeset
500 memcpy(buf, block, DVD_VIDEO_LB_LEN);
30995ad032cf use new memcopy'less read ahead cache
mroi
parents: 58
diff changeset
501 dvdnav_free_cache_block(this, block);
30995ad032cf use new memcopy'less read ahead cache
mroi
parents: 58
diff changeset
502 }
30995ad032cf use new memcopy'less read ahead cache
mroi
parents: 58
diff changeset
503 return status;
30995ad032cf use new memcopy'less read ahead cache
mroi
parents: 58
diff changeset
504 }
30995ad032cf use new memcopy'less read ahead cache
mroi
parents: 58
diff changeset
505
30995ad032cf use new memcopy'less read ahead cache
mroi
parents: 58
diff changeset
506 dvdnav_status_t dvdnav_get_next_cache_block(dvdnav_t *this, unsigned char **buf,
30995ad032cf use new memcopy'less read ahead cache
mroi
parents: 58
diff changeset
507 int *event, int *len) {
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
508 dvd_state_t *state;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
509 int result;
60
30995ad032cf use new memcopy'less read ahead cache
mroi
parents: 58
diff changeset
510 if(!this || !event || !len || !buf || !*buf) {
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
511 printerr("Passed a NULL pointer");
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
512 return S_ERR;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
513 }
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
514 pthread_mutex_lock(&this->vm_lock);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
515
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
516 if(!this->started) {
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
517 /* Start the VM */
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
518 vm_start(this->vm);
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
519 this->started = 1;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
520 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
521
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
522 state = &(this->vm->state);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
523 (*event) = DVDNAV_NOP;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
524 (*len) = 0;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
525
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
526 /* Check the STOP flag */
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
527 if(this->stop) {
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
528 (*event) = DVDNAV_STOP;
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
529 pthread_mutex_unlock(&this->vm_lock);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
530 return S_OK;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
531 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
532
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
533 /* Check the STILLFRAME flag */
42
131ad65a2398 Removed more C++ style comments
richwareham
parents: 39
diff changeset
534 /* FIXME: Still cell, not still frame */
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
535 if(this->position_current.still != 0) {
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
536 dvdnav_still_event_t still_event;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
537
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
538 still_event.length = this->position_current.still;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
539
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
540 (*event) = DVDNAV_STILL_FRAME;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
541 (*len) = sizeof(dvdnav_still_event_t);
60
30995ad032cf use new memcopy'less read ahead cache
mroi
parents: 58
diff changeset
542 memcpy(*buf, &(still_event), sizeof(dvdnav_still_event_t));
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
543
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
544 pthread_mutex_unlock(&this->vm_lock);
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
545 return S_OK;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
546 }
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
547
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
548 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
549 /**********
76
0e2abe7083de more consistent console output
mroi
parents: 73
diff changeset
550 fprintf(MSG_OUT, "libdvdnav: POS-NEXT ");
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
551 vm_position_print(this->vm, &this->position_next);
76
0e2abe7083de more consistent console output
mroi
parents: 73
diff changeset
552 fprintf(MSG_OUT, "libdvdnav: POS-CUR ");
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
553 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
554 **********/
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
555
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
556 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
557 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
558 (*event) = DVDNAV_HOP_CHANNEL;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
559 (*len) = 0;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
560 pthread_mutex_unlock(&this->vm_lock);
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
561 return S_OK;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
562 }
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
563
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
564
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
565
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
566 if(this->spu_clut_changed) {
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
567 (*event) = DVDNAV_SPU_CLUT_CHANGE;
31
8b08ee66cbff Quiet please!!!
jcdutton
parents: 30
diff changeset
568 #ifdef LOG_DEBUG
76
0e2abe7083de more consistent console output
mroi
parents: 73
diff changeset
569 fprintf(MSG_OUT, "libdvdnav: SPU_CLUT_CHANGE\n");
31
8b08ee66cbff Quiet please!!!
jcdutton
parents: 30
diff changeset
570 #endif
73
a23d50ba81d3 update spu clut, spu channel and audio channel more often
mroi
parents: 67
diff changeset
571 (*len) = 16 * sizeof(uint32_t);
60
30995ad032cf use new memcopy'less read ahead cache
mroi
parents: 58
diff changeset
572 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
573 this->spu_clut_changed = 0;
31
8b08ee66cbff Quiet please!!!
jcdutton
parents: 30
diff changeset
574 #ifdef LOG_DEBUG
76
0e2abe7083de more consistent console output
mroi
parents: 73
diff changeset
575 fprintf(MSG_OUT, "libdvdnav: SPU_CLUT_CHANGE returning S_OK\n");
31
8b08ee66cbff Quiet please!!!
jcdutton
parents: 30
diff changeset
576 #endif
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
577 pthread_mutex_unlock(&this->vm_lock);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
578 return S_OK;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
579 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
580
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
581 if(this->position_current.spu_channel != this->position_next.spu_channel) {
55
5674fbd44f26 report all spu types (widescreen, letterbox and pan&scan), not widescreen
mroi
parents: 54
diff changeset
582 dvdnav_spu_stream_change_event_t stream_change;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
583 (*event) = DVDNAV_SPU_STREAM_CHANGE;
31
8b08ee66cbff Quiet please!!!
jcdutton
parents: 30
diff changeset
584 #ifdef LOG_DEBUG
76
0e2abe7083de more consistent console output
mroi
parents: 73
diff changeset
585 fprintf(MSG_OUT, "libdvdnav: SPU_STREAM_CHANGE\n");
31
8b08ee66cbff Quiet please!!!
jcdutton
parents: 30
diff changeset
586 #endif
55
5674fbd44f26 report all spu types (widescreen, letterbox and pan&scan), not widescreen
mroi
parents: 54
diff changeset
587 (*len) = sizeof(dvdnav_spu_stream_change_event_t);
5674fbd44f26 report all spu types (widescreen, letterbox and pan&scan), not widescreen
mroi
parents: 54
diff changeset
588 stream_change.physical_wide = vm_get_subp_active_stream(this->vm, 0);
5674fbd44f26 report all spu types (widescreen, letterbox and pan&scan), not widescreen
mroi
parents: 54
diff changeset
589 stream_change.physical_letterbox = vm_get_subp_active_stream(this->vm, 1);
5674fbd44f26 report all spu types (widescreen, letterbox and pan&scan), not widescreen
mroi
parents: 54
diff changeset
590 stream_change.physical_pan_scan = vm_get_subp_active_stream(this->vm, 2);
60
30995ad032cf use new memcopy'less read ahead cache
mroi
parents: 58
diff changeset
591 memcpy(*buf, &(stream_change), sizeof( dvdnav_spu_stream_change_event_t));
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
592 this->position_current.spu_channel = this->position_next.spu_channel;
31
8b08ee66cbff Quiet please!!!
jcdutton
parents: 30
diff changeset
593 #ifdef LOG_DEBUG
76
0e2abe7083de more consistent console output
mroi
parents: 73
diff changeset
594 fprintf(MSG_OUT, "libdvdnav: SPU_STREAM_CHANGE stream_id_wide=%d\n",stream_change.physical_wide);
0e2abe7083de more consistent console output
mroi
parents: 73
diff changeset
595 fprintf(MSG_OUT, "libdvdnav: SPU_STREAM_CHANGE stream_id_letterbox=%d\n",stream_change.physical_letterbox);
0e2abe7083de more consistent console output
mroi
parents: 73
diff changeset
596 fprintf(MSG_OUT, "libdvdnav: SPU_STREAM_CHANGE stream_id_pan_scan=%d\n",stream_change.physical_pan_scan);
31
8b08ee66cbff Quiet please!!!
jcdutton
parents: 30
diff changeset
597 #endif
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
598 pthread_mutex_unlock(&this->vm_lock);
58
18af52093d13 * fix debug messages
mroi
parents: 55
diff changeset
599 if (stream_change.physical_wide != -1 &&
18af52093d13 * fix debug messages
mroi
parents: 55
diff changeset
600 stream_change.physical_letterbox != -1 &&
18af52093d13 * fix debug messages
mroi
parents: 55
diff changeset
601 stream_change.physical_pan_scan != -1) {
18af52093d13 * fix debug messages
mroi
parents: 55
diff changeset
602 #ifdef LOG_DEBUG
76
0e2abe7083de more consistent console output
mroi
parents: 73
diff changeset
603 fprintf(MSG_OUT, "libdvdnav: SPU_STREAM_CHANGE returning S_OK\n");
58
18af52093d13 * fix debug messages
mroi
parents: 55
diff changeset
604 #endif
18af52093d13 * fix debug messages
mroi
parents: 55
diff changeset
605 return S_OK;
18af52093d13 * fix debug messages
mroi
parents: 55
diff changeset
606 }
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
607 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
608
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
609 if(this->position_current.audio_channel != this->position_next.audio_channel) {
55
5674fbd44f26 report all spu types (widescreen, letterbox and pan&scan), not widescreen
mroi
parents: 54
diff changeset
610 dvdnav_audio_stream_change_event_t stream_change;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
611 (*event) = DVDNAV_AUDIO_STREAM_CHANGE;
31
8b08ee66cbff Quiet please!!!
jcdutton
parents: 30
diff changeset
612 #ifdef LOG_DEBUG
76
0e2abe7083de more consistent console output
mroi
parents: 73
diff changeset
613 fprintf(MSG_OUT, "libdvdnav: AUDIO_STREAM_CHANGE\n");
31
8b08ee66cbff Quiet please!!!
jcdutton
parents: 30
diff changeset
614 #endif
55
5674fbd44f26 report all spu types (widescreen, letterbox and pan&scan), not widescreen
mroi
parents: 54
diff changeset
615 (*len) = sizeof(dvdnav_audio_stream_change_event_t);
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
616 stream_change.physical= vm_get_audio_active_stream( this->vm );
60
30995ad032cf use new memcopy'less read ahead cache
mroi
parents: 58
diff changeset
617 memcpy(*buf, &(stream_change), sizeof( dvdnav_audio_stream_change_event_t));
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
618 this->position_current.audio_channel = this->position_next.audio_channel;
31
8b08ee66cbff Quiet please!!!
jcdutton
parents: 30
diff changeset
619 #ifdef LOG_DEBUG
76
0e2abe7083de more consistent console output
mroi
parents: 73
diff changeset
620 fprintf(MSG_OUT, "libdvdnav: AUDIO_STREAM_CHANGE stream_id=%d returning S_OK\n",stream_change.physical);
31
8b08ee66cbff Quiet please!!!
jcdutton
parents: 30
diff changeset
621 #endif
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
622 pthread_mutex_unlock(&this->vm_lock);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
623 return S_OK;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
624 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
625
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
626 /* Check the HIGHLIGHT flag */
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
627 /* FIXME: Use BUTTON instead of HIGHLIGHT. */
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
628 if(this->position_current.button != this->position_next.button) {
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
629 dvdnav_highlight_event_t hevent;
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
630
30
630b6733e492 Some more cleanups.
jcdutton
parents: 28
diff changeset
631 hevent.display = 1;
630b6733e492 Some more cleanups.
jcdutton
parents: 28
diff changeset
632 hevent.buttonN = this->position_next.button;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
633
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
634 this->position_current.button = this->position_next.button;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
635
30
630b6733e492 Some more cleanups.
jcdutton
parents: 28
diff changeset
636 (*event) = DVDNAV_HIGHLIGHT;
630b6733e492 Some more cleanups.
jcdutton
parents: 28
diff changeset
637 (*len) = sizeof(hevent);
60
30995ad032cf use new memcopy'less read ahead cache
mroi
parents: 58
diff changeset
638 memcpy(*buf, &(hevent), sizeof(hevent));
30
630b6733e492 Some more cleanups.
jcdutton
parents: 28
diff changeset
639 pthread_mutex_unlock(&this->vm_lock);
630b6733e492 Some more cleanups.
jcdutton
parents: 28
diff changeset
640 return S_OK;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
641 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
642
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
643 /* 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
644 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
645 (this->position_current.domain != this->position_next.domain)) {
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
646 dvd_read_domain_t domain;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
647 int vtsN;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
648 dvdnav_vts_change_event_t vts_event;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
649
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
650 if(this->file) {
34
1f29402ef2ef 'Objectified' the read-ahead cache in preparation to implement a 'proper' threaded cache a-la that recommended in the DVD Demystified book.
richwareham
parents: 33
diff changeset
651 dvdnav_read_cache_clear(this->cache);
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
652 DVDCloseFile(this->file);
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
653 this->file = NULL;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
654 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
655
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
656 vts_event.old_vtsN = this->open_vtsN;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
657 vts_event.old_domain = this->open_domain;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
658
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
659 /* 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
660 switch(this->position_next.domain) {
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
661 case FP_DOMAIN:
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
662 case VMGM_DOMAIN:
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
663 domain = DVD_READ_MENU_VOBS;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
664 vtsN = 0;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
665 break;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
666 case VTSM_DOMAIN:
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
667 domain = DVD_READ_MENU_VOBS;
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
668 vtsN = this->position_next.vts;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
669 break;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
670 case VTS_DOMAIN:
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
671 domain = DVD_READ_TITLE_VOBS;
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
672 vtsN = this->position_next.vts;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
673 break;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
674 default:
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
675 printerr("Unknown domain when changing VTS.");
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
676 pthread_mutex_unlock(&this->vm_lock);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
677 return S_ERR;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
678 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
679
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
680 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
681 this->position_current.domain = this->position_next.domain;
34
1f29402ef2ef 'Objectified' the read-ahead cache in preparation to implement a 'proper' threaded cache a-la that recommended in the DVD Demystified book.
richwareham
parents: 33
diff changeset
682 dvdnav_read_cache_clear(this->cache);
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
683 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
684 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
685 vts_event.new_domain = this->position_next.domain;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
686
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
687 /* 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
688 if(this->file == NULL) {
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
689 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
690 pthread_mutex_unlock(&this->vm_lock);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
691 return S_ERR;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
692 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
693
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
694 /* File opened successfully so return a VTS change event */
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
695 (*event) = DVDNAV_VTS_CHANGE;
60
30995ad032cf use new memcopy'less read ahead cache
mroi
parents: 58
diff changeset
696 memcpy(*buf, &(vts_event), sizeof(vts_event));
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
697 (*len) = sizeof(vts_event);
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
698
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
699 /* On a VTS change, we want to disable any highlights which
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
700 * 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
701 this->spu_clut_changed = 1;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
702 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
703 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
704 this->position_current.audio_channel = -1; /* Force an update */;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
705
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
706 pthread_mutex_unlock(&this->vm_lock);
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
707 return S_OK;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
708 }
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
709 /* 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
710 if( (this->position_current.cell != this->position_next.cell) ||
50
578ce1d41479 Rename some of the functions in vm.c to help readability.
jcdutton
parents: 45
diff changeset
711 (this->position_current.cell_restart != this->position_next.cell_restart) ||
24
870a0a1eee41 Re-implemented seeking.
jcdutton
parents: 23
diff changeset
712 (this->position_current.vobu_start != this->position_next.vobu_start) ||
870a0a1eee41 Re-implemented seeking.
jcdutton
parents: 23
diff changeset
713 (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
714 this->position_current.cell = this->position_next.cell;
50
578ce1d41479 Rename some of the functions in vm.c to help readability.
jcdutton
parents: 45
diff changeset
715 this->position_current.cell_restart = this->position_next.cell_restart;
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
716 /* 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
717 this->position_current.vobu_start = this->position_next.vobu_start;
24
870a0a1eee41 Re-implemented seeking.
jcdutton
parents: 23
diff changeset
718 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
719 /* 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
720 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
721 /* 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
722 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
723 this->vobu.vobu_length = 0;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
724 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
725 /* 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
726 (*event) = DVDNAV_CELL_CHANGE;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
727 (*len) = 0;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
728 pthread_mutex_unlock(&this->vm_lock);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
729 return S_OK;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
730 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
731
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
732
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
733 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
734 /* End of VOBU */
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
735
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
736 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
737 /* End of Cell from NAV DSI info */
31
8b08ee66cbff Quiet please!!!
jcdutton
parents: 30
diff changeset
738 #ifdef LOG_DEBUG
76
0e2abe7083de more consistent console output
mroi
parents: 73
diff changeset
739 fprintf(MSG_OUT, "libdvdnav: Still set to %x\n", this->position_next.still);
31
8b08ee66cbff Quiet please!!!
jcdutton
parents: 30
diff changeset
740 #endif
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
741 this->position_current.still = this->position_next.still;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
742
23
c2d40c38e12f Name stills work better.
jcdutton
parents: 22
diff changeset
743 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
744 vm_get_next_cell(this->vm);
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
745 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
746 /* FIXME: Need to set vobu_start, vobu_next */
23
c2d40c38e12f Name stills work better.
jcdutton
parents: 22
diff changeset
747 this->position_current.still = 0; /* still gets activated at end of cell */
c2d40c38e12f Name stills work better.
jcdutton
parents: 22
diff changeset
748 this->skip_still = 0;
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
749 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
750 this->position_current.vobu_start = this->position_next.vobu_start;
24
870a0a1eee41 Re-implemented seeking.
jcdutton
parents: 23
diff changeset
751 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
752 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
753 /* 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
754 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
755 this->vobu.vobu_length = 0;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
756 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
757 /* Make blockN > vobu_next to do expected_nav */
73
a23d50ba81d3 update spu clut, spu channel and audio channel more often
mroi
parents: 67
diff changeset
758 /* update the spu palette on PGC changes */
a23d50ba81d3 update spu clut, spu channel and audio channel more often
mroi
parents: 67
diff changeset
759 this->spu_clut_changed = 1;
a23d50ba81d3 update spu clut, spu channel and audio channel more often
mroi
parents: 67
diff changeset
760 this->position_current.spu_channel = -1; /* Force an update */
a23d50ba81d3 update spu clut, spu channel and audio channel more often
mroi
parents: 67
diff changeset
761 this->position_current.audio_channel = -1; /* Force an update */;
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
762 (*event) = DVDNAV_CELL_CHANGE;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
763 (*len) = 0;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
764 pthread_mutex_unlock(&this->vm_lock);
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
765 return S_OK;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
766 } else {
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
767 dvdnav_still_event_t still_event;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
768 still_event.length = this->position_current.still;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
769 (*event) = DVDNAV_STILL_FRAME;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
770 (*len) = sizeof(dvdnav_still_event_t);
60
30995ad032cf use new memcopy'less read ahead cache
mroi
parents: 58
diff changeset
771 memcpy(*buf, &(still_event), sizeof(dvdnav_still_event_t));
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
772 pthread_mutex_unlock(&this->vm_lock);
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
773 return S_OK;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
774 }
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
775
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
776 /* Only set still after whole VOBU has been output. */
42
131ad65a2398 Removed more C++ style comments
richwareham
parents: 39
diff changeset
777 /*
131ad65a2398 Removed more C++ style comments
richwareham
parents: 39
diff changeset
778 if(this->position_next.still != 0) {
131ad65a2398 Removed more C++ style comments
richwareham
parents: 39
diff changeset
779 this->position_current.still = this->position_next.still;
131ad65a2398 Removed more C++ style comments
richwareham
parents: 39
diff changeset
780 }
131ad65a2398 Removed more C++ style comments
richwareham
parents: 39
diff changeset
781 */
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
782
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
783 }
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
784 /* Perform the jump if necessary (this is always a
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
785 * VOBU boundary). */
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
786
45
7bf97b8922b4 Revert back to old read_cache method.
jcdutton
parents: 43
diff changeset
787 //result = DVDReadBlocks(this->file, this->vobu.vobu_start + this->vobu.vobu_next, 1, buf);
7bf97b8922b4 Revert back to old read_cache method.
jcdutton
parents: 43
diff changeset
788 result = dvdnav_read_cache_block(this->cache, this->vobu.vobu_start + this->vobu.vobu_next, 1, buf);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
789
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
790 if(result <= 0) {
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
791 printerr("Error reading NAV packet.");
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
792 pthread_mutex_unlock(&this->vm_lock);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
793 return S_ERR;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
794 }
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
795 /* Decode nav into pci and dsi. */
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
796 /* Then get next VOBU info. */
60
30995ad032cf use new memcopy'less read ahead cache
mroi
parents: 58
diff changeset
797 if(dvdnav_decode_packet(this, *buf, &this->dsi, &this->pci) == 0) {
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
798 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
799 pthread_mutex_unlock(&this->vm_lock);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
800 return S_ERR;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
801 }
33
ef2136c4e7b2 Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents: 31
diff changeset
802 dvdnav_get_vobu(this, &this->dsi,&this->pci, &this->vobu);
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
803 this->vobu.blockN=1;
28
da60d6379f95 Add some comments, FIXMEs.
jcdutton
parents: 26
diff changeset
804 /* 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
805 * 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
806 * This should be implemented with a new Public API call.
da60d6379f95 Add some comments, FIXMEs.
jcdutton
parents: 26
diff changeset
807 */
45
7bf97b8922b4 Revert back to old read_cache method.
jcdutton
parents: 43
diff changeset
808 /* We cache one past the end of the VOBU,
7bf97b8922b4 Revert back to old read_cache method.
jcdutton
parents: 43
diff changeset
809 * in the hope it might catch the next NAV packet as well.
7bf97b8922b4 Revert back to old read_cache method.
jcdutton
parents: 43
diff changeset
810 * This reduces the amount of read commands sent to the DVD device.
7bf97b8922b4 Revert back to old read_cache method.
jcdutton
parents: 43
diff changeset
811 * A cache miss will only happen for 3 reasons.
7bf97b8922b4 Revert back to old read_cache method.
jcdutton
parents: 43
diff changeset
812 * 1) Seeking
7bf97b8922b4 Revert back to old read_cache method.
jcdutton
parents: 43
diff changeset
813 * 2) Menu change
7bf97b8922b4 Revert back to old read_cache method.
jcdutton
parents: 43
diff changeset
814 * 3) The next VOBU does not immeadiately follow the current one. E.g. Multi Angles, ILVU.
7bf97b8922b4 Revert back to old read_cache method.
jcdutton
parents: 43
diff changeset
815 */
7bf97b8922b4 Revert back to old read_cache method.
jcdutton
parents: 43
diff changeset
816 dvdnav_pre_cache_blocks(this->cache, this->vobu.vobu_start+1, this->vobu.vobu_length+1);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
817
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
818 /* Successfully got a NAV packet */
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
819 (*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
820 (*len) = 2048;
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
821 pthread_mutex_unlock(&this->vm_lock);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
822 return S_OK;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
823 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
824
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
825 /* 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
826 if(!this->file) {
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
827 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
828 pthread_mutex_unlock(&this->vm_lock);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
829 return S_ERR;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
830 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
831
34
1f29402ef2ef 'Objectified' the read-ahead cache in preparation to implement a 'proper' threaded cache a-la that recommended in the DVD Demystified book.
richwareham
parents: 33
diff changeset
832 result = dvdnav_read_cache_block(this->cache, this->vobu.vobu_start + this->vobu.blockN, 1, buf);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
833 if(result <= 0) {
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
834 printerr("Error reading from DVD.");
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
835 pthread_mutex_unlock(&this->vm_lock);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
836 return S_ERR;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
837 }
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
838 this->vobu.blockN++;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
839 (*len) = 2048;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
840 (*event) = DVDNAV_BLOCK_OK;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
841
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
842 pthread_mutex_unlock(&this->vm_lock);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
843 return S_OK;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
844 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
845
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
846 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
847 audio_attr_t attr;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
848
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
849 if(!this)
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
850 return -1;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
851
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
852 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
853 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
854 pthread_mutex_unlock(&this->vm_lock);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
855
25
df024077cbc1 Why rewrite vm function, use it instead (this remark is for me, of course ;-) ).
f1rmb
parents: 24
diff changeset
856 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
857 return 0xffff;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
858
25
df024077cbc1 Why rewrite vm function, use it instead (this remark is for me, of course ;-) ).
f1rmb
parents: 24
diff changeset
859 return attr.lang_code;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
860 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
861
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
862 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
863 int8_t retval;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
864
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
865 if(!this)
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
866 return -1;
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 pthread_mutex_lock(&this->vm_lock);
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
869 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
870 pthread_mutex_unlock(&this->vm_lock);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
871
21
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
872 return retval;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
873 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
874
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
875 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
876 subp_attr_t attr;
21
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
877
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
878 if(!this)
21
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
879 return -1;
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
880
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
881 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
882 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
883 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
884
25
df024077cbc1 Why rewrite vm function, use it instead (this remark is for me, of course ;-) ).
f1rmb
parents: 24
diff changeset
885 if(attr.type != 1)
21
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
886 return 0xffff;
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
887
25
df024077cbc1 Why rewrite vm function, use it instead (this remark is for me, of course ;-) ).
f1rmb
parents: 24
diff changeset
888 return attr.lang_code;
21
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
889 }
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
890
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
891 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
892 int8_t retval;
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
893
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
894 if(!this)
21
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
895 return -1;
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
896
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
897 pthread_mutex_lock(&this->vm_lock);
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
898 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
899 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
900
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
901 return retval;
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
902 }
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
903
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
904 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
905 int8_t retval;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
906
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
907 if(!this)
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
908 return -1;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
909
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
910 pthread_mutex_lock(&this->vm_lock);
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
911 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
912 pthread_mutex_unlock(&this->vm_lock);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
913
21
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
914 return retval;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
915 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
916
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
917 /* First Play domain. (Menu) */
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
918 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
919 return _dvdnav_is_domain(this, FP_DOMAIN);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
920 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
921 /* Video management Menu domain. (Menu) */
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
922 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
923 return _dvdnav_is_domain(this, VMGM_DOMAIN);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
924 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
925 /* Video Title Menu domain (Menu) */
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
926 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
927 return _dvdnav_is_domain(this, VTSM_DOMAIN);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
928 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
929 /* Video Title domain (playing movie). */
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
930 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
931 return _dvdnav_is_domain(this, VTS_DOMAIN);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
932 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
933
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
934 /* Generally delegate angle information handling to
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
935 * VM */
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
936 dvdnav_status_t dvdnav_angle_change(dvdnav_t *this, int angle) {
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
937 int num, current;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
938
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
939 if(!this) {
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
940 return S_ERR;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
941 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
942
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
943 if(dvdnav_get_angle_info(this, &current, &num) != S_OK) {
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
944 printerr("Error getting angle info");
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
945 return S_ERR;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
946 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
947
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
948 /* Set angle SPRM if valid */
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
949 if((angle > 0) && (angle <= num)) {
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
950 this->vm->state.AGL_REG = angle;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
951 } else {
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
952 printerr("Passed an invalid angle number");
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
953 return S_ERR;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
954 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
955
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
956 return S_OK;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
957 }
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
958 /* 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
959 dvdnav_status_t dvdnav_get_angle_info(dvdnav_t *this, int* current_angle,
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
960 int *number_of_angles) {
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
961 if(!this || !this->vm) {
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
962 return S_ERR;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
963 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
964
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
965 if(!current_angle || !number_of_angles) {
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
966 printerr("Passed a NULL pointer");
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
967 return S_ERR;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
968 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
969
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
970 vm_get_angle_info(this->vm, number_of_angles, current_angle);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
971
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
972 return S_OK;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
973 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
974
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
975 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
976 int *number_of_angles) {
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
977 if(!this || !this->vm) {
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
978 return S_ERR;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
979 }
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
980 *current_angle=this->position_next.cell;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
981 return S_OK;
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
982 }
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
983
67
61c0ee1bbb7a Moved get_current_nav_pci into dvdnac.c, changed example to use it instead of 'home-rolled'
richwareham
parents: 66
diff changeset
984 pci_t* dvdnav_get_current_nav_pci(dvdnav_t *this) {
61c0ee1bbb7a Moved get_current_nav_pci into dvdnac.c, changed example to use it instead of 'home-rolled'
richwareham
parents: 66
diff changeset
985 if(!this || !this->vm) return 0;
61c0ee1bbb7a Moved get_current_nav_pci into dvdnac.c, changed example to use it instead of 'home-rolled'
richwareham
parents: 66
diff changeset
986 return &this->pci;
61c0ee1bbb7a Moved get_current_nav_pci into dvdnac.c, changed example to use it instead of 'home-rolled'
richwareham
parents: 66
diff changeset
987 }
61c0ee1bbb7a Moved get_current_nav_pci into dvdnac.c, changed example to use it instead of 'home-rolled'
richwareham
parents: 66
diff changeset
988
66
2bd4a78eefce Patch from aschultz@cs.uni-magdeburg.de to allow for still-frame 'peek-ahead'
richwareham
parents: 60
diff changeset
989 dsi_t* dvdnav_get_current_nav_dsi(dvdnav_t *this) {
2bd4a78eefce Patch from aschultz@cs.uni-magdeburg.de to allow for still-frame 'peek-ahead'
richwareham
parents: 60
diff changeset
990 if(!this || !this->vm) return 0;
2bd4a78eefce Patch from aschultz@cs.uni-magdeburg.de to allow for still-frame 'peek-ahead'
richwareham
parents: 60
diff changeset
991 return &this->dsi;
2bd4a78eefce Patch from aschultz@cs.uni-magdeburg.de to allow for still-frame 'peek-ahead'
richwareham
parents: 60
diff changeset
992 }
2bd4a78eefce Patch from aschultz@cs.uni-magdeburg.de to allow for still-frame 'peek-ahead'
richwareham
parents: 60
diff changeset
993
2bd4a78eefce Patch from aschultz@cs.uni-magdeburg.de to allow for still-frame 'peek-ahead'
richwareham
parents: 60
diff changeset
994 uint32_t dvdnav_get_next_still_flag(dvdnav_t *this) {
2bd4a78eefce Patch from aschultz@cs.uni-magdeburg.de to allow for still-frame 'peek-ahead'
richwareham
parents: 60
diff changeset
995 if(!this || !this->vm) {
2bd4a78eefce Patch from aschultz@cs.uni-magdeburg.de to allow for still-frame 'peek-ahead'
richwareham
parents: 60
diff changeset
996 return S_ERR;
2bd4a78eefce Patch from aschultz@cs.uni-magdeburg.de to allow for still-frame 'peek-ahead'
richwareham
parents: 60
diff changeset
997 }
2bd4a78eefce Patch from aschultz@cs.uni-magdeburg.de to allow for still-frame 'peek-ahead'
richwareham
parents: 60
diff changeset
998 return this->position_next.still;
2bd4a78eefce Patch from aschultz@cs.uni-magdeburg.de to allow for still-frame 'peek-ahead'
richwareham
parents: 60
diff changeset
999 }
2bd4a78eefce Patch from aschultz@cs.uni-magdeburg.de to allow for still-frame 'peek-ahead'
richwareham
parents: 60
diff changeset
1000
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1001 /*
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1002 * $Log$
92
82af243658bd fix memleaks in dvdnav_open
mroi
parents: 89
diff changeset
1003 * Revision 1.35 2002/09/05 12:55:05 mroi
82af243658bd fix memleaks in dvdnav_open
mroi
parents: 89
diff changeset
1004 * fix memleaks in dvdnav_open
82af243658bd fix memleaks in dvdnav_open
mroi
parents: 89
diff changeset
1005 *
89
0fbef4901e2c Add a comment so I can tell which version of the CVS a user is using.
jcdutton
parents: 84
diff changeset
1006 * Revision 1.34 2002/09/03 00:41:48 jcdutton
0fbef4901e2c Add a comment so I can tell which version of the CVS a user is using.
jcdutton
parents: 84
diff changeset
1007 * Add a comment so I can tell which version of the CVS a user is using.
0fbef4901e2c Add a comment so I can tell which version of the CVS a user is using.
jcdutton
parents: 84
diff changeset
1008 * Also add a FIXME to remind me to fix the Chapter number display.
0fbef4901e2c Add a comment so I can tell which version of the CVS a user is using.
jcdutton
parents: 84
diff changeset
1009 *
84
ba1121a07120 Properly seed the DVD VM Instruction rand().
jcdutton
parents: 82
diff changeset
1010 * Revision 1.33 2002/08/31 11:05:27 jcdutton
ba1121a07120 Properly seed the DVD VM Instruction rand().
jcdutton
parents: 82
diff changeset
1011 * Properly seed the DVD VM Instruction rand().
ba1121a07120 Properly seed the DVD VM Instruction rand().
jcdutton
parents: 82
diff changeset
1012 *
82
033f011d8152 Improve some debug messages.
jcdutton
parents: 76
diff changeset
1013 * Revision 1.32 2002/08/31 02:50:27 jcdutton
033f011d8152 Improve some debug messages.
jcdutton
parents: 76
diff changeset
1014 * Improve some debug messages.
033f011d8152 Improve some debug messages.
jcdutton
parents: 76
diff changeset
1015 * Add some comments about dvdnav_open memory leaks.
033f011d8152 Improve some debug messages.
jcdutton
parents: 76
diff changeset
1016 *
76
0e2abe7083de more consistent console output
mroi
parents: 73
diff changeset
1017 * Revision 1.31 2002/08/27 19:15:08 mroi
0e2abe7083de more consistent console output
mroi
parents: 73
diff changeset
1018 * more consistent console output
0e2abe7083de more consistent console output
mroi
parents: 73
diff changeset
1019 *
73
a23d50ba81d3 update spu clut, spu channel and audio channel more often
mroi
parents: 67
diff changeset
1020 * Revision 1.30 2002/08/09 21:34:27 mroi
a23d50ba81d3 update spu clut, spu channel and audio channel more often
mroi
parents: 67
diff changeset
1021 * update spu clut, spu channel and audio channel more often
a23d50ba81d3 update spu clut, spu channel and audio channel more often
mroi
parents: 67
diff changeset
1022 *
67
61c0ee1bbb7a Moved get_current_nav_pci into dvdnac.c, changed example to use it instead of 'home-rolled'
richwareham
parents: 66
diff changeset
1023 * Revision 1.29 2002/07/25 14:51:40 richwareham
61c0ee1bbb7a Moved get_current_nav_pci into dvdnac.c, changed example to use it instead of 'home-rolled'
richwareham
parents: 66
diff changeset
1024 * Moved get_current_nav_pci into dvdnac.c, changed example to use it instead of 'home-rolled'
61c0ee1bbb7a Moved get_current_nav_pci into dvdnac.c, changed example to use it instead of 'home-rolled'
richwareham
parents: 66
diff changeset
1025 * check_packet.
61c0ee1bbb7a Moved get_current_nav_pci into dvdnac.c, changed example to use it instead of 'home-rolled'
richwareham
parents: 66
diff changeset
1026 *
66
2bd4a78eefce Patch from aschultz@cs.uni-magdeburg.de to allow for still-frame 'peek-ahead'
richwareham
parents: 60
diff changeset
1027 * Revision 1.28 2002/07/25 14:42:33 richwareham
2bd4a78eefce Patch from aschultz@cs.uni-magdeburg.de to allow for still-frame 'peek-ahead'
richwareham
parents: 60
diff changeset
1028 * Patch from aschultz@cs.uni-magdeburg.de to allow for still-frame 'peek-ahead'
2bd4a78eefce Patch from aschultz@cs.uni-magdeburg.de to allow for still-frame 'peek-ahead'
richwareham
parents: 60
diff changeset
1029 *
60
30995ad032cf use new memcopy'less read ahead cache
mroi
parents: 58
diff changeset
1030 * Revision 1.27 2002/07/12 15:46:44 mroi
30995ad032cf use new memcopy'less read ahead cache
mroi
parents: 58
diff changeset
1031 * use new memcopy'less read ahead cache
30995ad032cf use new memcopy'less read ahead cache
mroi
parents: 58
diff changeset
1032 *
58
18af52093d13 * fix debug messages
mroi
parents: 55
diff changeset
1033 * Revision 1.26 2002/07/06 16:24:54 mroi
18af52093d13 * fix debug messages
mroi
parents: 55
diff changeset
1034 * * fix debug messages
18af52093d13 * fix debug messages
mroi
parents: 55
diff changeset
1035 * * send spu stream change event only, when there are new streams
18af52093d13 * fix debug messages
mroi
parents: 55
diff changeset
1036 * (should fix problems with Terminator disk 2)
18af52093d13 * fix debug messages
mroi
parents: 55
diff changeset
1037 *
55
5674fbd44f26 report all spu types (widescreen, letterbox and pan&scan), not widescreen
mroi
parents: 54
diff changeset
1038 * Revision 1.25 2002/07/05 14:18:54 mroi
5674fbd44f26 report all spu types (widescreen, letterbox and pan&scan), not widescreen
mroi
parents: 54
diff changeset
1039 * report all spu types (widescreen, letterbox and pan&scan), not widescreen
5674fbd44f26 report all spu types (widescreen, letterbox and pan&scan), not widescreen
mroi
parents: 54
diff changeset
1040 * only and report the stream's scale permissions to detect pan&scan material
5674fbd44f26 report all spu types (widescreen, letterbox and pan&scan), not widescreen
mroi
parents: 54
diff changeset
1041 *
54
cea44c0d638a Add more debug info for Menu language selection.
jcdutton
parents: 50
diff changeset
1042 * Revision 1.24 2002/07/05 01:42:30 jcdutton
cea44c0d638a Add more debug info for Menu language selection.
jcdutton
parents: 50
diff changeset
1043 * Add more debug info for Menu language selection.
cea44c0d638a Add more debug info for Menu language selection.
jcdutton
parents: 50
diff changeset
1044 * Only do vm_start when we have to.
cea44c0d638a Add more debug info for Menu language selection.
jcdutton
parents: 50
diff changeset
1045 *
50
578ce1d41479 Rename some of the functions in vm.c to help readability.
jcdutton
parents: 45
diff changeset
1046 * Revision 1.23 2002/07/02 22:57:09 jcdutton
578ce1d41479 Rename some of the functions in vm.c to help readability.
jcdutton
parents: 45
diff changeset
1047 * Rename some of the functions in vm.c to help readability.
578ce1d41479 Rename some of the functions in vm.c to help readability.
jcdutton
parents: 45
diff changeset
1048 * Hopefully fix __FUNCTION__ problem. Use __func_ as recommended in C99.
578ce1d41479 Rename some of the functions in vm.c to help readability.
jcdutton
parents: 45
diff changeset
1049 * Fix bug where libdvdnav would not immeadiately replay the same cell due to menu buttons.
578ce1d41479 Rename some of the functions in vm.c to help readability.
jcdutton
parents: 45
diff changeset
1050 *
45
7bf97b8922b4 Revert back to old read_cache method.
jcdutton
parents: 43
diff changeset
1051 * Revision 1.22 2002/06/25 13:37:11 jcdutton
7bf97b8922b4 Revert back to old read_cache method.
jcdutton
parents: 43
diff changeset
1052 * Revert back to old read_cache method.
7bf97b8922b4 Revert back to old read_cache method.
jcdutton
parents: 43
diff changeset
1053 * Some new optimizations added to the old read_cache method, thus reducing the amount of calls to read blocks from the DVD device.
7bf97b8922b4 Revert back to old read_cache method.
jcdutton
parents: 43
diff changeset
1054 *
43
0ba15bf3dc25 Biiiiiiig change to let doxygen generate some docs for the library. Note that I'm in no way sure that the autoconf stuff plays nice.
richwareham
parents: 42
diff changeset
1055 * Revision 1.21 2002/06/06 15:03:09 richwareham
0ba15bf3dc25 Biiiiiiig change to let doxygen generate some docs for the library. Note that I'm in no way sure that the autoconf stuff plays nice.
richwareham
parents: 42
diff changeset
1056 * Biiiiiiig change to let doxygen generate some docs for the library. Note that I'm in no way sure that the autoconf stuff plays nice.
0ba15bf3dc25 Biiiiiiig change to let doxygen generate some docs for the library. Note that I'm in no way sure that the autoconf stuff plays nice.
richwareham
parents: 42
diff changeset
1057 *
42
131ad65a2398 Removed more C++ style comments
richwareham
parents: 39
diff changeset
1058 * Revision 1.20 2002/06/04 13:35:16 richwareham
131ad65a2398 Removed more C++ style comments
richwareham
parents: 39
diff changeset
1059 * Removed more C++ style comments
131ad65a2398 Removed more C++ style comments
richwareham
parents: 39
diff changeset
1060 *
39
2433a5a8069e First draft of removing HAVE_DVDREAD9
richwareham
parents: 34
diff changeset
1061 * Revision 1.19 2002/05/30 23:15:14 richwareham
2433a5a8069e First draft of removing HAVE_DVDREAD9
richwareham
parents: 34
diff changeset
1062 * First draft of removing HAVE_DVDREAD9
2433a5a8069e First draft of removing HAVE_DVDREAD9
richwareham
parents: 34
diff changeset
1063 *
34
1f29402ef2ef 'Objectified' the read-ahead cache in preparation to implement a 'proper' threaded cache a-la that recommended in the DVD Demystified book.
richwareham
parents: 33
diff changeset
1064 * Revision 1.18 2002/05/30 09:52:29 richwareham
1f29402ef2ef 'Objectified' the read-ahead cache in preparation to implement a 'proper' threaded cache a-la that recommended in the DVD Demystified book.
richwareham
parents: 33
diff changeset
1065 * 'Objectified' the read-ahead cache in preparation to implement a 'proper' threaded cache a-la that recommended in the DVD Demystified book.
1f29402ef2ef 'Objectified' the read-ahead cache in preparation to implement a 'proper' threaded cache a-la that recommended in the DVD Demystified book.
richwareham
parents: 33
diff changeset
1066 *
33
ef2136c4e7b2 Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents: 31
diff changeset
1067 * Revision 1.17 2002/05/09 11:57:24 richwareham
ef2136c4e7b2 Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents: 31
diff changeset
1068 * Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
ef2136c4e7b2 Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus)
richwareham
parents: 31
diff changeset
1069 *
31
8b08ee66cbff Quiet please!!!
jcdutton
parents: 30
diff changeset
1070 * Revision 1.16 2002/04/24 21:15:25 jcdutton
8b08ee66cbff Quiet please!!!
jcdutton
parents: 30
diff changeset
1071 * Quiet please!!!
8b08ee66cbff Quiet please!!!
jcdutton
parents: 30
diff changeset
1072 *
30
630b6733e492 Some more cleanups.
jcdutton
parents: 28
diff changeset
1073 * Revision 1.15 2002/04/24 00:47:46 jcdutton
630b6733e492 Some more cleanups.
jcdutton
parents: 28
diff changeset
1074 * Some more cleanups.
630b6733e492 Some more cleanups.
jcdutton
parents: 28
diff changeset
1075 * Improve button passing.
630b6733e492 Some more cleanups.
jcdutton
parents: 28
diff changeset
1076 *
28
da60d6379f95 Add some comments, FIXMEs.
jcdutton
parents: 26
diff changeset
1077 * Revision 1.14 2002/04/23 13:26:08 jcdutton
da60d6379f95 Add some comments, FIXMEs.
jcdutton
parents: 26
diff changeset
1078 * Add some comments, FIXMEs.
da60d6379f95 Add some comments, FIXMEs.
jcdutton
parents: 26
diff changeset
1079 * 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
1080 *
26
794d2e16a4d4 Removed un-needed variables.
jcdutton
parents: 25
diff changeset
1081 * Revision 1.13 2002/04/23 12:55:40 jcdutton
794d2e16a4d4 Removed un-needed variables.
jcdutton
parents: 25
diff changeset
1082 * Removed un-needed variables.
794d2e16a4d4 Removed un-needed variables.
jcdutton
parents: 25
diff changeset
1083 * General Clean up.
794d2e16a4d4 Removed un-needed variables.
jcdutton
parents: 25
diff changeset
1084 *
25
df024077cbc1 Why rewrite vm function, use it instead (this remark is for me, of course ;-) ).
f1rmb
parents: 24
diff changeset
1085 * 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
1086 * 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
1087 * 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
1088 *
24
870a0a1eee41 Re-implemented seeking.
jcdutton
parents: 23
diff changeset
1089 * Revision 1.11 2002/04/23 02:12:27 jcdutton
870a0a1eee41 Re-implemented seeking.
jcdutton
parents: 23
diff changeset
1090 * Re-implemented seeking.
870a0a1eee41 Re-implemented seeking.
jcdutton
parents: 23
diff changeset
1091 *
23
c2d40c38e12f Name stills work better.
jcdutton
parents: 22
diff changeset
1092 * Revision 1.10 2002/04/23 00:07:16 jcdutton
c2d40c38e12f Name stills work better.
jcdutton
parents: 22
diff changeset
1093 * Name stills work better.
c2d40c38e12f Name stills work better.
jcdutton
parents: 22
diff changeset
1094 *
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 21
diff changeset
1095 * 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
1096 * 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
1097 *
21
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
1098 * 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
1099 * 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
1100 * inspired from libogle ;-).
d2d73f2ad8d3 Change/fix SPU active stream id. Same for audio. Few new functions, largely
f1rmb
parents: 17
diff changeset
1101 *
17
a68c6da98b73 Actually fix the const this time!
jcdutton
parents: 8
diff changeset
1102 * Revision 1.7 2002/04/10 16:45:57 jcdutton
a68c6da98b73 Actually fix the const this time!
jcdutton
parents: 8
diff changeset
1103 * Actually fix the const this time!
a68c6da98b73 Actually fix the const this time!
jcdutton
parents: 8
diff changeset
1104 *
8
66708b4a1b5e Stop C++ bitching about some things and extend the menus example
richwareham
parents: 7
diff changeset
1105 * 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
1106 * 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
1107 *
7
7fdefafa624f Slight correction to handle quicker menu transitions.
jcdutton
parents: 6
diff changeset
1108 * Revision 1.5 2002/04/06 18:42:05 jcdutton
7fdefafa624f Slight correction to handle quicker menu transitions.
jcdutton
parents: 6
diff changeset
1109 * Slight correction to handle quicker menu transitions.
7fdefafa624f Slight correction to handle quicker menu transitions.
jcdutton
parents: 6
diff changeset
1110 *
6
5f319e02e333 Some cleaning up.
jcdutton
parents: 4
diff changeset
1111 * Revision 1.4 2002/04/06 18:31:50 jcdutton
5f319e02e333 Some cleaning up.
jcdutton
parents: 4
diff changeset
1112 * Some cleaning up.
5f319e02e333 Some cleaning up.
jcdutton
parents: 4
diff changeset
1113 * 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
1114 *
4
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
1115 * 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
1116 * Added reset patch from Kees Cook <kees@outflux.net>
99bed5d6db2f Added reset patch from Kees Cook <kees@outflux.net>
richwareham
parents: 3
diff changeset
1117 *
3
328eadb3f37e Added initial example programs directory and make sure all debug/error output goes to stderr.
richwareham
parents: 0
diff changeset
1118 * 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
1119 * 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
1120 *
328eadb3f37e Added initial example programs directory and make sure all debug/error output goes to stderr.
richwareham
parents: 0
diff changeset
1121 * 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
1122 * Initial import
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1123 *
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1124 * Revision 1.28 2002/02/02 23:26:20 richwareham
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1125 * Restored title selection
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1126 *
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1127 * Revision 1.27 2002/02/01 15:48:10 richwareham
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1128 * Re-implemented angle selection and title/chapter display
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1129 *
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1130 * Revision 1.26 2002/01/31 16:53:49 richwareham
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1131 * Big patch from Daniel Caujolle-Bert to (re)implement SPU/Audio language display
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1132 *
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1133 * Revision 1.25 2002/01/24 20:53:50 richwareham
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1134 * Added option to _not_ use DVD read-ahead to options
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1135 *
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1136 * Revision 1.24 2002/01/20 15:54:59 jcdutton
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1137 * Implement seeking.
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1138 * It is still a bit buggy, but works sometimes.
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1139 * I need to find out how to make the jump clean.
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1140 * At the moment, some corruption of the mpeg2 stream occurs,
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1141 * which causes libmpeg2 to crash.
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1142 *
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1143 * Revision 1.23 2002/01/18 00:23:52 jcdutton
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1144 * Support Ejecting of DVD.
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1145 * It will first un-mount the DVD, then eject it.
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1146 *
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1147 * Revision 1.22 2002/01/17 14:50:32 jcdutton
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1148 * Fix corruption of stream during menu transitions.
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1149 * Menu transitions are now clean.
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1150 *
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1151 * Revision 1.21 2002/01/15 00:37:03 jcdutton
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1152 * Just a few cleanups, and a assert fix. (memset fixed it)
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1153 *
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1154 * Revision 1.20 2002/01/13 22:17:57 jcdutton
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1155 * Change logging.
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1156 *
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1157 *
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
1158 */