annotate searching.c @ 270:5d091ebc4c3b src

in dvdnav_time_search() skip secondary angles when searching the cell to hump to
author nicodvb
date Mon, 09 Apr 2007 09:56:41 +0000
parents 77e472cef5f8
children bd734ab914d0
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
131
ada79e606d8d fix comment
mroi
parents: 130
diff changeset
1 /*
0
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
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
28 #include <assert.h>
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
29 #include "dvdnav_internal.h"
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
30
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
31 /*
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
32 #define LOG_DEBUG
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
33 */
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
34
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
35 /* Searching API calls */
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
36
24
870a0a1eee41 Re-implemented seeking.
jcdutton
parents: 22
diff changeset
37 /* Scan the ADMAP for a particular block number. */
870a0a1eee41 Re-implemented seeking.
jcdutton
parents: 22
diff changeset
38 /* Return placed in vobu. */
870a0a1eee41 Re-implemented seeking.
jcdutton
parents: 22
diff changeset
39 /* Returns error status */
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
40 /* FIXME: Maybe need to handle seeking outside current cell. */
195
6b1bfe8f5283 Start some cleanups.
jcdutton
parents: 193
diff changeset
41 static dvdnav_status_t dvdnav_scan_admap(dvdnav_t *this, int32_t domain, uint32_t seekto_block, uint32_t *vobu) {
24
870a0a1eee41 Re-implemented seeking.
jcdutton
parents: 22
diff changeset
42 vobu_admap_t *admap = NULL;
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
43
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
44 #ifdef LOG_DEBUG
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
45 fprintf(MSG_OUT, "libdvdnav: Seeking to target %u ...\n", seekto_block);
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
46 #endif
24
870a0a1eee41 Re-implemented seeking.
jcdutton
parents: 22
diff changeset
47 *vobu = -1;
870a0a1eee41 Re-implemented seeking.
jcdutton
parents: 22
diff changeset
48
870a0a1eee41 Re-implemented seeking.
jcdutton
parents: 22
diff changeset
49 /* Search through the VOBU_ADMAP for the nearest VOBU
870a0a1eee41 Re-implemented seeking.
jcdutton
parents: 22
diff changeset
50 * to the target block */
870a0a1eee41 Re-implemented seeking.
jcdutton
parents: 22
diff changeset
51 switch(domain) {
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
52 case FP_DOMAIN:
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
53 case VMGM_DOMAIN:
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
54 admap = this->vm->vmgi->menu_vobu_admap;
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
55 break;
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
56 case VTSM_DOMAIN:
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
57 admap = this->vm->vtsi->menu_vobu_admap;
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
58 break;
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
59 case VTS_DOMAIN:
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
60 admap = this->vm->vtsi->vts_vobu_admap;
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
61 break;
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
62 default:
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
63 fprintf(MSG_OUT, "libdvdnav: Error: Unknown domain for seeking.\n");
24
870a0a1eee41 Re-implemented seeking.
jcdutton
parents: 22
diff changeset
64 }
870a0a1eee41 Re-implemented seeking.
jcdutton
parents: 22
diff changeset
65 if(admap) {
166
3bfaec0c1288 * fix warnings with gcc 3.3
mroi
parents: 163
diff changeset
66 uint32_t address = 0;
3bfaec0c1288 * fix warnings with gcc 3.3
mroi
parents: 163
diff changeset
67 uint32_t vobu_start, next_vobu;
195
6b1bfe8f5283 Start some cleanups.
jcdutton
parents: 193
diff changeset
68 int32_t found = 0;
24
870a0a1eee41 Re-implemented seeking.
jcdutton
parents: 22
diff changeset
69
870a0a1eee41 Re-implemented seeking.
jcdutton
parents: 22
diff changeset
70 /* Search through ADMAP for best sector */
133
d09a81cf65ce determine correct PG and PTT numbers when seeking across PG boundaries
mroi
parents: 132
diff changeset
71 vobu_start = SRI_END_OF_CELL;
24
870a0a1eee41 Re-implemented seeking.
jcdutton
parents: 22
diff changeset
72 /* FIXME: Implement a faster search algorithm */
870a0a1eee41 Re-implemented seeking.
jcdutton
parents: 22
diff changeset
73 while((!found) && ((address<<2) < admap->last_byte)) {
870a0a1eee41 Re-implemented seeking.
jcdutton
parents: 22
diff changeset
74 next_vobu = admap->vobu_start_sectors[address];
870a0a1eee41 Re-implemented seeking.
jcdutton
parents: 22
diff changeset
75
76
0e2abe7083de more consistent console output
mroi
parents: 68
diff changeset
76 /* fprintf(MSG_OUT, "libdvdnav: Found block %u\n", next_vobu); */
24
870a0a1eee41 Re-implemented seeking.
jcdutton
parents: 22
diff changeset
77
870a0a1eee41 Re-implemented seeking.
jcdutton
parents: 22
diff changeset
78 if(vobu_start <= seekto_block &&
870a0a1eee41 Re-implemented seeking.
jcdutton
parents: 22
diff changeset
79 next_vobu > seekto_block) {
870a0a1eee41 Re-implemented seeking.
jcdutton
parents: 22
diff changeset
80 found = 1;
870a0a1eee41 Re-implemented seeking.
jcdutton
parents: 22
diff changeset
81 } else {
870a0a1eee41 Re-implemented seeking.
jcdutton
parents: 22
diff changeset
82 vobu_start = next_vobu;
870a0a1eee41 Re-implemented seeking.
jcdutton
parents: 22
diff changeset
83 }
870a0a1eee41 Re-implemented seeking.
jcdutton
parents: 22
diff changeset
84 address ++;
870a0a1eee41 Re-implemented seeking.
jcdutton
parents: 22
diff changeset
85 }
870a0a1eee41 Re-implemented seeking.
jcdutton
parents: 22
diff changeset
86 if(found) {
870a0a1eee41 Re-implemented seeking.
jcdutton
parents: 22
diff changeset
87 *vobu = vobu_start;
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 181
diff changeset
88 return DVDNAV_STATUS_OK;
24
870a0a1eee41 Re-implemented seeking.
jcdutton
parents: 22
diff changeset
89 } else {
76
0e2abe7083de more consistent console output
mroi
parents: 68
diff changeset
90 fprintf(MSG_OUT, "libdvdnav: Could not locate block\n");
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 181
diff changeset
91 return DVDNAV_STATUS_ERR;
24
870a0a1eee41 Re-implemented seeking.
jcdutton
parents: 22
diff changeset
92 }
870a0a1eee41 Re-implemented seeking.
jcdutton
parents: 22
diff changeset
93 }
76
0e2abe7083de more consistent console output
mroi
parents: 68
diff changeset
94 fprintf(MSG_OUT, "libdvdnav: admap not located\n");
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 181
diff changeset
95 return DVDNAV_STATUS_ERR;
24
870a0a1eee41 Re-implemented seeking.
jcdutton
parents: 22
diff changeset
96 }
870a0a1eee41 Re-implemented seeking.
jcdutton
parents: 22
diff changeset
97
265
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
98 /* FIXME: right now, this function does not use the time tables but interpolates
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
99 only the cell times */
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
100 dvdnav_status_t dvdnav_time_search(dvdnav_t *this,
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
101 uint64_t time) {
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
102
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
103 uint64_t target = time;
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
104 uint64_t length = 0;
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
105 uint32_t first_cell_nr, last_cell_nr, cell_nr;
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
106 int32_t found;
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
107 cell_playback_t *cell;
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
108 dvd_state_t *state;
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
109 dvdnav_status_t result;
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
110
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
111 if(this->position_current.still != 0) {
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
112 printerr("Cannot seek in a still frame.");
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
113 return DVDNAV_STATUS_ERR;
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
114 }
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
115
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
116 pthread_mutex_lock(&this->vm_lock);
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
117 state = &(this->vm->state);
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
118 if(!state->pgc) {
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
119 printerr("No current PGC.");
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
120 pthread_mutex_unlock(&this->vm_lock);
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
121 return DVDNAV_STATUS_ERR;
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
122 }
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
123
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
124
269
77e472cef5f8 implemented dvdnav_get_current_time() with obvious meaning
nicodvb
parents: 265
diff changeset
125 this->cur_cell_time = 0;
265
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
126 if (this->pgc_based) {
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
127 first_cell_nr = 1;
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
128 last_cell_nr = state->pgc->nr_of_cells;
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
129 } else {
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
130 /* Find start cell of program. */
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
131 first_cell_nr = state->pgc->program_map[state->pgN-1];
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
132 /* Find end cell of program */
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
133 if(state->pgN < state->pgc->nr_of_programs)
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
134 last_cell_nr = state->pgc->program_map[state->pgN] - 1;
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
135 else
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
136 last_cell_nr = state->pgc->nr_of_cells;
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
137 }
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
138
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
139 found = 0;
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
140 for(cell_nr = first_cell_nr; (cell_nr <= last_cell_nr) && !found; cell_nr ++) {
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
141 cell = &(state->pgc->cell_playback[cell_nr-1]);
270
5d091ebc4c3b in dvdnav_time_search() skip secondary angles when searching the cell to hump to
nicodvb
parents: 269
diff changeset
142 if(cell->block_type == BLOCK_TYPE_ANGLE_BLOCK && cell->block_mode != BLOCK_MODE_FIRST_CELL)
5d091ebc4c3b in dvdnav_time_search() skip secondary angles when searching the cell to hump to
nicodvb
parents: 269
diff changeset
143 continue;
265
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
144 length = dvdnav_convert_time(&cell->playback_time);
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
145 if (target >= length) {
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
146 target -= length;
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
147 } else {
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
148 /* FIXME: there must be a better way than interpolation */
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
149 target = target * (cell->last_sector - cell->first_sector + 1) / length;
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
150 target += cell->first_sector;
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
151
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
152 found = 1;
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
153 break;
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
154 }
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
155 }
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
156
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
157 if(found) {
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
158 int32_t vobu;
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
159 #ifdef LOG_DEBUG
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
160 fprintf(MSG_OUT, "libdvdnav: Seeking to cell %i from choice of %i to %i\n",
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
161 cell_nr, first_cell_nr, last_cell_nr);
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
162 #endif
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
163 if (dvdnav_scan_admap(this, state->domain, target, &vobu) == DVDNAV_STATUS_OK) {
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
164 int32_t start = state->pgc->cell_playback[cell_nr-1].first_sector;
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
165
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
166 if (vm_jump_cell_block(this->vm, cell_nr, vobu - start)) {
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
167 #ifdef LOG_DEBUG
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
168 fprintf(MSG_OUT, "libdvdnav: After cellN=%u blockN=%u target=%x vobu=%x start=%x\n" ,
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
169 state->cellN, state->blockN, target, vobu, start);
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
170 #endif
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
171 this->vm->hop_channel += HOP_SEEK;
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
172 pthread_mutex_unlock(&this->vm_lock);
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
173 return DVDNAV_STATUS_OK;
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
174 }
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
175 }
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
176 }
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
177
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
178 fprintf(MSG_OUT, "libdvdnav: Error when seeking\n");
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
179 printerr("Error when seeking.");
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
180 pthread_mutex_unlock(&this->vm_lock);
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
181 return DVDNAV_STATUS_ERR;
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
182 }
99d33725395d commit Miguel's approach on the time search function
mroi
parents: 224
diff changeset
183
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 8
diff changeset
184 dvdnav_status_t dvdnav_sector_search(dvdnav_t *this,
195
6b1bfe8f5283 Start some cleanups.
jcdutton
parents: 193
diff changeset
185 uint64_t offset, int32_t origin) {
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
186 uint32_t target = 0;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
187 uint32_t length = 0;
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
188 uint32_t first_cell_nr, last_cell_nr, cell_nr;
195
6b1bfe8f5283 Start some cleanups.
jcdutton
parents: 193
diff changeset
189 int32_t found;
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
190 cell_playback_t *cell;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
191 dvd_state_t *state;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
192 dvdnav_status_t result;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
193
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
194 if(this->position_current.still != 0) {
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
195 printerr("Cannot seek in a still frame.");
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 181
diff changeset
196 return DVDNAV_STATUS_ERR;
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
197 }
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
198
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 8
diff changeset
199 result = dvdnav_get_position(this, &target, &length);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
200 if(!result) {
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 181
diff changeset
201 return DVDNAV_STATUS_ERR;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
202 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
203
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
204 pthread_mutex_lock(&this->vm_lock);
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
205 state = &(this->vm->state);
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
206 if(!state->pgc) {
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
207 printerr("No current PGC.");
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
208 pthread_mutex_unlock(&this->vm_lock);
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 181
diff changeset
209 return DVDNAV_STATUS_ERR;
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
210 }
133
d09a81cf65ce determine correct PG and PTT numbers when seeking across PG boundaries
mroi
parents: 132
diff changeset
211 #ifdef LOG_DEBUG
d09a81cf65ce determine correct PG and PTT numbers when seeking across PG boundaries
mroi
parents: 132
diff changeset
212 fprintf(MSG_OUT, "libdvdnav: seeking to offset=%lu pos=%u length=%u\n", offset, target, length);
d09a81cf65ce determine correct PG and PTT numbers when seeking across PG boundaries
mroi
parents: 132
diff changeset
213 fprintf(MSG_OUT, "libdvdnav: Before cellN=%u blockN=%u\n", state->cellN, state->blockN);
d09a81cf65ce determine correct PG and PTT numbers when seeking across PG boundaries
mroi
parents: 132
diff changeset
214 #endif
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
215
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
216 switch(origin) {
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
217 case SEEK_SET:
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
218 if(offset > length) {
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
219 printerr("Request to seek behind end.");
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 8
diff changeset
220 pthread_mutex_unlock(&this->vm_lock);
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 181
diff changeset
221 return DVDNAV_STATUS_ERR;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
222 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
223 target = offset;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
224 break;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
225 case SEEK_CUR:
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
226 if(target + offset > length) {
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
227 printerr("Request to seek behind end.");
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 8
diff changeset
228 pthread_mutex_unlock(&this->vm_lock);
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 181
diff changeset
229 return DVDNAV_STATUS_ERR;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
230 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
231 target += offset;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
232 break;
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
233 case SEEK_END:
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
234 if(length - offset < 0) {
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
235 printerr("Request to seek before start.");
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 8
diff changeset
236 pthread_mutex_unlock(&this->vm_lock);
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 181
diff changeset
237 return DVDNAV_STATUS_ERR;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
238 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
239 target = length - offset;
102
3e6970dbe8d6 - allow seeking to offset 0 (pressing '0' in xine won't work otherwise)
mroi
parents: 90
diff changeset
240 break;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
241 default:
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
242 /* Error occured */
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
243 printerr("Illegal seek mode.");
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 8
diff changeset
244 pthread_mutex_unlock(&this->vm_lock);
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 181
diff changeset
245 return DVDNAV_STATUS_ERR;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
246 }
133
d09a81cf65ce determine correct PG and PTT numbers when seeking across PG boundaries
mroi
parents: 132
diff changeset
247
269
77e472cef5f8 implemented dvdnav_get_current_time() with obvious meaning
nicodvb
parents: 265
diff changeset
248 this->cur_cell_time = 0;
132
f22458f928b8 PGC based positioning
mroi
parents: 131
diff changeset
249 if (this->pgc_based) {
f22458f928b8 PGC based positioning
mroi
parents: 131
diff changeset
250 first_cell_nr = 1;
f22458f928b8 PGC based positioning
mroi
parents: 131
diff changeset
251 last_cell_nr = state->pgc->nr_of_cells;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
252 } else {
132
f22458f928b8 PGC based positioning
mroi
parents: 131
diff changeset
253 /* Find start cell of program. */
f22458f928b8 PGC based positioning
mroi
parents: 131
diff changeset
254 first_cell_nr = state->pgc->program_map[state->pgN-1];
f22458f928b8 PGC based positioning
mroi
parents: 131
diff changeset
255 /* Find end cell of program */
f22458f928b8 PGC based positioning
mroi
parents: 131
diff changeset
256 if(state->pgN < state->pgc->nr_of_programs)
f22458f928b8 PGC based positioning
mroi
parents: 131
diff changeset
257 last_cell_nr = state->pgc->program_map[state->pgN] - 1;
f22458f928b8 PGC based positioning
mroi
parents: 131
diff changeset
258 else
f22458f928b8 PGC based positioning
mroi
parents: 131
diff changeset
259 last_cell_nr = state->pgc->nr_of_cells;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
260 }
132
f22458f928b8 PGC based positioning
mroi
parents: 131
diff changeset
261
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
262 found = 0;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
263 for(cell_nr = first_cell_nr; (cell_nr <= last_cell_nr) && !found; cell_nr ++) {
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
264 cell = &(state->pgc->cell_playback[cell_nr-1]);
130
f47065513ad8 do not assume PGs to be physically layed out in sequence on the disc
mroi
parents: 129
diff changeset
265 length = cell->last_sector - cell->first_sector + 1;
f47065513ad8 do not assume PGs to be physically layed out in sequence on the disc
mroi
parents: 129
diff changeset
266 if (target >= length) {
f47065513ad8 do not assume PGs to be physically layed out in sequence on the disc
mroi
parents: 129
diff changeset
267 target -= length;
f47065513ad8 do not assume PGs to be physically layed out in sequence on the disc
mroi
parents: 129
diff changeset
268 } else {
131
ada79e606d8d fix comment
mroi
parents: 130
diff changeset
269 /* convert the target sector from Cell-relative to absolute physical sector */
130
f47065513ad8 do not assume PGs to be physically layed out in sequence on the disc
mroi
parents: 129
diff changeset
270 target += cell->first_sector;
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
271 found = 1;
130
f47065513ad8 do not assume PGs to be physically layed out in sequence on the disc
mroi
parents: 129
diff changeset
272 break;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
273 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
274 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
275
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
276 if(found) {
133
d09a81cf65ce determine correct PG and PTT numbers when seeking across PG boundaries
mroi
parents: 132
diff changeset
277 int32_t vobu;
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
278 #ifdef LOG_DEBUG
76
0e2abe7083de more consistent console output
mroi
parents: 68
diff changeset
279 fprintf(MSG_OUT, "libdvdnav: Seeking to cell %i from choice of %i to %i\n",
130
f47065513ad8 do not assume PGs to be physically layed out in sequence on the disc
mroi
parents: 129
diff changeset
280 cell_nr, first_cell_nr, last_cell_nr);
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
281 #endif
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 181
diff changeset
282 if (dvdnav_scan_admap(this, state->domain, target, &vobu) == DVDNAV_STATUS_OK) {
133
d09a81cf65ce determine correct PG and PTT numbers when seeking across PG boundaries
mroi
parents: 132
diff changeset
283 int32_t start = state->pgc->cell_playback[cell_nr-1].first_sector;
d09a81cf65ce determine correct PG and PTT numbers when seeking across PG boundaries
mroi
parents: 132
diff changeset
284
d09a81cf65ce determine correct PG and PTT numbers when seeking across PG boundaries
mroi
parents: 132
diff changeset
285 if (vm_jump_cell_block(this->vm, cell_nr, vobu - start)) {
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
286 #ifdef LOG_DEBUG
133
d09a81cf65ce determine correct PG and PTT numbers when seeking across PG boundaries
mroi
parents: 132
diff changeset
287 fprintf(MSG_OUT, "libdvdnav: After cellN=%u blockN=%u target=%x vobu=%x start=%x\n" ,
d09a81cf65ce determine correct PG and PTT numbers when seeking across PG boundaries
mroi
parents: 132
diff changeset
288 state->cellN, state->blockN, target, vobu, start);
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
289 #endif
133
d09a81cf65ce determine correct PG and PTT numbers when seeking across PG boundaries
mroi
parents: 132
diff changeset
290 this->vm->hop_channel += HOP_SEEK;
d09a81cf65ce determine correct PG and PTT numbers when seeking across PG boundaries
mroi
parents: 132
diff changeset
291 pthread_mutex_unlock(&this->vm_lock);
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 181
diff changeset
292 return DVDNAV_STATUS_OK;
133
d09a81cf65ce determine correct PG and PTT numbers when seeking across PG boundaries
mroi
parents: 132
diff changeset
293 }
d09a81cf65ce determine correct PG and PTT numbers when seeking across PG boundaries
mroi
parents: 132
diff changeset
294 }
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
295 }
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
296
133
d09a81cf65ce determine correct PG and PTT numbers when seeking across PG boundaries
mroi
parents: 132
diff changeset
297 fprintf(MSG_OUT, "libdvdnav: Error when seeking\n");
76
0e2abe7083de more consistent console output
mroi
parents: 68
diff changeset
298 fprintf(MSG_OUT, "libdvdnav: FIXME: Implement seeking to location %u\n", target);
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
299 printerr("Error when seeking.");
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 8
diff changeset
300 pthread_mutex_unlock(&this->vm_lock);
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 181
diff changeset
301 return DVDNAV_STATUS_ERR;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
302 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
303
195
6b1bfe8f5283 Start some cleanups.
jcdutton
parents: 193
diff changeset
304 dvdnav_status_t dvdnav_part_search(dvdnav_t *this, int32_t part) {
6b1bfe8f5283 Start some cleanups.
jcdutton
parents: 193
diff changeset
305 int32_t title, old_part;
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
306
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 181
diff changeset
307 if (dvdnav_current_title_info(this, &title, &old_part) == DVDNAV_STATUS_OK)
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
308 return dvdnav_part_play(this, title, part);
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 181
diff changeset
309 return DVDNAV_STATUS_ERR;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
310 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
311
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 8
diff changeset
312 dvdnav_status_t dvdnav_prev_pg_search(dvdnav_t *this) {
68
3b45c78f061e Some NULL-pointer check from aschultz@cs.uni-magdeburg.de
richwareham
parents: 63
diff changeset
313
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
314 if(!this) {
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
315 printerr("Passed a NULL pointer.");
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 181
diff changeset
316 return DVDNAV_STATUS_ERR;
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
317 }
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
318
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
319 pthread_mutex_lock(&this->vm_lock);
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
320 if(!this->vm->state.pgc) {
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
321 printerr("No current PGC.");
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
322 pthread_mutex_unlock(&this->vm_lock);
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 181
diff changeset
323 return DVDNAV_STATUS_ERR;
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
324 }
68
3b45c78f061e Some NULL-pointer check from aschultz@cs.uni-magdeburg.de
richwareham
parents: 63
diff changeset
325
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
326 #ifdef LOG_DEBUG
113
ec2df154be56 slightly improved logic of program skipping:
mroi
parents: 104
diff changeset
327 fprintf(MSG_OUT, "libdvdnav: previous chapter\n");
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
328 #endif
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
329 if (!vm_jump_prev_pg(this->vm)) {
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
330 fprintf(MSG_OUT, "libdvdnav: previous chapter failed.\n");
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
331 printerr("Skip to previous chapter failed.");
102
3e6970dbe8d6 - allow seeking to offset 0 (pressing '0' in xine won't work otherwise)
mroi
parents: 90
diff changeset
332 pthread_mutex_unlock(&this->vm_lock);
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 181
diff changeset
333 return DVDNAV_STATUS_ERR;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
334 }
269
77e472cef5f8 implemented dvdnav_get_current_time() with obvious meaning
nicodvb
parents: 265
diff changeset
335 this->cur_cell_time = 0;
102
3e6970dbe8d6 - allow seeking to offset 0 (pressing '0' in xine won't work otherwise)
mroi
parents: 90
diff changeset
336 this->position_current.still = 0;
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 8
diff changeset
337 this->vm->hop_channel++;
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
338 #ifdef LOG_DEBUG
76
0e2abe7083de more consistent console output
mroi
parents: 68
diff changeset
339 fprintf(MSG_OUT, "libdvdnav: previous chapter done\n");
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
340 #endif
102
3e6970dbe8d6 - allow seeking to offset 0 (pressing '0' in xine won't work otherwise)
mroi
parents: 90
diff changeset
341 pthread_mutex_unlock(&this->vm_lock);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
342
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 181
diff changeset
343 return DVDNAV_STATUS_OK;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
344 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
345
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 8
diff changeset
346 dvdnav_status_t dvdnav_top_pg_search(dvdnav_t *this) {
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
347
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
348 if(!this) {
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
349 printerr("Passed a NULL pointer.");
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 181
diff changeset
350 return DVDNAV_STATUS_ERR;
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
351 }
68
3b45c78f061e Some NULL-pointer check from aschultz@cs.uni-magdeburg.de
richwareham
parents: 63
diff changeset
352
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
353 pthread_mutex_lock(&this->vm_lock);
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
354 if(!this->vm->state.pgc) {
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
355 printerr("No current PGC.");
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
356 pthread_mutex_unlock(&this->vm_lock);
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 181
diff changeset
357 return DVDNAV_STATUS_ERR;
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
358 }
68
3b45c78f061e Some NULL-pointer check from aschultz@cs.uni-magdeburg.de
richwareham
parents: 63
diff changeset
359
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
360 #ifdef LOG_DEBUG
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
361 fprintf(MSG_OUT, "libdvdnav: top chapter\n");
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
362 #endif
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
363 if (!vm_jump_top_pg(this->vm)) {
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
364 fprintf(MSG_OUT, "libdvdnav: top chapter failed.\n");
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
365 printerr("Skip to top chapter failed.");
113
ec2df154be56 slightly improved logic of program skipping:
mroi
parents: 104
diff changeset
366 pthread_mutex_unlock(&this->vm_lock);
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 181
diff changeset
367 return DVDNAV_STATUS_ERR;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
368 }
269
77e472cef5f8 implemented dvdnav_get_current_time() with obvious meaning
nicodvb
parents: 265
diff changeset
369 this->cur_cell_time = 0;
102
3e6970dbe8d6 - allow seeking to offset 0 (pressing '0' in xine won't work otherwise)
mroi
parents: 90
diff changeset
370 this->position_current.still = 0;
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 8
diff changeset
371 this->vm->hop_channel++;
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
372 #ifdef LOG_DEBUG
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
373 fprintf(MSG_OUT, "libdvdnav: top chapter done\n");
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
374 #endif
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
375 pthread_mutex_unlock(&this->vm_lock);
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
376
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 181
diff changeset
377 return DVDNAV_STATUS_OK;
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
378 }
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
379
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
380 dvdnav_status_t dvdnav_next_pg_search(dvdnav_t *this) {
122
29b046894eac use the new VM copy mechanism to try-run program skipping and report failure in case
mroi
parents: 119
diff changeset
381 vm_t *try_vm;
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
382
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
383 if(!this) {
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
384 printerr("Passed a NULL pointer.");
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 181
diff changeset
385 return DVDNAV_STATUS_ERR;
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
386 }
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
387
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
388 pthread_mutex_lock(&this->vm_lock);
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
389 if(!this->vm->state.pgc) {
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
390 printerr("No current PGC.");
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
391 pthread_mutex_unlock(&this->vm_lock);
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 181
diff changeset
392 return DVDNAV_STATUS_ERR;
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
393 }
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
394
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
395 #ifdef LOG_DEBUG
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
396 fprintf(MSG_OUT, "libdvdnav: next chapter\n");
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
397 #endif
122
29b046894eac use the new VM copy mechanism to try-run program skipping and report failure in case
mroi
parents: 119
diff changeset
398 /* make a copy of current VM and try to navigate the copy to the next PG */
29b046894eac use the new VM copy mechanism to try-run program skipping and report failure in case
mroi
parents: 119
diff changeset
399 try_vm = vm_new_copy(this->vm);
29b046894eac use the new VM copy mechanism to try-run program skipping and report failure in case
mroi
parents: 119
diff changeset
400 if (!vm_jump_next_pg(try_vm) || try_vm->stopped) {
29b046894eac use the new VM copy mechanism to try-run program skipping and report failure in case
mroi
parents: 119
diff changeset
401 vm_free_copy(try_vm);
29b046894eac use the new VM copy mechanism to try-run program skipping and report failure in case
mroi
parents: 119
diff changeset
402 /* next_pg failed, try to jump at least to the next cell */
29b046894eac use the new VM copy mechanism to try-run program skipping and report failure in case
mroi
parents: 119
diff changeset
403 try_vm = vm_new_copy(this->vm);
29b046894eac use the new VM copy mechanism to try-run program skipping and report failure in case
mroi
parents: 119
diff changeset
404 vm_get_next_cell(try_vm);
29b046894eac use the new VM copy mechanism to try-run program skipping and report failure in case
mroi
parents: 119
diff changeset
405 if (try_vm->stopped) {
29b046894eac use the new VM copy mechanism to try-run program skipping and report failure in case
mroi
parents: 119
diff changeset
406 vm_free_copy(try_vm);
29b046894eac use the new VM copy mechanism to try-run program skipping and report failure in case
mroi
parents: 119
diff changeset
407 fprintf(MSG_OUT, "libdvdnav: next chapter failed.\n");
29b046894eac use the new VM copy mechanism to try-run program skipping and report failure in case
mroi
parents: 119
diff changeset
408 printerr("Skip to next chapter failed.");
29b046894eac use the new VM copy mechanism to try-run program skipping and report failure in case
mroi
parents: 119
diff changeset
409 pthread_mutex_unlock(&this->vm_lock);
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 181
diff changeset
410 return DVDNAV_STATUS_ERR;
122
29b046894eac use the new VM copy mechanism to try-run program skipping and report failure in case
mroi
parents: 119
diff changeset
411 }
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
412 }
269
77e472cef5f8 implemented dvdnav_get_current_time() with obvious meaning
nicodvb
parents: 265
diff changeset
413 this->cur_cell_time = 0;
122
29b046894eac use the new VM copy mechanism to try-run program skipping and report failure in case
mroi
parents: 119
diff changeset
414 /* merge changes on success */
29b046894eac use the new VM copy mechanism to try-run program skipping and report failure in case
mroi
parents: 119
diff changeset
415 vm_merge(this->vm, try_vm);
29b046894eac use the new VM copy mechanism to try-run program skipping and report failure in case
mroi
parents: 119
diff changeset
416 vm_free_copy(try_vm);
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
417 this->position_current.still = 0;
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
418 this->vm->hop_channel++;
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
419 #ifdef LOG_DEBUG
76
0e2abe7083de more consistent console output
mroi
parents: 68
diff changeset
420 fprintf(MSG_OUT, "libdvdnav: next chapter done\n");
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
421 #endif
102
3e6970dbe8d6 - allow seeking to offset 0 (pressing '0' in xine won't work otherwise)
mroi
parents: 90
diff changeset
422 pthread_mutex_unlock(&this->vm_lock);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
423
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 181
diff changeset
424 return DVDNAV_STATUS_OK;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
425 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
426
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 8
diff changeset
427 dvdnav_status_t dvdnav_menu_call(dvdnav_t *this, DVDMenuID_t menu) {
125
87400040e4a4 try-run menu jumps
mroi
parents: 122
diff changeset
428 vm_t *try_vm;
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
429
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
430 if(!this) {
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
431 printerr("Passed a NULL pointer.");
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 181
diff changeset
432 return DVDNAV_STATUS_ERR;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
433 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
434
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
435 pthread_mutex_lock(&this->vm_lock);
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
436 if(!this->vm->state.pgc) {
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
437 printerr("No current PGC.");
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
438 pthread_mutex_unlock(&this->vm_lock);
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 181
diff changeset
439 return DVDNAV_STATUS_ERR;
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
440 }
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
441
269
77e472cef5f8 implemented dvdnav_get_current_time() with obvious meaning
nicodvb
parents: 265
diff changeset
442 this->cur_cell_time = 0;
125
87400040e4a4 try-run menu jumps
mroi
parents: 122
diff changeset
443 /* make a copy of current VM and try to navigate the copy to the menu */
87400040e4a4 try-run menu jumps
mroi
parents: 122
diff changeset
444 try_vm = vm_new_copy(this->vm);
162
0fd70a257b44 Implement ESCAPE key jumping from TITLE to MENU and back again.
jcdutton
parents: 136
diff changeset
445 if ( (menu == DVD_MENU_Escape) && (this->vm->state.domain != VTS_DOMAIN)) {
0fd70a257b44 Implement ESCAPE key jumping from TITLE to MENU and back again.
jcdutton
parents: 136
diff changeset
446 /* Try resume */
167
e9987c07e255 some code beautification:
mroi
parents: 166
diff changeset
447 if (vm_jump_resume(try_vm) && !try_vm->stopped) {
162
0fd70a257b44 Implement ESCAPE key jumping from TITLE to MENU and back again.
jcdutton
parents: 136
diff changeset
448 /* merge changes on success */
0fd70a257b44 Implement ESCAPE key jumping from TITLE to MENU and back again.
jcdutton
parents: 136
diff changeset
449 vm_merge(this->vm, try_vm);
0fd70a257b44 Implement ESCAPE key jumping from TITLE to MENU and back again.
jcdutton
parents: 136
diff changeset
450 vm_free_copy(try_vm);
0fd70a257b44 Implement ESCAPE key jumping from TITLE to MENU and back again.
jcdutton
parents: 136
diff changeset
451 this->position_current.still = 0;
0fd70a257b44 Implement ESCAPE key jumping from TITLE to MENU and back again.
jcdutton
parents: 136
diff changeset
452 this->vm->hop_channel++;
0fd70a257b44 Implement ESCAPE key jumping from TITLE to MENU and back again.
jcdutton
parents: 136
diff changeset
453 pthread_mutex_unlock(&this->vm_lock);
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 181
diff changeset
454 return DVDNAV_STATUS_OK;
162
0fd70a257b44 Implement ESCAPE key jumping from TITLE to MENU and back again.
jcdutton
parents: 136
diff changeset
455 }
0fd70a257b44 Implement ESCAPE key jumping from TITLE to MENU and back again.
jcdutton
parents: 136
diff changeset
456 }
166
3bfaec0c1288 * fix warnings with gcc 3.3
mroi
parents: 163
diff changeset
457 if (menu == DVD_MENU_Escape) menu = DVD_MENU_Root;
162
0fd70a257b44 Implement ESCAPE key jumping from TITLE to MENU and back again.
jcdutton
parents: 136
diff changeset
458
125
87400040e4a4 try-run menu jumps
mroi
parents: 122
diff changeset
459 if (vm_jump_menu(try_vm, menu) && !try_vm->stopped) {
87400040e4a4 try-run menu jumps
mroi
parents: 122
diff changeset
460 /* merge changes on success */
87400040e4a4 try-run menu jumps
mroi
parents: 122
diff changeset
461 vm_merge(this->vm, try_vm);
87400040e4a4 try-run menu jumps
mroi
parents: 122
diff changeset
462 vm_free_copy(try_vm);
129
b48f53f7cff2 release stills when jumping to a menu
mroi
parents: 125
diff changeset
463 this->position_current.still = 0;
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
464 this->vm->hop_channel++;
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
465 pthread_mutex_unlock(&this->vm_lock);
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 181
diff changeset
466 return DVDNAV_STATUS_OK;
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
467 } else {
125
87400040e4a4 try-run menu jumps
mroi
parents: 122
diff changeset
468 vm_free_copy(try_vm);
87400040e4a4 try-run menu jumps
mroi
parents: 122
diff changeset
469 printerr("No such menu or menu not reachable.");
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
470 pthread_mutex_unlock(&this->vm_lock);
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 181
diff changeset
471 return DVDNAV_STATUS_ERR;
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
472 }
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
473 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
474
195
6b1bfe8f5283 Start some cleanups.
jcdutton
parents: 193
diff changeset
475 dvdnav_status_t dvdnav_get_position(dvdnav_t *this, uint32_t *pos,
6b1bfe8f5283 Start some cleanups.
jcdutton
parents: 193
diff changeset
476 uint32_t *len) {
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
477 uint32_t cur_sector;
195
6b1bfe8f5283 Start some cleanups.
jcdutton
parents: 193
diff changeset
478 int32_t cell_nr, first_cell_nr, last_cell_nr;
130
f47065513ad8 do not assume PGs to be physically layed out in sequence on the disc
mroi
parents: 129
diff changeset
479 cell_playback_t *cell;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
480 dvd_state_t *state;
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
481
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
482 if(!this || !pos || !len) {
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
483 printerr("Passed a NULL pointer.");
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 181
diff changeset
484 return DVDNAV_STATUS_ERR;
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
485 }
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
486 if(!this->started) {
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
487 printerr("Virtual DVD machine not started.");
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 181
diff changeset
488 return DVDNAV_STATUS_ERR;
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
489 }
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
490
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
491 pthread_mutex_lock(&this->vm_lock);
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 8
diff changeset
492 state = &(this->vm->state);
224
f19fce15577b fix assertion failure when someone asks for the position between an Exit
mroi
parents: 195
diff changeset
493 if(!state->pgc || this->vm->stopped) {
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
494 printerr("No current PGC.");
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
495 pthread_mutex_unlock(&this->vm_lock);
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 181
diff changeset
496 return DVDNAV_STATUS_ERR;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
497 }
181
5d9770cb2961 fix some conditions where the following assertion would fail
mroi
parents: 167
diff changeset
498 if (this->position_current.hop_channel != this->vm->hop_channel ||
5d9770cb2961 fix some conditions where the following assertion would fail
mroi
parents: 167
diff changeset
499 this->position_current.domain != state->domain ||
5d9770cb2961 fix some conditions where the following assertion would fail
mroi
parents: 167
diff changeset
500 this->position_current.vts != state->vtsN ||
5d9770cb2961 fix some conditions where the following assertion would fail
mroi
parents: 167
diff changeset
501 this->position_current.cell_restart != state->cell_restart) {
5d9770cb2961 fix some conditions where the following assertion would fail
mroi
parents: 167
diff changeset
502 printerr("New position not yet determined.");
5d9770cb2961 fix some conditions where the following assertion would fail
mroi
parents: 167
diff changeset
503 pthread_mutex_unlock(&this->vm_lock);
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 181
diff changeset
504 return DVDNAV_STATUS_ERR;
181
5d9770cb2961 fix some conditions where the following assertion would fail
mroi
parents: 167
diff changeset
505 }
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
506
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
507 /* Get current sector */
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 8
diff changeset
508 cur_sector = this->vobu.vobu_start + this->vobu.blockN;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
509
132
f22458f928b8 PGC based positioning
mroi
parents: 131
diff changeset
510 if (this->pgc_based) {
f22458f928b8 PGC based positioning
mroi
parents: 131
diff changeset
511 first_cell_nr = 1;
f22458f928b8 PGC based positioning
mroi
parents: 131
diff changeset
512 last_cell_nr = state->pgc->nr_of_cells;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
513 } else {
132
f22458f928b8 PGC based positioning
mroi
parents: 131
diff changeset
514 /* Find start cell of program. */
f22458f928b8 PGC based positioning
mroi
parents: 131
diff changeset
515 first_cell_nr = state->pgc->program_map[state->pgN-1];
f22458f928b8 PGC based positioning
mroi
parents: 131
diff changeset
516 /* Find end cell of program */
f22458f928b8 PGC based positioning
mroi
parents: 131
diff changeset
517 if(state->pgN < state->pgc->nr_of_programs)
f22458f928b8 PGC based positioning
mroi
parents: 131
diff changeset
518 last_cell_nr = state->pgc->program_map[state->pgN] - 1;
f22458f928b8 PGC based positioning
mroi
parents: 131
diff changeset
519 else
f22458f928b8 PGC based positioning
mroi
parents: 131
diff changeset
520 last_cell_nr = state->pgc->nr_of_cells;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
521 }
132
f22458f928b8 PGC based positioning
mroi
parents: 131
diff changeset
522
130
f47065513ad8 do not assume PGs to be physically layed out in sequence on the disc
mroi
parents: 129
diff changeset
523 *pos = -1;
f47065513ad8 do not assume PGs to be physically layed out in sequence on the disc
mroi
parents: 129
diff changeset
524 *len = 0;
f47065513ad8 do not assume PGs to be physically layed out in sequence on the disc
mroi
parents: 129
diff changeset
525 for (cell_nr = first_cell_nr; cell_nr <= last_cell_nr; cell_nr++) {
f47065513ad8 do not assume PGs to be physically layed out in sequence on the disc
mroi
parents: 129
diff changeset
526 cell = &(state->pgc->cell_playback[cell_nr-1]);
f47065513ad8 do not assume PGs to be physically layed out in sequence on the disc
mroi
parents: 129
diff changeset
527 if (cell_nr == state->cellN) {
f47065513ad8 do not assume PGs to be physically layed out in sequence on the disc
mroi
parents: 129
diff changeset
528 /* the current sector is in this cell,
f47065513ad8 do not assume PGs to be physically layed out in sequence on the disc
mroi
parents: 129
diff changeset
529 * pos is length of PG up to here + sector's offset in this cell */
f47065513ad8 do not assume PGs to be physically layed out in sequence on the disc
mroi
parents: 129
diff changeset
530 *pos = *len + cur_sector - cell->first_sector;
f47065513ad8 do not assume PGs to be physically layed out in sequence on the disc
mroi
parents: 129
diff changeset
531 }
f47065513ad8 do not assume PGs to be physically layed out in sequence on the disc
mroi
parents: 129
diff changeset
532 *len += cell->last_sector - cell->first_sector + 1;
f47065513ad8 do not assume PGs to be physically layed out in sequence on the disc
mroi
parents: 129
diff changeset
533 }
f47065513ad8 do not assume PGs to be physically layed out in sequence on the disc
mroi
parents: 129
diff changeset
534
166
3bfaec0c1288 * fix warnings with gcc 3.3
mroi
parents: 163
diff changeset
535 assert((signed)*pos != -1);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
536
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
537 pthread_mutex_unlock(&this->vm_lock);
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
538
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 181
diff changeset
539 return DVDNAV_STATUS_OK;
0
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
540 }
3ddf0eaece51 Initial revision
richwareham
parents:
diff changeset
541
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 8
diff changeset
542 dvdnav_status_t dvdnav_get_position_in_title(dvdnav_t *this,
195
6b1bfe8f5283 Start some cleanups.
jcdutton
parents: 193
diff changeset
543 uint32_t *pos,
6b1bfe8f5283 Start some cleanups.
jcdutton
parents: 193
diff changeset
544 uint32_t *len) {
8
66708b4a1b5e Stop C++ bitching about some things and extend the menus example
richwareham
parents: 3
diff changeset
545 uint32_t cur_sector;
66708b4a1b5e Stop C++ bitching about some things and extend the menus example
richwareham
parents: 3
diff changeset
546 uint32_t first_cell_nr;
66708b4a1b5e Stop C++ bitching about some things and extend the menus example
richwareham
parents: 3
diff changeset
547 uint32_t last_cell_nr;
66708b4a1b5e Stop C++ bitching about some things and extend the menus example
richwareham
parents: 3
diff changeset
548 cell_playback_t *first_cell;
66708b4a1b5e Stop C++ bitching about some things and extend the menus example
richwareham
parents: 3
diff changeset
549 cell_playback_t *last_cell;
66708b4a1b5e Stop C++ bitching about some things and extend the menus example
richwareham
parents: 3
diff changeset
550 dvd_state_t *state;
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
551
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
552 if(!this || !pos || !len) {
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
553 printerr("Passed a NULL pointer.");
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 181
diff changeset
554 return DVDNAV_STATUS_ERR;
8
66708b4a1b5e Stop C++ bitching about some things and extend the menus example
richwareham
parents: 3
diff changeset
555 }
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
556
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
557 state = &(this->vm->state);
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
558 if(!state->pgc) {
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
559 printerr("No current PGC.");
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 181
diff changeset
560 return DVDNAV_STATUS_ERR;
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
561 }
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 113
diff changeset
562
8
66708b4a1b5e Stop C++ bitching about some things and extend the menus example
richwareham
parents: 3
diff changeset
563 /* Get current sector */
22
3c1df0cb3aee Start of rewrite of libdvdnav. Still need to re-implement seeking.
jcdutton
parents: 8
diff changeset
564 cur_sector = this->vobu.vobu_start + this->vobu.blockN;
8
66708b4a1b5e Stop C++ bitching about some things and extend the menus example
richwareham
parents: 3
diff changeset
565
66708b4a1b5e Stop C++ bitching about some things and extend the menus example
richwareham
parents: 3
diff changeset
566 /* Now find first and last cells in title. */
66708b4a1b5e Stop C++ bitching about some things and extend the menus example
richwareham
parents: 3
diff changeset
567 first_cell_nr = state->pgc->program_map[0];
66708b4a1b5e Stop C++ bitching about some things and extend the menus example
richwareham
parents: 3
diff changeset
568 first_cell = &(state->pgc->cell_playback[first_cell_nr-1]);
66708b4a1b5e Stop C++ bitching about some things and extend the menus example
richwareham
parents: 3
diff changeset
569 last_cell_nr = state->pgc->nr_of_cells;
66708b4a1b5e Stop C++ bitching about some things and extend the menus example
richwareham
parents: 3
diff changeset
570 last_cell = &(state->pgc->cell_playback[last_cell_nr-1]);
66708b4a1b5e Stop C++ bitching about some things and extend the menus example
richwareham
parents: 3
diff changeset
571
66708b4a1b5e Stop C++ bitching about some things and extend the menus example
richwareham
parents: 3
diff changeset
572 *pos = cur_sector - first_cell->first_sector;
66708b4a1b5e Stop C++ bitching about some things and extend the menus example
richwareham
parents: 3
diff changeset
573 *len = last_cell->last_sector - first_cell->first_sector;
66708b4a1b5e Stop C++ bitching about some things and extend the menus example
richwareham
parents: 3
diff changeset
574
193
b80dff4bef76 Remove all references to S_OK and S_ERR.
jcdutton
parents: 181
diff changeset
575 return DVDNAV_STATUS_OK;
8
66708b4a1b5e Stop C++ bitching about some things and extend the menus example
richwareham
parents: 3
diff changeset
576 }