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