Mercurial > mplayer.hg
annotate libmpdemux/stream.c @ 17267:123b780115e7
for roff: add missing linebreak in uspp description
author | wanderer |
---|---|
date | Fri, 30 Dec 2005 05:08:37 +0000 |
parents | 6ac0b5f0d1ed |
children | 66d7afee9a46 |
rev | line source |
---|---|
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1177
diff
changeset
|
1 |
1430 | 2 #include <stdio.h> |
3 #include <stdlib.h> | |
4 #include <unistd.h> | |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1177
diff
changeset
|
5 |
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1177
diff
changeset
|
6 #include <sys/types.h> |
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1177
diff
changeset
|
7 #include <sys/stat.h> |
9798 | 8 #ifndef __MINGW32__ |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1177
diff
changeset
|
9 #include <sys/ioctl.h> |
6814 | 10 #include <sys/wait.h> |
9798 | 11 #endif |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1177
diff
changeset
|
12 #include <fcntl.h> |
2322 | 13 #include <signal.h> |
9794 | 14 #include <strings.h> |
578 | 15 |
1430 | 16 #include "config.h" |
10281 | 17 |
18 #ifndef HAVE_WINSOCK2 | |
19 #define closesocket close | |
20 #else | |
21 #include <winsock2.h> | |
22 #endif | |
23 | |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1642
diff
changeset
|
24 #include "mp_msg.h" |
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1642
diff
changeset
|
25 #include "help_mp.h" |
17012 | 26 #include "osdep/shmem.h" |
578 | 27 |
28 #include "stream.h" | |
5133
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
4893
diff
changeset
|
29 #include "demuxer.h" |
578 | 30 |
17012 | 31 #include "m_option.h" |
32 #include "m_struct.h" | |
9794 | 33 |
34 | |
578 | 35 extern int verbose; // defined in mplayer.c |
10242 | 36 void cache_uninit(stream_t *s); // defined in cache2.c |
1 | 37 |
8812 | 38 //#include "vcd_read_bincue.h" |
8782
6af7a6595cc9
cdrwin-style bin/cue VCD image support (-vcd <track> -cuefile file.cue)
arpi
parents:
8524
diff
changeset
|
39 |
9886 | 40 #ifdef HAVE_VCD |
41 extern stream_info_t stream_info_vcd; | |
42 #endif | |
9810 | 43 #ifdef HAVE_CDDA |
9801 | 44 extern stream_info_t stream_info_cdda; |
9810 | 45 #endif |
10121
d42177a0da2a
Changed the STREAMING defines to MPLAYER_NETWORK to avoid name definition clash.
bertrand
parents:
9915
diff
changeset
|
46 #ifdef MPLAYER_NETWORK |
9853 | 47 extern stream_info_t stream_info_netstream; |
15585 | 48 extern stream_info_t stream_info_pnm; |
49 extern stream_info_t stream_info_asf; | |
50 extern stream_info_t stream_info_rtsp; | |
51 extern stream_info_t stream_info_rtp_udp; | |
52 extern stream_info_t stream_info_http1; | |
53 extern stream_info_t stream_info_http2; | |
9853 | 54 #endif |
10560 | 55 #ifdef HAS_DVBIN_SUPPORT |
56 extern stream_info_t stream_info_dvb; | |
57 #endif | |
10625
620cc649f519
ftp support. The change on connect2Server is needed bcs we need 2
albeu
parents:
10560
diff
changeset
|
58 #ifdef HAVE_FTP |
620cc649f519
ftp support. The change on connect2Server is needed bcs we need 2
albeu
parents:
10560
diff
changeset
|
59 extern stream_info_t stream_info_ftp; |
620cc649f519
ftp support. The change on connect2Server is needed bcs we need 2
albeu
parents:
10560
diff
changeset
|
60 #endif |
14836
8b9738526dd7
added a stream module for the vstream client library
joey
parents:
12018
diff
changeset
|
61 #ifdef HAVE_VSTREAM |
8b9738526dd7
added a stream module for the vstream client library
joey
parents:
12018
diff
changeset
|
62 extern stream_info_t stream_info_vstream; |
8b9738526dd7
added a stream module for the vstream client library
joey
parents:
12018
diff
changeset
|
63 #endif |
15518 | 64 #ifdef USE_DVDNAV |
65 extern stream_info_t stream_info_dvdnav; | |
66 #endif | |
15520 | 67 #ifdef LIBSMBCLIENT |
68 extern stream_info_t stream_info_smb; | |
69 #endif | |
16572
56a5f69e9b35
"LIVE.COM Streaming Media" is now called "LIVE555 Streaming Media".
rsf
parents:
15585
diff
changeset
|
70 #ifdef STREAMING_LIVE555 |
15585 | 71 extern stream_info_t stream_info_sdp; |
72 extern stream_info_t stream_info_rtsp_sip; | |
16762 | 73 #endif |
10560 | 74 |
15476
5eb4994a691f
ported cue:// to the new stream api; note: this stream must still be optimized in its read() and seek() functions
nicodvb
parents:
15421
diff
changeset
|
75 extern stream_info_t stream_info_cue; |
9901
233802490b0e
Add a null streamv Currently used for tv and mf. Could be used to
albeu
parents:
9886
diff
changeset
|
76 extern stream_info_t stream_info_null; |
9794 | 77 extern stream_info_t stream_info_file; |
17191
6ac0b5f0d1ed
fix compilation when dvdkit and dvdread are not available
nicodvb
parents:
17012
diff
changeset
|
78 #ifdef HAVE_DVD |
15518 | 79 extern stream_info_t stream_info_dvd; |
17191
6ac0b5f0d1ed
fix compilation when dvdkit and dvdread are not available
nicodvb
parents:
17012
diff
changeset
|
80 #endif |
9794 | 81 |
82 stream_info_t* auto_open_streams[] = { | |
9886 | 83 #ifdef HAVE_VCD |
84 &stream_info_vcd, | |
85 #endif | |
9810 | 86 #ifdef HAVE_CDDA |
9801 | 87 &stream_info_cdda, |
9810 | 88 #endif |
10121
d42177a0da2a
Changed the STREAMING defines to MPLAYER_NETWORK to avoid name definition clash.
bertrand
parents:
9915
diff
changeset
|
89 #ifdef MPLAYER_NETWORK |
9853 | 90 &stream_info_netstream, |
15585 | 91 &stream_info_http1, |
92 &stream_info_asf, | |
93 &stream_info_pnm, | |
94 &stream_info_rtsp, | |
16572
56a5f69e9b35
"LIVE.COM Streaming Media" is now called "LIVE555 Streaming Media".
rsf
parents:
15585
diff
changeset
|
95 #ifdef STREAMING_LIVE555 |
15585 | 96 &stream_info_sdp, |
97 &stream_info_rtsp_sip, | |
98 #endif | |
99 &stream_info_rtp_udp, | |
100 &stream_info_http2, | |
9853 | 101 #endif |
10560 | 102 #ifdef HAS_DVBIN_SUPPORT |
103 &stream_info_dvb, | |
104 #endif | |
10625
620cc649f519
ftp support. The change on connect2Server is needed bcs we need 2
albeu
parents:
10560
diff
changeset
|
105 #ifdef HAVE_FTP |
620cc649f519
ftp support. The change on connect2Server is needed bcs we need 2
albeu
parents:
10560
diff
changeset
|
106 &stream_info_ftp, |
620cc649f519
ftp support. The change on connect2Server is needed bcs we need 2
albeu
parents:
10560
diff
changeset
|
107 #endif |
14836
8b9738526dd7
added a stream module for the vstream client library
joey
parents:
12018
diff
changeset
|
108 #ifdef HAVE_VSTREAM |
8b9738526dd7
added a stream module for the vstream client library
joey
parents:
12018
diff
changeset
|
109 &stream_info_vstream, |
8b9738526dd7
added a stream module for the vstream client library
joey
parents:
12018
diff
changeset
|
110 #endif |
15520 | 111 #ifdef LIBSMBCLIENT |
112 &stream_info_smb, | |
113 #endif | |
15476
5eb4994a691f
ported cue:// to the new stream api; note: this stream must still be optimized in its read() and seek() functions
nicodvb
parents:
15421
diff
changeset
|
114 &stream_info_cue, |
17191
6ac0b5f0d1ed
fix compilation when dvdkit and dvdread are not available
nicodvb
parents:
17012
diff
changeset
|
115 #ifdef HAVE_DVD |
15518 | 116 &stream_info_dvd, |
17191
6ac0b5f0d1ed
fix compilation when dvdkit and dvdread are not available
nicodvb
parents:
17012
diff
changeset
|
117 #endif |
15518 | 118 #ifdef USE_DVDNAV |
119 &stream_info_dvdnav; | |
120 #endif | |
121 | |
9901
233802490b0e
Add a null streamv Currently used for tv and mf. Could be used to
albeu
parents:
9886
diff
changeset
|
122 &stream_info_null, |
9794 | 123 &stream_info_file, |
124 NULL | |
125 }; | |
126 | |
127 stream_t* open_stream_plugin(stream_info_t* sinfo,char* filename,int mode, | |
128 char** options, int* file_format, int* ret) { | |
129 void* arg = NULL; | |
130 stream_t* s; | |
131 m_struct_t* desc = (m_struct_t*)sinfo->opts; | |
132 | |
133 // Parse options | |
134 if(desc) { | |
135 arg = m_struct_alloc(desc); | |
136 if(sinfo->opts_url) { | |
137 m_option_t url_opt = | |
138 { "stream url", arg , CONF_TYPE_CUSTOM_URL, 0, 0 ,0, sinfo->opts }; | |
139 if(m_option_parse(&url_opt,"stream url",filename,arg,M_CONFIG_FILE) < 0) { | |
140 mp_msg(MSGT_OPEN,MSGL_ERR, "URL parsing failed on url %s\n",filename); | |
141 m_struct_free(desc,arg); | |
142 return NULL; | |
143 } | |
144 } | |
145 if(options) { | |
146 int i; | |
147 for(i = 0 ; options[i] != NULL ; i += 2) { | |
148 mp_msg(MSGT_OPEN,MSGL_DBG2, "Set stream arg %s=%s\n", | |
149 options[i],options[i+1]); | |
150 if(!m_struct_set(desc,arg,options[i],options[i+1])) | |
151 mp_msg(MSGT_OPEN,MSGL_WARN, "Failed to set stream option %s=%s\n", | |
152 options[i],options[i+1]); | |
153 } | |
154 } | |
155 } | |
156 s = new_stream(-2,-2); | |
157 s->url=strdup(filename); | |
158 s->flags |= mode; | |
159 *ret = sinfo->open(s,mode,arg,file_format); | |
160 if((*ret) != STREAM_OK) { | |
161 free(s->url); | |
162 free(s); | |
163 return NULL; | |
164 } | |
165 if(s->type <= -2) | |
166 mp_msg(MSGT_OPEN,MSGL_WARN, "Warning streams need a type !!!!\n"); | |
167 if(s->flags & STREAM_SEEK && !s->seek) | |
168 s->flags &= ~STREAM_SEEK; | |
169 if(s->seek && !(s->flags & STREAM_SEEK)) | |
9853 | 170 s->flags |= STREAM_SEEK; |
9794 | 171 |
172 | |
173 mp_msg(MSGT_OPEN,MSGL_V, "STREAM: [%s] %s\n",sinfo->name,filename); | |
174 mp_msg(MSGT_OPEN,MSGL_V, "STREAM: Description: %s\n",sinfo->info); | |
175 mp_msg(MSGT_OPEN,MSGL_V, "STREAM: Author: %s\n", sinfo->author); | |
176 mp_msg(MSGT_OPEN,MSGL_V, "STREAM: Comment: %s\n", sinfo->comment); | |
177 | |
178 return s; | |
179 } | |
180 | |
181 | |
182 stream_t* open_stream_full(char* filename,int mode, char** options, int* file_format) { | |
183 int i,j,l,r; | |
184 stream_info_t* sinfo; | |
185 stream_t* s; | |
186 | |
187 for(i = 0 ; auto_open_streams[i] ; i++) { | |
188 sinfo = auto_open_streams[i]; | |
189 if(!sinfo->protocols) { | |
10735
8a10d5d0ce86
serious bugs - 1l absinth (changed to absinth against cola inflation)
alex
parents:
10625
diff
changeset
|
190 mp_msg(MSGT_OPEN,MSGL_WARN, "Stream type %s has protocols == NULL, it's a bug\n", sinfo->name); |
9794 | 191 continue; |
192 } | |
193 for(j = 0 ; sinfo->protocols[j] ; j++) { | |
194 l = strlen(sinfo->protocols[j]); | |
195 // l == 0 => Don't do protocol matching (ie network and filenames) | |
196 if((l == 0) || ((strncmp(sinfo->protocols[j],filename,l) == 0) && | |
197 (strncmp("://",filename+l,3) == 0))) { | |
198 *file_format = DEMUXER_TYPE_UNKNOWN; | |
199 s = open_stream_plugin(sinfo,filename,mode,options,file_format,&r); | |
200 if(s) return s; | |
201 if(r != STREAM_UNSUPORTED) { | |
16793
8d4fb5469efb
Make a few more messages translatable by moving them into help_mp-en.h.
diego
parents:
16762
diff
changeset
|
202 mp_msg(MSGT_OPEN,MSGL_ERR, MSGTR_FailedToOpen,filename); |
9794 | 203 return NULL; |
204 } | |
205 break; | |
206 } | |
207 } | |
208 } | |
209 | |
210 mp_msg(MSGT_OPEN,MSGL_ERR, "No stream found to handle url %s\n",filename); | |
211 return NULL; | |
212 } | |
213 | |
1 | 214 //=================== STREAMER ========================= |
215 | |
216 int stream_fill_buffer(stream_t *s){ | |
217 int len; | |
9874
55a43ae66ceb
Oops, I just noticed albeu's revision 1.58 - so I backed out the
rsf
parents:
9873
diff
changeset
|
218 if (/*s->fd == NULL ||*/ s->eof) { s->buf_pos = s->buf_len = 0; return 0; } |
1 | 219 switch(s->type){ |
692 | 220 case STREAMTYPE_STREAM: |
10121
d42177a0da2a
Changed the STREAMING defines to MPLAYER_NETWORK to avoid name definition clash.
bertrand
parents:
9915
diff
changeset
|
221 #ifdef MPLAYER_NETWORK |
3044
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
222 if( s->streaming_ctrl!=NULL ) { |
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
223 len=s->streaming_ctrl->streaming_read(s->fd,s->buffer,STREAM_BUFFER_SIZE, s->streaming_ctrl);break; |
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
224 } else { |
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
225 len=read(s->fd,s->buffer,STREAM_BUFFER_SIZE);break; |
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
226 } |
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
227 #else |
1 | 228 len=read(s->fd,s->buffer,STREAM_BUFFER_SIZE);break; |
3044
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
229 #endif |
5133
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
4893
diff
changeset
|
230 case STREAMTYPE_DS: |
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
4893
diff
changeset
|
231 len = demux_read_data((demux_stream_t*)s->priv,s->buffer,STREAM_BUFFER_SIZE); |
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
4893
diff
changeset
|
232 break; |
9610 | 233 |
234 | |
9794 | 235 default: |
236 len= s->fill_buffer ? s->fill_buffer(s,s->buffer,STREAM_BUFFER_SIZE) : 0; | |
1 | 237 } |
238 if(len<=0){ s->eof=1; s->buf_pos=s->buf_len=0; return 0; } | |
239 s->buf_pos=0; | |
240 s->buf_len=len; | |
241 s->pos+=len; | |
242 // printf("[%d]",len);fflush(stdout); | |
243 return len; | |
244 } | |
245 | |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1177
diff
changeset
|
246 int stream_seek_long(stream_t *s,off_t pos){ |
6814 | 247 off_t newpos=0; |
1 | 248 |
2144 | 249 // if(verbose>=3) printf("seek_long to 0x%X\n",(unsigned int)pos); |
1 | 250 |
251 s->buf_pos=s->buf_len=0; | |
252 | |
253 switch(s->type){ | |
692 | 254 case STREAMTYPE_STREAM: |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1177
diff
changeset
|
255 #ifdef _LARGEFILE_SOURCE |
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1177
diff
changeset
|
256 newpos=pos&(~((long long)STREAM_BUFFER_SIZE-1));break; |
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1177
diff
changeset
|
257 #else |
492 | 258 newpos=pos&(~(STREAM_BUFFER_SIZE-1));break; |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1177
diff
changeset
|
259 #endif |
9794 | 260 default: |
261 // Round on sector size | |
262 if(s->sector_size) | |
263 newpos=(pos/s->sector_size)*s->sector_size; | |
264 else { // Otherwise on the buffer size | |
265 #ifdef _LARGEFILE_SOURCE | |
266 newpos=pos&(~((long long)STREAM_BUFFER_SIZE-1));break; | |
267 #else | |
268 newpos=pos&(~(STREAM_BUFFER_SIZE-1));break; | |
269 #endif | |
270 } | |
271 break; | |
1 | 272 } |
273 | |
2050 | 274 if(verbose>=3){ |
16750
0a31740dd5e6
Use PRI?64 defines as format strings for 64 bit variables.
reimar
parents:
16572
diff
changeset
|
275 printf("s->pos=%"PRIX64" newpos=%"PRIX64" new_bufpos=%"PRIX64" buflen=%X \n", |
0a31740dd5e6
Use PRI?64 defines as format strings for 64 bit variables.
reimar
parents:
16572
diff
changeset
|
276 (int64_t)s->pos,(int64_t)newpos,(int64_t)pos,s->buf_len); |
2050 | 277 } |
1 | 278 pos-=newpos; |
279 | |
280 if(newpos==0 || newpos!=s->pos){ | |
281 switch(s->type){ | |
692 | 282 case STREAMTYPE_STREAM: |
283 //s->pos=newpos; // real seek | |
3044
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
284 // Some streaming protocol allow to seek backward and forward |
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
285 // A function call that return -1 can tell that the protocol |
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
286 // doesn't support seeking. |
10121
d42177a0da2a
Changed the STREAMING defines to MPLAYER_NETWORK to avoid name definition clash.
bertrand
parents:
9915
diff
changeset
|
287 #ifdef MPLAYER_NETWORK |
11965 | 288 if(s->seek) { // new stream seek is much cleaner than streaming_ctrl one |
289 if(!s->seek(s,newpos)) { | |
290 mp_msg(MSGT_STREAM,MSGL_ERR, "Seek failed\n"); | |
12018 | 291 return 0; |
11965 | 292 } |
293 break; | |
294 } | |
295 | |
8929
c5ca1ae42555
check if seeking supported, otherwise fallback to null reading
arpi
parents:
8812
diff
changeset
|
296 if( s->streaming_ctrl!=NULL && s->streaming_ctrl->streaming_seek ) { |
3044
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
297 if( s->streaming_ctrl->streaming_seek( s->fd, pos, s->streaming_ctrl )<0 ) { |
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
298 mp_msg(MSGT_STREAM,MSGL_INFO,"Stream not seekable!\n"); |
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
299 return 1; |
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
300 } |
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
301 } |
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
302 #else |
692 | 303 if(newpos<s->pos){ |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1642
diff
changeset
|
304 mp_msg(MSGT_STREAM,MSGL_INFO,"Cannot seek backward in linear streams!\n"); |
692 | 305 return 1; |
306 } | |
307 while(s->pos<newpos){ | |
308 if(stream_fill_buffer(s)<=0) break; // EOF | |
309 } | |
3044
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
310 #endif |
692 | 311 break; |
7408 | 312 default: |
9794 | 313 // This should at the beginning as soon as all streams are converted |
314 if(!s->seek) | |
315 return 0; | |
316 // Now seek | |
317 if(!s->seek(s,newpos)) { | |
318 mp_msg(MSGT_STREAM,MSGL_ERR, "Seek failed\n"); | |
319 return 0; | |
320 } | |
1 | 321 } |
322 // putchar('.');fflush(stdout); | |
323 //} else { | |
324 // putchar('%');fflush(stdout); | |
325 } | |
326 | |
327 stream_fill_buffer(s); | |
1999 | 328 if(pos>=0 && pos<=s->buf_len){ |
1 | 329 s->buf_pos=pos; // byte position in sector |
330 return 1; | |
331 } | |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1642
diff
changeset
|
332 |
1999 | 333 // if(pos==s->buf_len) printf("XXX Seek to last byte of file -> EOF\n"); |
334 | |
16750
0a31740dd5e6
Use PRI?64 defines as format strings for 64 bit variables.
reimar
parents:
16572
diff
changeset
|
335 mp_msg(MSGT_STREAM,MSGL_V,"stream_seek: WARNING! Can't seek to 0x%"PRIX64" !\n",(int64_t)(pos+newpos)); |
1 | 336 return 0; |
337 } | |
338 | |
339 | |
340 void stream_reset(stream_t *s){ | |
341 if(s->eof){ | |
342 s->pos=0; //ftell(f); | |
343 // s->buf_pos=s->buf_len=0; | |
344 s->eof=0; | |
345 } | |
9853 | 346 if(s->control) s->control(s,STREAM_CTRL_RESET,NULL); |
1 | 347 //stream_seek(s,0); |
348 } | |
349 | |
2144 | 350 stream_t* new_memory_stream(unsigned char* data,int len){ |
351 stream_t *s=malloc(sizeof(stream_t)+len); | |
6892
b8e0b1c54940
10000l - didn't clear new stream struct, causing possible sig11 in cache layer
arpi
parents:
6814
diff
changeset
|
352 memset(s,0,sizeof(stream_t)); |
2144 | 353 s->fd=-1; |
354 s->type=STREAMTYPE_MEMORY; | |
355 s->buf_pos=0; s->buf_len=len; | |
356 s->start_pos=0; s->end_pos=len; | |
357 stream_reset(s); | |
358 s->pos=len; | |
359 memcpy(s->buffer,data,len); | |
360 return s; | |
361 } | |
362 | |
1 | 363 stream_t* new_stream(int fd,int type){ |
364 stream_t *s=malloc(sizeof(stream_t)); | |
3291 | 365 if(s==NULL) return NULL; |
366 memset(s,0,sizeof(stream_t)); | |
10281 | 367 |
368 #ifdef HAVE_WINSOCK2 | |
369 { | |
370 WSADATA wsdata; | |
371 int temp = WSAStartup(0x0202, &wsdata); // there might be a better place for this (-> later) | |
372 mp_msg(MSGT_STREAM,MSGL_V,"WINSOCK2 init: %i\n", temp); | |
373 } | |
374 #endif | |
3291 | 375 |
1 | 376 s->fd=fd; |
377 s->type=type; | |
180 | 378 s->buf_pos=s->buf_len=0; |
598 | 379 s->start_pos=s->end_pos=0; |
1642 | 380 s->priv=NULL; |
7407 | 381 s->url=NULL; |
2322 | 382 s->cache_pid=0; |
1 | 383 stream_reset(s); |
384 return s; | |
385 } | |
386 | |
387 void free_stream(stream_t *s){ | |
6138
523014df7d32
big cosmetics patch, cleanup of messages printed by mplayer and libs.
arpi
parents:
5982
diff
changeset
|
388 // printf("\n*** free_stream() called ***\n"); |
9798 | 389 #ifdef USE_STREAM_CACHE |
4893 | 390 if(s->cache_pid) { |
9915 | 391 cache_uninit(s); |
4893 | 392 } |
9798 | 393 #endif |
15520 | 394 if(s->close) s->close(s); |
15421
ae5e1b9e3c92
fix segfaults caused by socket and file descriptor mismatches on windows
faust3
parents:
14836
diff
changeset
|
395 if(s->fd>0){ |
ae5e1b9e3c92
fix segfaults caused by socket and file descriptor mismatches on windows
faust3
parents:
14836
diff
changeset
|
396 /* on unix we define closesocket to close |
ae5e1b9e3c92
fix segfaults caused by socket and file descriptor mismatches on windows
faust3
parents:
14836
diff
changeset
|
397 on windows however we have to distinguish between |
ae5e1b9e3c92
fix segfaults caused by socket and file descriptor mismatches on windows
faust3
parents:
14836
diff
changeset
|
398 network socket and file */ |
ae5e1b9e3c92
fix segfaults caused by socket and file descriptor mismatches on windows
faust3
parents:
14836
diff
changeset
|
399 if(s->url && strstr(s->url,"://")) |
ae5e1b9e3c92
fix segfaults caused by socket and file descriptor mismatches on windows
faust3
parents:
14836
diff
changeset
|
400 closesocket(s->fd); |
ae5e1b9e3c92
fix segfaults caused by socket and file descriptor mismatches on windows
faust3
parents:
14836
diff
changeset
|
401 else close(s->fd); |
ae5e1b9e3c92
fix segfaults caused by socket and file descriptor mismatches on windows
faust3
parents:
14836
diff
changeset
|
402 } |
10281 | 403 #ifdef HAVE_WINSOCK2 |
404 mp_msg(MSGT_STREAM,MSGL_V,"WINSOCK2 uninit\n"); | |
405 WSACleanup(); // there might be a better place for this (-> later) | |
406 #endif | |
9794 | 407 // Disabled atm, i don't like that. s->priv can be anything after all |
408 // streams should destroy their priv on close | |
409 //if(s->priv) free(s->priv); | |
410 if(s->url) free(s->url); | |
1 | 411 free(s); |
412 } | |
413 | |
5133
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
4893
diff
changeset
|
414 stream_t* new_ds_stream(demux_stream_t *ds) { |
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
4893
diff
changeset
|
415 stream_t* s = new_stream(-1,STREAMTYPE_DS); |
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
4893
diff
changeset
|
416 s->priv = ds; |
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
4893
diff
changeset
|
417 return s; |
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
4893
diff
changeset
|
418 } |