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