Mercurial > mplayer.hg
annotate libmpdemux/stream.h @ 17960:ec93436dc52d
Fix a/v desync for real some files
author | rtognimp |
---|---|
date | Sun, 26 Mar 2006 14:10:52 +0000 |
parents | c0fa48581ccf |
children | 976fff94d59c |
rev | line source |
---|---|
998
8c83e3ff26cc
Added ifndef to prevent multiple header file inclusion.
bertrand
parents:
692
diff
changeset
|
1 #ifndef __STREAM_H |
8c83e3ff26cc
Added ifndef to prevent multiple header file inclusion.
bertrand
parents:
692
diff
changeset
|
2 #define __STREAM_H |
578 | 3 |
5086 | 4 #include "mp_msg.h" |
7412
ecef4f2191b2
some cosmetics - reordering declarations, 10l for cache2
arpi
parents:
7408
diff
changeset
|
5 #include <string.h> |
4029
3c87dee7a324
patch for missing include by Steven M. Schultz <sms@2BSD.COM>
pl
parents:
3998
diff
changeset
|
6 #include <inttypes.h> |
5292 | 7 #include <sys/types.h> |
4029
3c87dee7a324
patch for missing include by Steven M. Schultz <sms@2BSD.COM>
pl
parents:
3998
diff
changeset
|
8 |
7407 | 9 #define STREAMTYPE_DUMMY -1 // for placeholders, when the actual reading is handled in the demuxer |
10 #define STREAMTYPE_FILE 0 // read from seekable file | |
11 #define STREAMTYPE_VCD 1 // raw mode-2 CDROM reading, 2324 bytes/sector | |
12 #define STREAMTYPE_STREAM 2 // same as FILE but no seeking (for net/stdin) | |
13 #define STREAMTYPE_DVD 3 // libdvdread | |
14 #define STREAMTYPE_MEMORY 4 // read data from memory area | |
15 #define STREAMTYPE_PLAYLIST 6 // FIXME!!! same as STREAMTYPE_FILE now | |
16 #define STREAMTYPE_DS 8 // read from a demuxer stream | |
17 #define STREAMTYPE_DVDNAV 9 // we cannot safely "seek" in this... | |
18 #define STREAMTYPE_CDDA 10 // raw audio CD reader | |
7630
4c51ce16c4a2
smb:// (samba client) support by Vladimir Moushkov <vlindos_mpdev@abv.bg>
arpi
parents:
7412
diff
changeset
|
19 #define STREAMTYPE_SMB 11 // smb:// url, using libsmbclient (samba) |
8782
6af7a6595cc9
cdrwin-style bin/cue VCD image support (-vcd <track> -cuefile file.cue)
arpi
parents:
8164
diff
changeset
|
20 #define STREAMTYPE_VCDBINCUE 12 // vcd directly from bin/cue files |
9610 | 21 #define STREAMTYPE_DVB 13 |
14836
8b9738526dd7
added a stream module for the vstream client library
joey
parents:
13089
diff
changeset
|
22 #define STREAMTYPE_VSTREAM 14 |
15585 | 23 #define STREAMTYPE_SDP 15 |
578 | 24 |
7412
ecef4f2191b2
some cosmetics - reordering declarations, 10l for cache2
arpi
parents:
7408
diff
changeset
|
25 #define STREAM_BUFFER_SIZE 2048 |
ecef4f2191b2
some cosmetics - reordering declarations, 10l for cache2
arpi
parents:
7408
diff
changeset
|
26 |
578 | 27 #define VCD_SECTOR_SIZE 2352 |
28 #define VCD_SECTOR_OFFS 24 | |
29 #define VCD_SECTOR_DATA 2324 | |
30 | |
9794 | 31 /// atm it will always use mode == STREAM_READ |
32 /// streams that use the new api should check the mode at open | |
33 #define STREAM_READ 0 | |
34 #define STREAM_WRITE 1 | |
35 /// Seek flags, if not mannualy set and s->seek isn't NULL | |
36 /// STREAM_SEEK is automaticly set | |
37 #define STREAM_SEEK_BW 2 | |
38 #define STREAM_SEEK_FW 4 | |
39 #define STREAM_SEEK (STREAM_SEEK_BW|STREAM_SEEK_FW) | |
40 | |
41 //////////// Open return code | |
42 /// This can't open the requested protocol (used by stream wich have a | |
43 /// * protocol when they don't know the requested protocol) | |
44 #define STREAM_UNSUPORTED -1 | |
45 #define STREAM_ERROR 0 | |
46 #define STREAM_OK 1 | |
47 | |
48 #define MAX_STREAM_PROTOCOLS 10 | |
49 | |
9851 | 50 #define STREAM_CTRL_RESET 0 |
17696
66d7afee9a46
added new stream_control() and new command: STREAM_CTRL_GET_TIME_LENGTH
nicodvb
parents:
17012
diff
changeset
|
51 #define STREAM_CTRL_GET_TIME_LENGTH 1 |
9794 | 52 |
10121
d42177a0da2a
Changed the STREAMING defines to MPLAYER_NETWORK to avoid name definition clash.
bertrand
parents:
9886
diff
changeset
|
53 #ifdef MPLAYER_NETWORK |
3043
02a43ca97b52
Added a new struct to stream_t to handle, network streaming.
bertrand
parents:
2935
diff
changeset
|
54 #include "network.h" |
02a43ca97b52
Added a new struct to stream_t to handle, network streaming.
bertrand
parents:
2935
diff
changeset
|
55 #endif |
02a43ca97b52
Added a new struct to stream_t to handle, network streaming.
bertrand
parents:
2935
diff
changeset
|
56 |
9794 | 57 struct stream_st; |
58 typedef struct stream_info_st { | |
59 const char *info; | |
60 const char *name; | |
61 const char *author; | |
62 const char *comment; | |
63 /// mode isn't used atm (ie always READ) but it shouldn't be ignored | |
64 /// opts is at least in it's defaults settings and may have been | |
65 /// altered by url parsing if enabled and the options string parsing. | |
66 int (*open)(struct stream_st* st, int mode, void* opts, int* file_format); | |
67 char* protocols[MAX_STREAM_PROTOCOLS]; | |
68 void* opts; | |
69 int opts_url; /* If this is 1 we will parse the url as an option string | |
70 * too. Otherwise options are only parsed from the | |
71 * options string given to open_stream_plugin */ | |
72 } stream_info_t; | |
73 | |
8164
487cfc28525d
New config system + cleanup of header inter dependency
albeu
parents:
7854
diff
changeset
|
74 typedef struct stream_st { |
9794 | 75 // Read |
76 int (*fill_buffer)(struct stream_st *s, char* buffer, int max_len); | |
77 // Write | |
78 int (*write_buffer)(struct stream_st *s, char* buffer, int len); | |
79 // Seek | |
80 int (*seek)(struct stream_st *s,off_t pos); | |
81 // Control | |
82 // Will be later used to let streams like dvd and cdda report | |
83 // their structure (ie tracks, chapters, etc) | |
84 int (*control)(struct stream_st *s,int cmd,void* arg); | |
85 // Close | |
86 void (*close)(struct stream_st *s); | |
87 | |
7407 | 88 int fd; // file descriptor, see man open(2) |
89 int type; // see STREAMTYPE_* | |
9794 | 90 int flags; |
91 int sector_size; // sector size (seek will be aligned on this size if non 0) | |
578 | 92 unsigned int buf_pos,buf_len; |
6224
79b2b4c3c435
off_t fields reordered, to avoid problems due to struct padding
arpi
parents:
5819
diff
changeset
|
93 off_t pos,start_pos,end_pos; |
79b2b4c3c435
off_t fields reordered, to avoid problems due to struct padding
arpi
parents:
5819
diff
changeset
|
94 int eof; |
2322 | 95 unsigned int cache_pid; |
96 void* cache_data; | |
7329
9129781e5939
removed messy global 'tv_handle', use stream->priv for that purpose
arpi
parents:
7245
diff
changeset
|
97 void* priv; // used for DVD, TV, RTSP etc |
7407 | 98 char* url; // strdup() of filename/url |
10121
d42177a0da2a
Changed the STREAMING defines to MPLAYER_NETWORK to avoid name definition clash.
bertrand
parents:
9886
diff
changeset
|
99 #ifdef MPLAYER_NETWORK |
3043
02a43ca97b52
Added a new struct to stream_t to handle, network streaming.
bertrand
parents:
2935
diff
changeset
|
100 streaming_ctrl_t *streaming_ctrl; |
02a43ca97b52
Added a new struct to stream_t to handle, network streaming.
bertrand
parents:
2935
diff
changeset
|
101 #endif |
7407 | 102 unsigned char buffer[STREAM_BUFFER_SIZE>VCD_SECTOR_SIZE?STREAM_BUFFER_SIZE:VCD_SECTOR_SIZE]; |
578 | 103 } stream_t; |
104 | |
2322 | 105 #ifdef USE_STREAM_CACHE |
4825
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4551
diff
changeset
|
106 int stream_enable_cache(stream_t *stream,int size,int min,int prefill); |
7412
ecef4f2191b2
some cosmetics - reordering declarations, 10l for cache2
arpi
parents:
7408
diff
changeset
|
107 int cache_stream_fill_buffer(stream_t *s); |
ecef4f2191b2
some cosmetics - reordering declarations, 10l for cache2
arpi
parents:
7408
diff
changeset
|
108 int cache_stream_seek_long(stream_t *s,off_t pos); |
2322 | 109 #else |
7412
ecef4f2191b2
some cosmetics - reordering declarations, 10l for cache2
arpi
parents:
7408
diff
changeset
|
110 // no cache, define wrappers: |
2322 | 111 #define cache_stream_fill_buffer(x) stream_fill_buffer(x) |
112 #define cache_stream_seek_long(x,y) stream_seek_long(x,y) | |
5292 | 113 #define stream_enable_cache(x,y,z,w) 1 |
2322 | 114 #endif |
15954 | 115 void fixup_network_stream_cache(stream_t *stream); |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
998
diff
changeset
|
116 |
578 | 117 inline static int stream_read_char(stream_t *s){ |
118 return (s->buf_pos<s->buf_len)?s->buffer[s->buf_pos++]: | |
2322 | 119 (cache_stream_fill_buffer(s)?s->buffer[s->buf_pos++]:-256); |
578 | 120 // if(s->buf_pos<s->buf_len) return s->buffer[s->buf_pos++]; |
121 // stream_fill_buffer(s); | |
122 // if(s->buf_pos<s->buf_len) return s->buffer[s->buf_pos++]; | |
123 // return 0; // EOF | |
124 } | |
125 | |
126 inline static unsigned int stream_read_word(stream_t *s){ | |
127 int x,y; | |
128 x=stream_read_char(s); | |
129 y=stream_read_char(s); | |
130 return (x<<8)|y; | |
131 } | |
132 | |
133 inline static unsigned int stream_read_dword(stream_t *s){ | |
134 unsigned int y; | |
135 y=stream_read_char(s); | |
136 y=(y<<8)|stream_read_char(s); | |
137 y=(y<<8)|stream_read_char(s); | |
138 y=(y<<8)|stream_read_char(s); | |
139 return y; | |
140 } | |
141 | |
4189 | 142 #define stream_read_fourcc stream_read_dword_le |
143 | |
578 | 144 inline static unsigned int stream_read_word_le(stream_t *s){ |
145 int x,y; | |
146 x=stream_read_char(s); | |
147 y=stream_read_char(s); | |
148 return (y<<8)|x; | |
149 } | |
150 | |
151 inline static unsigned int stream_read_dword_le(stream_t *s){ | |
152 unsigned int y; | |
153 y=stream_read_char(s); | |
154 y|=stream_read_char(s)<<8; | |
155 y|=stream_read_char(s)<<16; | |
156 y|=stream_read_char(s)<<24; | |
157 return y; | |
158 } | |
159 | |
3998 | 160 inline static uint64_t stream_read_qword(stream_t *s){ |
161 uint64_t y; | |
162 y = stream_read_char(s); | |
163 y=(y<<8)|stream_read_char(s); | |
164 y=(y<<8)|stream_read_char(s); | |
165 y=(y<<8)|stream_read_char(s); | |
166 y=(y<<8)|stream_read_char(s); | |
167 y=(y<<8)|stream_read_char(s); | |
168 y=(y<<8)|stream_read_char(s); | |
169 y=(y<<8)|stream_read_char(s); | |
170 return y; | |
171 } | |
172 | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
10594
diff
changeset
|
173 inline static uint64_t stream_read_qword_le(stream_t *s){ |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
10594
diff
changeset
|
174 uint64_t y; |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
10594
diff
changeset
|
175 y = stream_read_char(s); |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
10594
diff
changeset
|
176 y|=stream_read_char(s)<<8; |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
10594
diff
changeset
|
177 y|=stream_read_char(s)<<16; |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
10594
diff
changeset
|
178 y|=stream_read_char(s)<<24; |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
10594
diff
changeset
|
179 y|=(uint64_t)stream_read_char(s)<<32; |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
10594
diff
changeset
|
180 y|=(uint64_t)stream_read_char(s)<<40; |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
10594
diff
changeset
|
181 y|=(uint64_t)stream_read_char(s)<<48; |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
10594
diff
changeset
|
182 y|=(uint64_t)stream_read_char(s)<<56; |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
10594
diff
changeset
|
183 return y; |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
10594
diff
changeset
|
184 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
10594
diff
changeset
|
185 |
5301 | 186 inline static unsigned int stream_read_int24(stream_t *s){ |
187 unsigned int y; | |
188 y = stream_read_char(s); | |
189 y=(y<<8)|stream_read_char(s); | |
190 y=(y<<8)|stream_read_char(s); | |
191 return y; | |
192 } | |
193 | |
2347 | 194 inline static int stream_read(stream_t *s,char* mem,int total){ |
195 int len=total; | |
578 | 196 while(len>0){ |
197 int x; | |
198 x=s->buf_len-s->buf_pos; | |
199 if(x==0){ | |
2347 | 200 if(!cache_stream_fill_buffer(s)) return total-len; // EOF |
578 | 201 x=s->buf_len-s->buf_pos; |
202 } | |
5086 | 203 if(s->buf_pos>s->buf_len) mp_msg(MSGT_DEMUX, MSGL_WARN, "stream_read: WARNING! s->buf_pos>s->buf_len\n"); |
578 | 204 if(x>len) x=len; |
205 memcpy(mem,&s->buffer[s->buf_pos],x); | |
206 s->buf_pos+=x; mem+=x; len-=x; | |
207 } | |
2347 | 208 return total; |
578 | 209 } |
210 | |
17879 | 211 inline static unsigned char* stream_read_line(stream_t *s,unsigned char* mem, int max) { |
212 int len; | |
213 unsigned char* end,*ptr = mem;; | |
214 do { | |
215 len = s->buf_len-s->buf_pos; | |
216 // try to fill the buffer | |
217 if(len <= 0 && | |
218 (!cache_stream_fill_buffer(s) || | |
219 (len = s->buf_len-s->buf_pos) <= 0)) break; | |
17880
c0fa48581ccf
Fix compilation with stupid C++ compilers that shock on valid C
albeu
parents:
17879
diff
changeset
|
220 end = (unsigned char*) memchr((void*)(s->buffer+s->buf_pos),'\n',len); |
17879 | 221 if(end) len = end - (s->buffer+s->buf_pos) + 1; |
222 if(len > 0 && max > 1) { | |
223 int l = len > max-1 ? max-1 : len; | |
224 memcpy(ptr,s->buffer+s->buf_pos,l); | |
225 max -= l; | |
226 ptr += l; | |
227 } | |
228 s->buf_pos += len; | |
229 } while(!end); | |
230 if(s->eof && ptr == mem) return NULL; | |
231 if(max > 0) ptr[0] = 0; | |
232 return mem; | |
233 } | |
234 | |
235 | |
578 | 236 inline static int stream_eof(stream_t *s){ |
237 return s->eof; | |
238 } | |
239 | |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
998
diff
changeset
|
240 inline static off_t stream_tell(stream_t *s){ |
578 | 241 return s->pos+s->buf_pos-s->buf_len; |
242 } | |
243 | |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
998
diff
changeset
|
244 inline static int stream_seek(stream_t *s,off_t pos){ |
578 | 245 |
5086 | 246 mp_dbg(MSGT_DEMUX, MSGL_DBG3, "seek to 0x%qX\n",(long long)pos); |
578 | 247 |
248 if(pos<s->pos){ | |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
998
diff
changeset
|
249 off_t x=pos-(s->pos-s->buf_len); |
578 | 250 if(x>=0){ |
251 s->buf_pos=x; | |
252 // putchar('*');fflush(stdout); | |
253 return 1; | |
254 } | |
255 } | |
256 | |
2322 | 257 return cache_stream_seek_long(s,pos); |
578 | 258 } |
259 | |
3962 | 260 inline static int stream_skip(stream_t *s,off_t len){ |
12018 | 261 if( (len<0 && (s->flags & STREAM_SEEK_BW)) || (len>2*STREAM_BUFFER_SIZE && (s->flags & STREAM_SEEK_FW)) ) { |
578 | 262 // negative or big skip! |
1491 | 263 return stream_seek(s,stream_tell(s)+len); |
578 | 264 } |
265 while(len>0){ | |
266 int x=s->buf_len-s->buf_pos; | |
267 if(x==0){ | |
2322 | 268 if(!cache_stream_fill_buffer(s)) return 0; // EOF |
578 | 269 x=s->buf_len-s->buf_pos; |
270 } | |
271 if(x>len) x=len; | |
272 //memcpy(mem,&s->buf[s->buf_pos],x); | |
273 s->buf_pos+=x; len-=x; | |
274 } | |
1491 | 275 return 1; |
578 | 276 } |
277 | |
278 void stream_reset(stream_t *s); | |
17712 | 279 int stream_control(stream_t *s, int cmd, void *arg); |
578 | 280 stream_t* new_stream(int fd,int type); |
281 void free_stream(stream_t *s); | |
2144 | 282 stream_t* new_memory_stream(unsigned char* data,int len); |
9794 | 283 stream_t* open_stream(char* filename,char** options,int* file_format); |
284 stream_t* open_stream_full(char* filename,int mode, char** options, int* file_format); | |
2555
66837325b929
config.h cleanup, few things added to steram/demuxer headers
arpi
parents:
2347
diff
changeset
|
285 |
66837325b929
config.h cleanup, few things added to steram/demuxer headers
arpi
parents:
2347
diff
changeset
|
286 //#ifdef USE_DVDREAD |
66837325b929
config.h cleanup, few things added to steram/demuxer headers
arpi
parents:
2347
diff
changeset
|
287 extern int dvd_title; |
66837325b929
config.h cleanup, few things added to steram/demuxer headers
arpi
parents:
2347
diff
changeset
|
288 extern int dvd_chapter; |
4291
e889d37f25b2
Add option -last-chapter for DVD playing/encoding
kmkaplan
parents:
4189
diff
changeset
|
289 extern int dvd_last_chapter; |
2555
66837325b929
config.h cleanup, few things added to steram/demuxer headers
arpi
parents:
2347
diff
changeset
|
290 extern int dvd_angle; |
66837325b929
config.h cleanup, few things added to steram/demuxer headers
arpi
parents:
2347
diff
changeset
|
291 //#endif |
998
8c83e3ff26cc
Added ifndef to prevent multiple header file inclusion.
bertrand
parents:
692
diff
changeset
|
292 |
6623 | 293 extern char * audio_stream; |
294 | |
5471
348c7d83e710
dvdnav_stream functions - dvdnav patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5380
diff
changeset
|
295 #ifdef USE_DVDNAV |
348c7d83e710
dvdnav_stream functions - dvdnav patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5380
diff
changeset
|
296 #include "dvdnav_stream.h" |
348c7d83e710
dvdnav_stream functions - dvdnav patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5380
diff
changeset
|
297 #endif |
348c7d83e710
dvdnav_stream functions - dvdnav patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5380
diff
changeset
|
298 |
2935 | 299 #ifdef USE_DVDREAD |
300 | |
5819 | 301 #ifdef USE_MPDVDKIT |
7245 | 302 #if (USE_MPDVDKIT == 2) |
17012 | 303 #include "libmpdvdkit2/dvd_reader.h" |
304 #include "libmpdvdkit2/ifo_types.h" | |
305 #include "libmpdvdkit2/ifo_read.h" | |
306 #include "libmpdvdkit2/nav_read.h" | |
7196 | 307 #else |
17012 | 308 #include "libmpdvdkit/dvd_reader.h" |
309 #include "libmpdvdkit/ifo_types.h" | |
310 #include "libmpdvdkit/ifo_read.h" | |
311 #include "libmpdvdkit/nav_read.h" | |
7196 | 312 #endif |
5819 | 313 #else |
2935 | 314 #include <dvdread/dvd_reader.h> |
315 #include <dvdread/ifo_types.h> | |
316 #include <dvdread/ifo_read.h> | |
317 #include <dvdread/nav_read.h> | |
5819 | 318 #endif |
2935 | 319 |
320 typedef struct { | |
321 int id; // 0 - 31 mpeg; 128 - 159 ac3; 160 - 191 pcm | |
322 int language; | |
6651 | 323 int type; |
324 int channels; | |
3751
d9d2ee82a243
subtitle_t + audio_stream_t -> stream_language_t (cleanup)
arpi
parents:
3726
diff
changeset
|
325 } stream_language_t; |
3048 | 326 |
327 typedef struct { | |
2935 | 328 dvd_reader_t *dvd; |
329 dvd_file_t *title; | |
330 ifo_handle_t *vmg_file; | |
331 tt_srpt_t *tt_srpt; | |
332 ifo_handle_t *vts_file; | |
333 vts_ptt_srpt_t *vts_ptt_srpt; | |
334 pgc_t *cur_pgc; | |
335 // | |
17697
3a56bbef9300
added cur_title to dvd_priv_t in order to keep track of dvd title currently playing (range 1..N)
nicodvb
parents:
17696
diff
changeset
|
336 int cur_title; |
2935 | 337 int cur_cell; |
4291
e889d37f25b2
Add option -last-chapter for DVD playing/encoding
kmkaplan
parents:
4189
diff
changeset
|
338 int last_cell; |
2935 | 339 int cur_pack; |
340 int cell_last_pack; | |
341 // Navi: | |
342 int packs_left; | |
343 dsi_t dsi_pack; | |
344 int angle_seek; | |
345 // audio datas | |
346 int nr_of_channels; | |
3751
d9d2ee82a243
subtitle_t + audio_stream_t -> stream_language_t (cleanup)
arpi
parents:
3726
diff
changeset
|
347 stream_language_t audio_streams[32]; |
3048 | 348 // subtitles |
349 int nr_of_subtitles; | |
3751
d9d2ee82a243
subtitle_t + audio_stream_t -> stream_language_t (cleanup)
arpi
parents:
3726
diff
changeset
|
350 stream_language_t subtitles[32]; |
2935 | 351 } dvd_priv_t; |
352 | |
13089 | 353 int dvd_number_of_subs(stream_t *stream); |
354 int dvd_lang_from_sid(stream_t *stream, int id); | |
3753 | 355 int dvd_aid_from_lang(stream_t *stream, unsigned char* lang); |
356 int dvd_sid_from_lang(stream_t *stream, unsigned char* lang); | |
7854 | 357 int dvd_chapter_from_cell(dvd_priv_t *dvd,int title,int cell); |
3753 | 358 |
2935 | 359 #endif |
360 | |
998
8c83e3ff26cc
Added ifndef to prevent multiple header file inclusion.
bertrand
parents:
692
diff
changeset
|
361 #endif // __STREAM_H |