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