Mercurial > mplayer.hg
annotate stream/stream.h @ 28968:e67354af521e
Revert
Date: Wed Mar 18 23:11:50 2009
New Revision: 28996
Log:
Fix libswscale compilation on non-x86, hopefully without breaking MinGW64 again.
This change was non optimal, correct would have been to revert the offending commits
if no time was available to find a clean fix.
author | michael |
---|---|
date | Thu, 19 Mar 2009 15:02:44 +0000 |
parents | a6b506faeb34 |
children | 0f1b5b68af32 |
rev | line source |
---|---|
26029 | 1 #ifndef MPLAYER_STREAM_H |
2 #define MPLAYER_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 |
18997 | 24 #define STREAMTYPE_PVR 16 |
19295
f6316aa3a7f2
conversion from stream_null to stream_tv was missing stream type
ben
parents:
19271
diff
changeset
|
25 #define STREAMTYPE_TV 17 |
19301 | 26 #define STREAMTYPE_MF 18 |
19568
bd821fd3e244
Radio support, patch by Vladimir Voroshilov (voroshil gmail com)
reimar
parents:
19475
diff
changeset
|
27 #define STREAMTYPE_RADIO 19 |
578 | 28 |
7412
ecef4f2191b2
some cosmetics - reordering declarations, 10l for cache2
arpi
parents:
7408
diff
changeset
|
29 #define STREAM_BUFFER_SIZE 2048 |
ecef4f2191b2
some cosmetics - reordering declarations, 10l for cache2
arpi
parents:
7408
diff
changeset
|
30 |
578 | 31 #define VCD_SECTOR_SIZE 2352 |
32 #define VCD_SECTOR_OFFS 24 | |
33 #define VCD_SECTOR_DATA 2324 | |
34 | |
9794 | 35 /// atm it will always use mode == STREAM_READ |
36 /// streams that use the new api should check the mode at open | |
37 #define STREAM_READ 0 | |
38 #define STREAM_WRITE 1 | |
39 /// Seek flags, if not mannualy set and s->seek isn't NULL | |
40 /// STREAM_SEEK is automaticly set | |
41 #define STREAM_SEEK_BW 2 | |
42 #define STREAM_SEEK_FW 4 | |
43 #define STREAM_SEEK (STREAM_SEEK_BW|STREAM_SEEK_FW) | |
44 | |
45 //////////// Open return code | |
25135
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24297
diff
changeset
|
46 #define STREAM_REDIRECTED -2 |
9794 | 47 /// This can't open the requested protocol (used by stream wich have a |
48 /// * protocol when they don't know the requested protocol) | |
24257 | 49 #define STREAM_UNSUPPORTED -1 |
9794 | 50 #define STREAM_ERROR 0 |
51 #define STREAM_OK 1 | |
52 | |
53 #define MAX_STREAM_PROTOCOLS 10 | |
54 | |
9851 | 55 #define STREAM_CTRL_RESET 0 |
17696
66d7afee9a46
added new stream_control() and new command: STREAM_CTRL_GET_TIME_LENGTH
nicodvb
parents:
17012
diff
changeset
|
56 #define STREAM_CTRL_GET_TIME_LENGTH 1 |
19434
f2da98669a77
new STREAM_CTRL_SEEK_TO_CHAPTER (will be used by streams dvd[nav], maybe [s]vcd
nicodvb
parents:
19301
diff
changeset
|
57 #define STREAM_CTRL_SEEK_TO_CHAPTER 2 |
19437
c73bf418b291
new stream_ctrl to get currently playing chapter (needed for stream-driven relative chapter seeking)
nicodvb
parents:
19434
diff
changeset
|
58 #define STREAM_CTRL_GET_CURRENT_CHAPTER 3 |
19475
1f117b5fb5a1
added STREAM_CTRL_GET_NUM_CHAPTERS to get total number of chapters from the stream reader
nicodvb
parents:
19437
diff
changeset
|
59 #define STREAM_CTRL_GET_NUM_CHAPTERS 4 |
20744
30091c3ad3cd
added definitions of STREAM_CTRL_GET_CURRENT_TIME STREAM_CTRL_SEEK_TO_TIME
nicodvb
parents:
19568
diff
changeset
|
60 #define STREAM_CTRL_GET_CURRENT_TIME 5 |
30091c3ad3cd
added definitions of STREAM_CTRL_GET_CURRENT_TIME STREAM_CTRL_SEEK_TO_TIME
nicodvb
parents:
19568
diff
changeset
|
61 #define STREAM_CTRL_SEEK_TO_TIME 6 |
21657
5f5ed194b54b
new STREAM_CTRL_GET_SIZE to get size of output stream
nicodvb
parents:
21655
diff
changeset
|
62 #define STREAM_CTRL_GET_SIZE 7 |
24297
a5ae2d4973b8
introduced STREAM_CTRL_GET_ASPECT_RATIO to report the aspect ratio read from the stream layer (if supported)
nicodvb
parents:
24257
diff
changeset
|
63 #define STREAM_CTRL_GET_ASPECT_RATIO 8 |
25572
f6c0bce13b17
NEW STREAM_CTRLs: STREAM_CTRL_GET_NUM_ANGLES STREAM_CTRL_GET_ANGLE STREAM_CTRL_SET_ANGLE
nicodvb
parents:
25547
diff
changeset
|
64 #define STREAM_CTRL_GET_NUM_ANGLES 9 |
f6c0bce13b17
NEW STREAM_CTRLs: STREAM_CTRL_GET_NUM_ANGLES STREAM_CTRL_GET_ANGLE STREAM_CTRL_SET_ANGLE
nicodvb
parents:
25547
diff
changeset
|
65 #define STREAM_CTRL_GET_ANGLE 10 |
f6c0bce13b17
NEW STREAM_CTRLs: STREAM_CTRL_GET_NUM_ANGLES STREAM_CTRL_GET_ANGLE STREAM_CTRL_SET_ANGLE
nicodvb
parents:
25547
diff
changeset
|
66 #define STREAM_CTRL_SET_ANGLE 11 |
9794 | 67 |
27753
6c915906bbc6
Move DEFAULT_CDROM_DEVICE/DEFAULT_DVD_DEVICE to stream.h where it belongs.
diego
parents:
27397
diff
changeset
|
68 |
27397
d47744b95b78
Give a CONFIG_ prefix to preprocessor directives that lacked one and
diego
parents:
27341
diff
changeset
|
69 #ifdef CONFIG_NETWORK |
3043
02a43ca97b52
Added a new struct to stream_t to handle, network streaming.
bertrand
parents:
2935
diff
changeset
|
70 #include "network.h" |
02a43ca97b52
Added a new struct to stream_t to handle, network streaming.
bertrand
parents:
2935
diff
changeset
|
71 #endif |
02a43ca97b52
Added a new struct to stream_t to handle, network streaming.
bertrand
parents:
2935
diff
changeset
|
72 |
9794 | 73 struct stream_st; |
74 typedef struct stream_info_st { | |
75 const char *info; | |
76 const char *name; | |
77 const char *author; | |
78 const char *comment; | |
79 /// mode isn't used atm (ie always READ) but it shouldn't be ignored | |
80 /// opts is at least in it's defaults settings and may have been | |
81 /// altered by url parsing if enabled and the options string parsing. | |
82 int (*open)(struct stream_st* st, int mode, void* opts, int* file_format); | |
25690
7b66e1a132de
stream_info_t opts and protocols point to constant data as well.
reimar
parents:
25572
diff
changeset
|
83 const char* protocols[MAX_STREAM_PROTOCOLS]; |
7b66e1a132de
stream_info_t opts and protocols point to constant data as well.
reimar
parents:
25572
diff
changeset
|
84 const void* opts; |
9794 | 85 int opts_url; /* If this is 1 we will parse the url as an option string |
86 * too. Otherwise options are only parsed from the | |
87 * options string given to open_stream_plugin */ | |
88 } stream_info_t; | |
89 | |
8164
487cfc28525d
New config system + cleanup of header inter dependency
albeu
parents:
7854
diff
changeset
|
90 typedef struct stream_st { |
9794 | 91 // Read |
92 int (*fill_buffer)(struct stream_st *s, char* buffer, int max_len); | |
93 // Write | |
94 int (*write_buffer)(struct stream_st *s, char* buffer, int len); | |
95 // Seek | |
96 int (*seek)(struct stream_st *s,off_t pos); | |
97 // Control | |
98 // Will be later used to let streams like dvd and cdda report | |
99 // their structure (ie tracks, chapters, etc) | |
100 int (*control)(struct stream_st *s,int cmd,void* arg); | |
101 // Close | |
102 void (*close)(struct stream_st *s); | |
103 | |
7407 | 104 int fd; // file descriptor, see man open(2) |
105 int type; // see STREAMTYPE_* | |
9794 | 106 int flags; |
107 int sector_size; // sector size (seek will be aligned on this size if non 0) | |
578 | 108 unsigned int buf_pos,buf_len; |
6224
79b2b4c3c435
off_t fields reordered, to avoid problems due to struct padding
arpi
parents:
5819
diff
changeset
|
109 off_t pos,start_pos,end_pos; |
79b2b4c3c435
off_t fields reordered, to avoid problems due to struct padding
arpi
parents:
5819
diff
changeset
|
110 int eof; |
21655 | 111 int mode; //STREAM_READ or STREAM_WRITE |
2322 | 112 unsigned int cache_pid; |
113 void* cache_data; | |
7329
9129781e5939
removed messy global 'tv_handle', use stream->priv for that purpose
arpi
parents:
7245
diff
changeset
|
114 void* priv; // used for DVD, TV, RTSP etc |
7407 | 115 char* url; // strdup() of filename/url |
27397
d47744b95b78
Give a CONFIG_ prefix to preprocessor directives that lacked one and
diego
parents:
27341
diff
changeset
|
116 #ifdef CONFIG_NETWORK |
3043
02a43ca97b52
Added a new struct to stream_t to handle, network streaming.
bertrand
parents:
2935
diff
changeset
|
117 streaming_ctrl_t *streaming_ctrl; |
02a43ca97b52
Added a new struct to stream_t to handle, network streaming.
bertrand
parents:
2935
diff
changeset
|
118 #endif |
7407 | 119 unsigned char buffer[STREAM_BUFFER_SIZE>VCD_SECTOR_SIZE?STREAM_BUFFER_SIZE:VCD_SECTOR_SIZE]; |
578 | 120 } stream_t; |
121 | |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
26326
diff
changeset
|
122 #ifdef CONFIG_STREAM_CACHE |
4825
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4551
diff
changeset
|
123 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
|
124 int cache_stream_fill_buffer(stream_t *s); |
ecef4f2191b2
some cosmetics - reordering declarations, 10l for cache2
arpi
parents:
7408
diff
changeset
|
125 int cache_stream_seek_long(stream_t *s,off_t pos); |
2322 | 126 #else |
7412
ecef4f2191b2
some cosmetics - reordering declarations, 10l for cache2
arpi
parents:
7408
diff
changeset
|
127 // no cache, define wrappers: |
22540
52c574919687
Fix live555 compilation when stream cache is disabled.
diego
parents:
21657
diff
changeset
|
128 int stream_fill_buffer(stream_t *s); |
52c574919687
Fix live555 compilation when stream cache is disabled.
diego
parents:
21657
diff
changeset
|
129 int stream_seek_long(stream_t *s,off_t pos); |
2322 | 130 #define cache_stream_fill_buffer(x) stream_fill_buffer(x) |
131 #define cache_stream_seek_long(x,y) stream_seek_long(x,y) | |
5292 | 132 #define stream_enable_cache(x,y,z,w) 1 |
2322 | 133 #endif |
15954 | 134 void fixup_network_stream_cache(stream_t *stream); |
21655 | 135 int stream_write_buffer(stream_t *s, unsigned char *buf, int len); |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
998
diff
changeset
|
136 |
578 | 137 inline static int stream_read_char(stream_t *s){ |
138 return (s->buf_pos<s->buf_len)?s->buffer[s->buf_pos++]: | |
2322 | 139 (cache_stream_fill_buffer(s)?s->buffer[s->buf_pos++]:-256); |
578 | 140 // if(s->buf_pos<s->buf_len) return s->buffer[s->buf_pos++]; |
141 // stream_fill_buffer(s); | |
142 // if(s->buf_pos<s->buf_len) return s->buffer[s->buf_pos++]; | |
143 // return 0; // EOF | |
144 } | |
145 | |
146 inline static unsigned int stream_read_word(stream_t *s){ | |
147 int x,y; | |
148 x=stream_read_char(s); | |
149 y=stream_read_char(s); | |
150 return (x<<8)|y; | |
151 } | |
152 | |
153 inline static unsigned int stream_read_dword(stream_t *s){ | |
154 unsigned int y; | |
155 y=stream_read_char(s); | |
156 y=(y<<8)|stream_read_char(s); | |
157 y=(y<<8)|stream_read_char(s); | |
158 y=(y<<8)|stream_read_char(s); | |
159 return y; | |
160 } | |
161 | |
4189 | 162 #define stream_read_fourcc stream_read_dword_le |
163 | |
578 | 164 inline static unsigned int stream_read_word_le(stream_t *s){ |
165 int x,y; | |
166 x=stream_read_char(s); | |
167 y=stream_read_char(s); | |
168 return (y<<8)|x; | |
169 } | |
170 | |
171 inline static unsigned int stream_read_dword_le(stream_t *s){ | |
172 unsigned int y; | |
173 y=stream_read_char(s); | |
174 y|=stream_read_char(s)<<8; | |
175 y|=stream_read_char(s)<<16; | |
176 y|=stream_read_char(s)<<24; | |
177 return y; | |
178 } | |
179 | |
3998 | 180 inline static uint64_t stream_read_qword(stream_t *s){ |
181 uint64_t y; | |
182 y = stream_read_char(s); | |
183 y=(y<<8)|stream_read_char(s); | |
184 y=(y<<8)|stream_read_char(s); | |
185 y=(y<<8)|stream_read_char(s); | |
186 y=(y<<8)|stream_read_char(s); | |
187 y=(y<<8)|stream_read_char(s); | |
188 y=(y<<8)|stream_read_char(s); | |
189 y=(y<<8)|stream_read_char(s); | |
190 return y; | |
191 } | |
192 | |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
10594
diff
changeset
|
193 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
|
194 uint64_t y; |
24079
f40ff9321699
Fix a bug in stream_read_qword_le due to sign extension from int to uint64_t.
reimar
parents:
23689
diff
changeset
|
195 y = stream_read_dword_le(s); |
f40ff9321699
Fix a bug in stream_read_qword_le due to sign extension from int to uint64_t.
reimar
parents:
23689
diff
changeset
|
196 y|=(uint64_t)stream_read_dword_le(s)<<32; |
11807
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
10594
diff
changeset
|
197 return y; |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
10594
diff
changeset
|
198 } |
9a81d7b4c0b6
Added the new C based Matroska demuxer by Aurelien Jacobs.
mosu
parents:
10594
diff
changeset
|
199 |
5301 | 200 inline static unsigned int stream_read_int24(stream_t *s){ |
201 unsigned int y; | |
202 y = stream_read_char(s); | |
203 y=(y<<8)|stream_read_char(s); | |
204 y=(y<<8)|stream_read_char(s); | |
205 return y; | |
206 } | |
207 | |
2347 | 208 inline static int stream_read(stream_t *s,char* mem,int total){ |
209 int len=total; | |
578 | 210 while(len>0){ |
211 int x; | |
212 x=s->buf_len-s->buf_pos; | |
213 if(x==0){ | |
2347 | 214 if(!cache_stream_fill_buffer(s)) return total-len; // EOF |
578 | 215 x=s->buf_len-s->buf_pos; |
216 } | |
5086 | 217 if(s->buf_pos>s->buf_len) mp_msg(MSGT_DEMUX, MSGL_WARN, "stream_read: WARNING! s->buf_pos>s->buf_len\n"); |
578 | 218 if(x>len) x=len; |
219 memcpy(mem,&s->buffer[s->buf_pos],x); | |
220 s->buf_pos+=x; mem+=x; len-=x; | |
221 } | |
2347 | 222 return total; |
578 | 223 } |
224 | |
17879 | 225 inline static unsigned char* stream_read_line(stream_t *s,unsigned char* mem, int max) { |
226 int len; | |
28576 | 227 unsigned char* end,*ptr = mem; |
17879 | 228 do { |
229 len = s->buf_len-s->buf_pos; | |
230 // try to fill the buffer | |
231 if(len <= 0 && | |
232 (!cache_stream_fill_buffer(s) || | |
233 (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
|
234 end = (unsigned char*) memchr((void*)(s->buffer+s->buf_pos),'\n',len); |
17879 | 235 if(end) len = end - (s->buffer+s->buf_pos) + 1; |
236 if(len > 0 && max > 1) { | |
237 int l = len > max-1 ? max-1 : len; | |
238 memcpy(ptr,s->buffer+s->buf_pos,l); | |
239 max -= l; | |
240 ptr += l; | |
241 } | |
242 s->buf_pos += len; | |
243 } while(!end); | |
244 if(s->eof && ptr == mem) return NULL; | |
245 if(max > 0) ptr[0] = 0; | |
246 return mem; | |
247 } | |
248 | |
249 | |
578 | 250 inline static int stream_eof(stream_t *s){ |
251 return s->eof; | |
252 } | |
253 | |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
998
diff
changeset
|
254 inline static off_t stream_tell(stream_t *s){ |
578 | 255 return s->pos+s->buf_pos-s->buf_len; |
256 } | |
257 | |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
998
diff
changeset
|
258 inline static int stream_seek(stream_t *s,off_t pos){ |
578 | 259 |
5086 | 260 mp_dbg(MSGT_DEMUX, MSGL_DBG3, "seek to 0x%qX\n",(long long)pos); |
578 | 261 |
262 if(pos<s->pos){ | |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
998
diff
changeset
|
263 off_t x=pos-(s->pos-s->buf_len); |
578 | 264 if(x>=0){ |
265 s->buf_pos=x; | |
266 // putchar('*');fflush(stdout); | |
267 return 1; | |
268 } | |
269 } | |
270 | |
2322 | 271 return cache_stream_seek_long(s,pos); |
578 | 272 } |
273 | |
3962 | 274 inline static int stream_skip(stream_t *s,off_t len){ |
12018 | 275 if( (len<0 && (s->flags & STREAM_SEEK_BW)) || (len>2*STREAM_BUFFER_SIZE && (s->flags & STREAM_SEEK_FW)) ) { |
578 | 276 // negative or big skip! |
1491 | 277 return stream_seek(s,stream_tell(s)+len); |
578 | 278 } |
279 while(len>0){ | |
280 int x=s->buf_len-s->buf_pos; | |
281 if(x==0){ | |
2322 | 282 if(!cache_stream_fill_buffer(s)) return 0; // EOF |
578 | 283 x=s->buf_len-s->buf_pos; |
284 } | |
285 if(x>len) x=len; | |
286 //memcpy(mem,&s->buf[s->buf_pos],x); | |
287 s->buf_pos+=x; len-=x; | |
288 } | |
1491 | 289 return 1; |
578 | 290 } |
291 | |
292 void stream_reset(stream_t *s); | |
17712 | 293 int stream_control(stream_t *s, int cmd, void *arg); |
578 | 294 stream_t* new_stream(int fd,int type); |
295 void free_stream(stream_t *s); | |
2144 | 296 stream_t* new_memory_stream(unsigned char* data,int len); |
9794 | 297 stream_t* open_stream(char* filename,char** options,int* file_format); |
298 stream_t* open_stream_full(char* filename,int mode, char** options, int* file_format); | |
21655 | 299 stream_t* open_output_stream(char* filename,char** options); |
26326
5bfc1d8bece9
Remove the need for code using stream to export an mp_input_check_interrupt()
albeu
parents:
26029
diff
changeset
|
300 /// Set the callback to be used by libstream to check for user |
5bfc1d8bece9
Remove the need for code using stream to export an mp_input_check_interrupt()
albeu
parents:
26029
diff
changeset
|
301 /// interruption during long blocking operations (cache filling, etc). |
5bfc1d8bece9
Remove the need for code using stream to export an mp_input_check_interrupt()
albeu
parents:
26029
diff
changeset
|
302 void stream_set_interrupt_callback(int (*cb)(int)); |
5bfc1d8bece9
Remove the need for code using stream to export an mp_input_check_interrupt()
albeu
parents:
26029
diff
changeset
|
303 /// Call the interrupt checking callback if there is one. |
5bfc1d8bece9
Remove the need for code using stream to export an mp_input_check_interrupt()
albeu
parents:
26029
diff
changeset
|
304 int stream_check_interrupt(int time); |
2555
66837325b929
config.h cleanup, few things added to steram/demuxer headers
arpi
parents:
2347
diff
changeset
|
305 |
66837325b929
config.h cleanup, few things added to steram/demuxer headers
arpi
parents:
2347
diff
changeset
|
306 extern int dvd_title; |
66837325b929
config.h cleanup, few things added to steram/demuxer headers
arpi
parents:
2347
diff
changeset
|
307 extern int dvd_chapter; |
4291
e889d37f25b2
Add option -last-chapter for DVD playing/encoding
kmkaplan
parents:
4189
diff
changeset
|
308 extern int dvd_last_chapter; |
2555
66837325b929
config.h cleanup, few things added to steram/demuxer headers
arpi
parents:
2347
diff
changeset
|
309 extern int dvd_angle; |
998
8c83e3ff26cc
Added ifndef to prevent multiple header file inclusion.
bertrand
parents:
692
diff
changeset
|
310 |
6623 | 311 extern char * audio_stream; |
312 | |
2935 | 313 typedef struct { |
314 int id; // 0 - 31 mpeg; 128 - 159 ac3; 160 - 191 pcm | |
315 int language; | |
6651 | 316 int type; |
317 int channels; | |
3751
d9d2ee82a243
subtitle_t + audio_stream_t -> stream_language_t (cleanup)
arpi
parents:
3726
diff
changeset
|
318 } stream_language_t; |
3048 | 319 |
26029 | 320 #endif /* MPLAYER_STREAM_H */ |