annotate libmpdemux/stream.h @ 8164:487cfc28525d

New config system + cleanup of header inter dependency
author albeu
date Tue, 12 Nov 2002 01:56:42 +0000
parents d6c29d863f15
children 6af7a6595cc9
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
3
5086
69778ca88835 mp_msg'ized (for i18n ;)
alex
parents: 4825
diff changeset
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
1863e0c6af59 sys/types.h required for off_t
arpi
parents: 5133
diff changeset
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
8780415baa87 stream layer cleanup - part 1
arpi
parents: 7406
diff changeset
9 #define STREAMTYPE_DUMMY -1 // for placeholders, when the actual reading is handled in the demuxer
8780415baa87 stream layer cleanup - part 1
arpi
parents: 7406
diff changeset
10 #define STREAMTYPE_FILE 0 // read from seekable file
8780415baa87 stream layer cleanup - part 1
arpi
parents: 7406
diff changeset
11 #define STREAMTYPE_VCD 1 // raw mode-2 CDROM reading, 2324 bytes/sector
8780415baa87 stream layer cleanup - part 1
arpi
parents: 7406
diff changeset
12 #define STREAMTYPE_STREAM 2 // same as FILE but no seeking (for net/stdin)
8780415baa87 stream layer cleanup - part 1
arpi
parents: 7406
diff changeset
13 #define STREAMTYPE_DVD 3 // libdvdread
8780415baa87 stream layer cleanup - part 1
arpi
parents: 7406
diff changeset
14 #define STREAMTYPE_MEMORY 4 // read data from memory area
8780415baa87 stream layer cleanup - part 1
arpi
parents: 7406
diff changeset
15 #define STREAMTYPE_PLAYLIST 6 // FIXME!!! same as STREAMTYPE_FILE now
8780415baa87 stream layer cleanup - part 1
arpi
parents: 7406
diff changeset
16 #define STREAMTYPE_DS 8 // read from a demuxer stream
8780415baa87 stream layer cleanup - part 1
arpi
parents: 7406
diff changeset
17 #define STREAMTYPE_DVDNAV 9 // we cannot safely "seek" in this...
8780415baa87 stream layer cleanup - part 1
arpi
parents: 7406
diff changeset
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)
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
20
7412
ecef4f2191b2 some cosmetics - reordering declarations, 10l for cache2
arpi
parents: 7408
diff changeset
21 #define STREAM_BUFFER_SIZE 2048
ecef4f2191b2 some cosmetics - reordering declarations, 10l for cache2
arpi
parents: 7408
diff changeset
22
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
23 #define VCD_SECTOR_SIZE 2352
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
24 #define VCD_SECTOR_OFFS 24
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
25 #define VCD_SECTOR_DATA 2324
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
26
3043
02a43ca97b52 Added a new struct to stream_t to handle, network streaming.
bertrand
parents: 2935
diff changeset
27 #ifdef STREAMING
02a43ca97b52 Added a new struct to stream_t to handle, network streaming.
bertrand
parents: 2935
diff changeset
28 #include "network.h"
02a43ca97b52 Added a new struct to stream_t to handle, network streaming.
bertrand
parents: 2935
diff changeset
29 #endif
02a43ca97b52 Added a new struct to stream_t to handle, network streaming.
bertrand
parents: 2935
diff changeset
30
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
31 int vcd_seek_to_track(int fd,int track);
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
32 void vcd_read_toc(int fd);
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
33
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents: 7854
diff changeset
34 typedef struct stream_st {
7407
8780415baa87 stream layer cleanup - part 1
arpi
parents: 7406
diff changeset
35 int fd; // file descriptor, see man open(2)
8780415baa87 stream layer cleanup - part 1
arpi
parents: 7406
diff changeset
36 int type; // see STREAMTYPE_*
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
37 unsigned int buf_pos,buf_len;
6224
79b2b4c3c435 off_t fields reordered, to avoid problems due to struct padding
arpi
parents: 5819
diff changeset
38 off_t pos,start_pos,end_pos;
79b2b4c3c435 off_t fields reordered, to avoid problems due to struct padding
arpi
parents: 5819
diff changeset
39 int eof;
2322
e22ec6fce385 cache2 support
arpi
parents: 2310
diff changeset
40 unsigned int cache_pid;
e22ec6fce385 cache2 support
arpi
parents: 2310
diff changeset
41 void* cache_data;
7329
9129781e5939 removed messy global 'tv_handle', use stream->priv for that purpose
arpi
parents: 7245
diff changeset
42 void* priv; // used for DVD, TV, RTSP etc
7407
8780415baa87 stream layer cleanup - part 1
arpi
parents: 7406
diff changeset
43 char* url; // strdup() of filename/url
3043
02a43ca97b52 Added a new struct to stream_t to handle, network streaming.
bertrand
parents: 2935
diff changeset
44 #ifdef STREAMING
02a43ca97b52 Added a new struct to stream_t to handle, network streaming.
bertrand
parents: 2935
diff changeset
45 streaming_ctrl_t *streaming_ctrl;
02a43ca97b52 Added a new struct to stream_t to handle, network streaming.
bertrand
parents: 2935
diff changeset
46 #endif
7407
8780415baa87 stream layer cleanup - part 1
arpi
parents: 7406
diff changeset
47 unsigned char buffer[STREAM_BUFFER_SIZE>VCD_SECTOR_SIZE?STREAM_BUFFER_SIZE:VCD_SECTOR_SIZE];
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
48 } stream_t;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
49
2322
e22ec6fce385 cache2 support
arpi
parents: 2310
diff changeset
50 #ifdef USE_STREAM_CACHE
4825
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4551
diff changeset
51 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
52 int cache_stream_fill_buffer(stream_t *s);
ecef4f2191b2 some cosmetics - reordering declarations, 10l for cache2
arpi
parents: 7408
diff changeset
53 int cache_stream_seek_long(stream_t *s,off_t pos);
2322
e22ec6fce385 cache2 support
arpi
parents: 2310
diff changeset
54 #else
7412
ecef4f2191b2 some cosmetics - reordering declarations, 10l for cache2
arpi
parents: 7408
diff changeset
55 // no cache, define wrappers:
2322
e22ec6fce385 cache2 support
arpi
parents: 2310
diff changeset
56 #define cache_stream_fill_buffer(x) stream_fill_buffer(x)
e22ec6fce385 cache2 support
arpi
parents: 2310
diff changeset
57 #define cache_stream_seek_long(x,y) stream_seek_long(x,y)
5292
1863e0c6af59 sys/types.h required for off_t
arpi
parents: 5133
diff changeset
58 #define stream_enable_cache(x,y,z,w) 1
2322
e22ec6fce385 cache2 support
arpi
parents: 2310
diff changeset
59 #endif
1428
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 998
diff changeset
60
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
61 inline static int stream_read_char(stream_t *s){
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
62 return (s->buf_pos<s->buf_len)?s->buffer[s->buf_pos++]:
2322
e22ec6fce385 cache2 support
arpi
parents: 2310
diff changeset
63 (cache_stream_fill_buffer(s)?s->buffer[s->buf_pos++]:-256);
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
64 // if(s->buf_pos<s->buf_len) return s->buffer[s->buf_pos++];
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
65 // stream_fill_buffer(s);
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
66 // if(s->buf_pos<s->buf_len) return s->buffer[s->buf_pos++];
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
67 // return 0; // EOF
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
68 }
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
69
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
70 inline static unsigned int stream_read_word(stream_t *s){
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
71 int x,y;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
72 x=stream_read_char(s);
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
73 y=stream_read_char(s);
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
74 return (x<<8)|y;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
75 }
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
76
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
77 inline static unsigned int stream_read_dword(stream_t *s){
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
78 unsigned int y;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
79 y=stream_read_char(s);
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
80 y=(y<<8)|stream_read_char(s);
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
81 y=(y<<8)|stream_read_char(s);
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
82 y=(y<<8)|stream_read_char(s);
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
83 return y;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
84 }
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
85
4189
6871d97e4261 initial support for FILM file demuxing
melanson
parents: 4042
diff changeset
86 #define stream_read_fourcc stream_read_dword_le
6871d97e4261 initial support for FILM file demuxing
melanson
parents: 4042
diff changeset
87
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
88 inline static unsigned int stream_read_word_le(stream_t *s){
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
89 int x,y;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
90 x=stream_read_char(s);
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
91 y=stream_read_char(s);
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
92 return (y<<8)|x;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
93 }
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
94
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
95 inline static unsigned int stream_read_dword_le(stream_t *s){
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
96 unsigned int y;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
97 y=stream_read_char(s);
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
98 y|=stream_read_char(s)<<8;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
99 y|=stream_read_char(s)<<16;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
100 y|=stream_read_char(s)<<24;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
101 return y;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
102 }
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
103
3998
0dbec5edd431 added stream_read_qword by Chris Bednar
alex
parents: 3962
diff changeset
104 inline static uint64_t stream_read_qword(stream_t *s){
0dbec5edd431 added stream_read_qword by Chris Bednar
alex
parents: 3962
diff changeset
105 uint64_t y;
0dbec5edd431 added stream_read_qword by Chris Bednar
alex
parents: 3962
diff changeset
106 y = stream_read_char(s);
0dbec5edd431 added stream_read_qword by Chris Bednar
alex
parents: 3962
diff changeset
107 y=(y<<8)|stream_read_char(s);
0dbec5edd431 added stream_read_qword by Chris Bednar
alex
parents: 3962
diff changeset
108 y=(y<<8)|stream_read_char(s);
0dbec5edd431 added stream_read_qword by Chris Bednar
alex
parents: 3962
diff changeset
109 y=(y<<8)|stream_read_char(s);
0dbec5edd431 added stream_read_qword by Chris Bednar
alex
parents: 3962
diff changeset
110 y=(y<<8)|stream_read_char(s);
0dbec5edd431 added stream_read_qword by Chris Bednar
alex
parents: 3962
diff changeset
111 y=(y<<8)|stream_read_char(s);
0dbec5edd431 added stream_read_qword by Chris Bednar
alex
parents: 3962
diff changeset
112 y=(y<<8)|stream_read_char(s);
0dbec5edd431 added stream_read_qword by Chris Bednar
alex
parents: 3962
diff changeset
113 y=(y<<8)|stream_read_char(s);
0dbec5edd431 added stream_read_qword by Chris Bednar
alex
parents: 3962
diff changeset
114 return y;
0dbec5edd431 added stream_read_qword by Chris Bednar
alex
parents: 3962
diff changeset
115 }
0dbec5edd431 added stream_read_qword by Chris Bednar
alex
parents: 3962
diff changeset
116
5301
d72c3169a343 Improved MP4 parsing (finally)
atmos4
parents: 5292
diff changeset
117 inline static unsigned int stream_read_int24(stream_t *s){
d72c3169a343 Improved MP4 parsing (finally)
atmos4
parents: 5292
diff changeset
118 unsigned int y;
d72c3169a343 Improved MP4 parsing (finally)
atmos4
parents: 5292
diff changeset
119 y = stream_read_char(s);
d72c3169a343 Improved MP4 parsing (finally)
atmos4
parents: 5292
diff changeset
120 y=(y<<8)|stream_read_char(s);
d72c3169a343 Improved MP4 parsing (finally)
atmos4
parents: 5292
diff changeset
121 y=(y<<8)|stream_read_char(s);
d72c3169a343 Improved MP4 parsing (finally)
atmos4
parents: 5292
diff changeset
122 return y;
d72c3169a343 Improved MP4 parsing (finally)
atmos4
parents: 5292
diff changeset
123 }
d72c3169a343 Improved MP4 parsing (finally)
atmos4
parents: 5292
diff changeset
124
2347
f6a10f4b6119 stream_read() now returns no. of bytes readed
arpi
parents: 2322
diff changeset
125 inline static int stream_read(stream_t *s,char* mem,int total){
f6a10f4b6119 stream_read() now returns no. of bytes readed
arpi
parents: 2322
diff changeset
126 int len=total;
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
127 while(len>0){
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
128 int x;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
129 x=s->buf_len-s->buf_pos;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
130 if(x==0){
2347
f6a10f4b6119 stream_read() now returns no. of bytes readed
arpi
parents: 2322
diff changeset
131 if(!cache_stream_fill_buffer(s)) return total-len; // EOF
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
132 x=s->buf_len-s->buf_pos;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
133 }
5086
69778ca88835 mp_msg'ized (for i18n ;)
alex
parents: 4825
diff changeset
134 if(s->buf_pos>s->buf_len) mp_msg(MSGT_DEMUX, MSGL_WARN, "stream_read: WARNING! s->buf_pos>s->buf_len\n");
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
135 if(x>len) x=len;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
136 memcpy(mem,&s->buffer[s->buf_pos],x);
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
137 s->buf_pos+=x; mem+=x; len-=x;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
138 }
2347
f6a10f4b6119 stream_read() now returns no. of bytes readed
arpi
parents: 2322
diff changeset
139 return total;
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
140 }
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
141
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
142 inline static int stream_eof(stream_t *s){
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
143 return s->eof;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
144 }
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
145
1428
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 998
diff changeset
146 inline static off_t stream_tell(stream_t *s){
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
147 return s->pos+s->buf_pos-s->buf_len;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
148 }
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
149
1428
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 998
diff changeset
150 inline static int stream_seek(stream_t *s,off_t pos){
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
151
5086
69778ca88835 mp_msg'ized (for i18n ;)
alex
parents: 4825
diff changeset
152 mp_dbg(MSGT_DEMUX, MSGL_DBG3, "seek to 0x%qX\n",(long long)pos);
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
153
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
154 if(pos<s->pos){
1428
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 998
diff changeset
155 off_t x=pos-(s->pos-s->buf_len);
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
156 if(x>=0){
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
157 s->buf_pos=x;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
158 // putchar('*');fflush(stdout);
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
159 return 1;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
160 }
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
161 }
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
162
2322
e22ec6fce385 cache2 support
arpi
parents: 2310
diff changeset
163 return cache_stream_seek_long(s,pos);
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
164 }
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
165
3962
449fc79d1ae3 stream_skip len s/be off_t
steve
parents: 3753
diff changeset
166 inline static int stream_skip(stream_t *s,off_t len){
692
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
167 if(len<0 || (len>2*STREAM_BUFFER_SIZE && s->type!=STREAMTYPE_STREAM)){
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
168 // negative or big skip!
1491
41e82ba06d1b return type of stream_seek changed void->int
arpi
parents: 1428
diff changeset
169 return stream_seek(s,stream_tell(s)+len);
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
170 }
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
171 while(len>0){
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
172 int x=s->buf_len-s->buf_pos;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
173 if(x==0){
2322
e22ec6fce385 cache2 support
arpi
parents: 2310
diff changeset
174 if(!cache_stream_fill_buffer(s)) return 0; // EOF
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
175 x=s->buf_len-s->buf_pos;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
176 }
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
177 if(x>len) x=len;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
178 //memcpy(mem,&s->buf[s->buf_pos],x);
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
179 s->buf_pos+=x; len-=x;
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
180 }
1491
41e82ba06d1b return type of stream_seek changed void->int
arpi
parents: 1428
diff changeset
181 return 1;
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
182 }
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
183
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
184 void stream_reset(stream_t *s);
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
185 stream_t* new_stream(int fd,int type);
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents:
diff changeset
186 void free_stream(stream_t *s);
2144
99f079ff9374 new_memory_stream() added
arpi
parents: 1594
diff changeset
187 stream_t* new_memory_stream(unsigned char* data,int len);
2555
66837325b929 config.h cleanup, few things added to steram/demuxer headers
arpi
parents: 2347
diff changeset
188 stream_t* open_stream(char* filename,int vcd_track,int* file_format);
66837325b929 config.h cleanup, few things added to steram/demuxer headers
arpi
parents: 2347
diff changeset
189
66837325b929 config.h cleanup, few things added to steram/demuxer headers
arpi
parents: 2347
diff changeset
190 //#ifdef USE_DVDREAD
4407
760481d8421c warning (proper) fix
pl
parents: 4343
diff changeset
191 struct config;
2555
66837325b929 config.h cleanup, few things added to steram/demuxer headers
arpi
parents: 2347
diff changeset
192 extern int dvd_title;
66837325b929 config.h cleanup, few things added to steram/demuxer headers
arpi
parents: 2347
diff changeset
193 extern int dvd_chapter;
4291
e889d37f25b2 Add option -last-chapter for DVD playing/encoding
kmkaplan
parents: 4189
diff changeset
194 extern int dvd_last_chapter;
2555
66837325b929 config.h cleanup, few things added to steram/demuxer headers
arpi
parents: 2347
diff changeset
195 extern int dvd_angle;
5380
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5301
diff changeset
196 extern int dvd_nav;
4343
b0c8eed7473c Extended DVD chapter specification. Remove -last-chapter option.
kmkaplan
parents: 4315
diff changeset
197 int dvd_parse_chapter_range(struct config*, const char*);
2555
66837325b929 config.h cleanup, few things added to steram/demuxer headers
arpi
parents: 2347
diff changeset
198 //#endif
998
8c83e3ff26cc Added ifndef to prevent multiple header file inclusion.
bertrand
parents: 692
diff changeset
199
6623
7bc4c6ba9485 add -audiofile support for gui
pontscho
parents: 6384
diff changeset
200 extern char * audio_stream;
7bc4c6ba9485 add -audiofile support for gui
pontscho
parents: 6384
diff changeset
201
5471
348c7d83e710 dvdnav_stream functions - dvdnav patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5380
diff changeset
202 #ifdef USE_DVDNAV
348c7d83e710 dvdnav_stream functions - dvdnav patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5380
diff changeset
203 #include "dvdnav_stream.h"
348c7d83e710 dvdnav_stream functions - dvdnav patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5380
diff changeset
204 #endif
348c7d83e710 dvdnav_stream functions - dvdnav patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5380
diff changeset
205
2935
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
206 #ifdef USE_DVDREAD
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
207
5819
194bca17117b DVDKIT support
arpi
parents: 5471
diff changeset
208 #ifdef USE_MPDVDKIT
7245
c5a023ac99bd gcc 2.95.4 doesn't like VAR==value without spaces
arpi
parents: 7196
diff changeset
209 #if (USE_MPDVDKIT == 2)
7196
9aca112abac7 1000l - libmpdvdkit2 fix, thx Nexus
arpi
parents: 6651
diff changeset
210 #include "../libmpdvdkit2/dvd_reader.h"
9aca112abac7 1000l - libmpdvdkit2 fix, thx Nexus
arpi
parents: 6651
diff changeset
211 #include "../libmpdvdkit2/ifo_types.h"
9aca112abac7 1000l - libmpdvdkit2 fix, thx Nexus
arpi
parents: 6651
diff changeset
212 #include "../libmpdvdkit2/ifo_read.h"
9aca112abac7 1000l - libmpdvdkit2 fix, thx Nexus
arpi
parents: 6651
diff changeset
213 #include "../libmpdvdkit2/nav_read.h"
9aca112abac7 1000l - libmpdvdkit2 fix, thx Nexus
arpi
parents: 6651
diff changeset
214 #else
5819
194bca17117b DVDKIT support
arpi
parents: 5471
diff changeset
215 #include "../libmpdvdkit/dvd_reader.h"
194bca17117b DVDKIT support
arpi
parents: 5471
diff changeset
216 #include "../libmpdvdkit/ifo_types.h"
194bca17117b DVDKIT support
arpi
parents: 5471
diff changeset
217 #include "../libmpdvdkit/ifo_read.h"
194bca17117b DVDKIT support
arpi
parents: 5471
diff changeset
218 #include "../libmpdvdkit/nav_read.h"
7196
9aca112abac7 1000l - libmpdvdkit2 fix, thx Nexus
arpi
parents: 6651
diff changeset
219 #endif
5819
194bca17117b DVDKIT support
arpi
parents: 5471
diff changeset
220 #else
2935
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
221 #include <dvdread/dvd_reader.h>
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
222 #include <dvdread/ifo_types.h>
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
223 #include <dvdread/ifo_read.h>
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
224 #include <dvdread/nav_read.h>
5819
194bca17117b DVDKIT support
arpi
parents: 5471
diff changeset
225 #endif
2935
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
226
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
227 typedef struct {
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
228 int id; // 0 - 31 mpeg; 128 - 159 ac3; 160 - 191 pcm
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
229 int language;
6651
8f49c75a2824 - add icon (nice, but very ugly hakk:)
pontscho
parents: 6623
diff changeset
230 int type;
8f49c75a2824 - add icon (nice, but very ugly hakk:)
pontscho
parents: 6623
diff changeset
231 int channels;
3751
d9d2ee82a243 subtitle_t + audio_stream_t -> stream_language_t (cleanup)
arpi
parents: 3726
diff changeset
232 } stream_language_t;
3048
b01551d725d4 add subtitle language detect.
pontscho
parents: 3043
diff changeset
233
b01551d725d4 add subtitle language detect.
pontscho
parents: 3043
diff changeset
234 typedef struct {
2935
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
235 dvd_reader_t *dvd;
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
236 dvd_file_t *title;
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
237 ifo_handle_t *vmg_file;
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
238 tt_srpt_t *tt_srpt;
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
239 ifo_handle_t *vts_file;
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
240 vts_ptt_srpt_t *vts_ptt_srpt;
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
241 pgc_t *cur_pgc;
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
242 //
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
243 int cur_cell;
4291
e889d37f25b2 Add option -last-chapter for DVD playing/encoding
kmkaplan
parents: 4189
diff changeset
244 int last_cell;
2935
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
245 int cur_pack;
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
246 int cell_last_pack;
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
247 // Navi:
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
248 int packs_left;
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
249 dsi_t dsi_pack;
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
250 int angle_seek;
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
251 // audio datas
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
252 int nr_of_channels;
3751
d9d2ee82a243 subtitle_t + audio_stream_t -> stream_language_t (cleanup)
arpi
parents: 3726
diff changeset
253 stream_language_t audio_streams[32];
3048
b01551d725d4 add subtitle language detect.
pontscho
parents: 3043
diff changeset
254 // subtitles
b01551d725d4 add subtitle language detect.
pontscho
parents: 3043
diff changeset
255 int nr_of_subtitles;
3751
d9d2ee82a243 subtitle_t + audio_stream_t -> stream_language_t (cleanup)
arpi
parents: 3726
diff changeset
256 stream_language_t subtitles[32];
2935
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
257 } dvd_priv_t;
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
258
3753
d3fc41a04cb7 dvd language->aid/sid functions
arpi
parents: 3751
diff changeset
259 int dvd_aid_from_lang(stream_t *stream, unsigned char* lang);
d3fc41a04cb7 dvd language->aid/sid functions
arpi
parents: 3751
diff changeset
260 int dvd_sid_from_lang(stream_t *stream, unsigned char* lang);
7854
d6c29d863f15 dvd chapter detect function from Gregory Kovriga
pontscho
parents: 7630
diff changeset
261 int dvd_chapter_from_cell(dvd_priv_t *dvd,int title,int cell);
3753
d3fc41a04cb7 dvd language->aid/sid functions
arpi
parents: 3751
diff changeset
262
2935
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
263 #endif
bc6cb25ad067 add dvd audio stream detect
pontscho
parents: 2790
diff changeset
264
998
8c83e3ff26cc Added ifndef to prevent multiple header file inclusion.
bertrand
parents: 692
diff changeset
265 #endif // __STREAM_H