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