Mercurial > mplayer.hg
annotate libmpdemux/stream.c @ 15476:5eb4994a691f
ported cue:// to the new stream api; note: this stream must still be optimized in its read() and seek() functions
author | nicodvb |
---|---|
date | Sun, 15 May 2005 07:38:42 +0000 |
parents | ae5e1b9e3c92 |
children | 9391bf60ccdf |
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 |
1595 | 40 #ifdef USE_DVDREAD |
8344 | 41 int dvd_read_sector(dvd_priv_t *d,unsigned char* data); |
42 void dvd_seek(dvd_priv_t *d,int pos); | |
6814 | 43 void dvd_close(dvd_priv_t *d); |
1595 | 44 #endif |
45 | |
7630
4c51ce16c4a2
smb:// (samba client) support by Vladimir Moushkov <vlindos_mpdev@abv.bg>
arpi
parents:
7408
diff
changeset
|
46 #ifdef LIBSMBCLIENT |
4c51ce16c4a2
smb:// (samba client) support by Vladimir Moushkov <vlindos_mpdev@abv.bg>
arpi
parents:
7408
diff
changeset
|
47 #include "libsmbclient.h" |
4c51ce16c4a2
smb:// (samba client) support by Vladimir Moushkov <vlindos_mpdev@abv.bg>
arpi
parents:
7408
diff
changeset
|
48 #endif |
4c51ce16c4a2
smb:// (samba client) support by Vladimir Moushkov <vlindos_mpdev@abv.bg>
arpi
parents:
7408
diff
changeset
|
49 |
9886 | 50 #ifdef HAVE_VCD |
51 extern stream_info_t stream_info_vcd; | |
52 #endif | |
9810 | 53 #ifdef HAVE_CDDA |
9801 | 54 extern stream_info_t stream_info_cdda; |
9810 | 55 #endif |
10121
d42177a0da2a
Changed the STREAMING defines to MPLAYER_NETWORK to avoid name definition clash.
bertrand
parents:
9915
diff
changeset
|
56 #ifdef MPLAYER_NETWORK |
9853 | 57 extern stream_info_t stream_info_netstream; |
58 #endif | |
10560 | 59 #ifdef HAS_DVBIN_SUPPORT |
60 extern stream_info_t stream_info_dvb; | |
61 #endif | |
10625
620cc649f519
ftp support. The change on connect2Server is needed bcs we need 2
albeu
parents:
10560
diff
changeset
|
62 #ifdef HAVE_FTP |
620cc649f519
ftp support. The change on connect2Server is needed bcs we need 2
albeu
parents:
10560
diff
changeset
|
63 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
|
64 #endif |
14836
8b9738526dd7
added a stream module for the vstream client library
joey
parents:
12018
diff
changeset
|
65 #ifdef HAVE_VSTREAM |
8b9738526dd7
added a stream module for the vstream client library
joey
parents:
12018
diff
changeset
|
66 extern stream_info_t stream_info_vstream; |
8b9738526dd7
added a stream module for the vstream client library
joey
parents:
12018
diff
changeset
|
67 #endif |
10560 | 68 |
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
|
69 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
|
70 extern stream_info_t stream_info_null; |
9794 | 71 extern stream_info_t stream_info_file; |
72 | |
73 stream_info_t* auto_open_streams[] = { | |
9886 | 74 #ifdef HAVE_VCD |
75 &stream_info_vcd, | |
76 #endif | |
9810 | 77 #ifdef HAVE_CDDA |
9801 | 78 &stream_info_cdda, |
9810 | 79 #endif |
10121
d42177a0da2a
Changed the STREAMING defines to MPLAYER_NETWORK to avoid name definition clash.
bertrand
parents:
9915
diff
changeset
|
80 #ifdef MPLAYER_NETWORK |
9853 | 81 &stream_info_netstream, |
82 #endif | |
10560 | 83 #ifdef HAS_DVBIN_SUPPORT |
84 &stream_info_dvb, | |
85 #endif | |
10625
620cc649f519
ftp support. The change on connect2Server is needed bcs we need 2
albeu
parents:
10560
diff
changeset
|
86 #ifdef HAVE_FTP |
620cc649f519
ftp support. The change on connect2Server is needed bcs we need 2
albeu
parents:
10560
diff
changeset
|
87 &stream_info_ftp, |
620cc649f519
ftp support. The change on connect2Server is needed bcs we need 2
albeu
parents:
10560
diff
changeset
|
88 #endif |
14836
8b9738526dd7
added a stream module for the vstream client library
joey
parents:
12018
diff
changeset
|
89 #ifdef HAVE_VSTREAM |
8b9738526dd7
added a stream module for the vstream client library
joey
parents:
12018
diff
changeset
|
90 &stream_info_vstream, |
8b9738526dd7
added a stream module for the vstream client library
joey
parents:
12018
diff
changeset
|
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, |
9901
233802490b0e
Add a null streamv Currently used for tv and mf. Could be used to
albeu
parents:
9886
diff
changeset
|
93 &stream_info_null, |
9794 | 94 &stream_info_file, |
95 NULL | |
96 }; | |
97 | |
98 stream_t* open_stream_plugin(stream_info_t* sinfo,char* filename,int mode, | |
99 char** options, int* file_format, int* ret) { | |
100 void* arg = NULL; | |
101 stream_t* s; | |
102 m_struct_t* desc = (m_struct_t*)sinfo->opts; | |
103 | |
104 // Parse options | |
105 if(desc) { | |
106 arg = m_struct_alloc(desc); | |
107 if(sinfo->opts_url) { | |
108 m_option_t url_opt = | |
109 { "stream url", arg , CONF_TYPE_CUSTOM_URL, 0, 0 ,0, sinfo->opts }; | |
110 if(m_option_parse(&url_opt,"stream url",filename,arg,M_CONFIG_FILE) < 0) { | |
111 mp_msg(MSGT_OPEN,MSGL_ERR, "URL parsing failed on url %s\n",filename); | |
112 m_struct_free(desc,arg); | |
113 return NULL; | |
114 } | |
115 } | |
116 if(options) { | |
117 int i; | |
118 for(i = 0 ; options[i] != NULL ; i += 2) { | |
119 mp_msg(MSGT_OPEN,MSGL_DBG2, "Set stream arg %s=%s\n", | |
120 options[i],options[i+1]); | |
121 if(!m_struct_set(desc,arg,options[i],options[i+1])) | |
122 mp_msg(MSGT_OPEN,MSGL_WARN, "Failed to set stream option %s=%s\n", | |
123 options[i],options[i+1]); | |
124 } | |
125 } | |
126 } | |
127 s = new_stream(-2,-2); | |
128 s->url=strdup(filename); | |
129 s->flags |= mode; | |
130 *ret = sinfo->open(s,mode,arg,file_format); | |
131 if((*ret) != STREAM_OK) { | |
132 free(s->url); | |
133 free(s); | |
134 return NULL; | |
135 } | |
136 if(s->type <= -2) | |
137 mp_msg(MSGT_OPEN,MSGL_WARN, "Warning streams need a type !!!!\n"); | |
138 if(s->flags & STREAM_SEEK && !s->seek) | |
139 s->flags &= ~STREAM_SEEK; | |
140 if(s->seek && !(s->flags & STREAM_SEEK)) | |
9853 | 141 s->flags |= STREAM_SEEK; |
9794 | 142 |
143 | |
144 mp_msg(MSGT_OPEN,MSGL_V, "STREAM: [%s] %s\n",sinfo->name,filename); | |
145 mp_msg(MSGT_OPEN,MSGL_V, "STREAM: Description: %s\n",sinfo->info); | |
146 mp_msg(MSGT_OPEN,MSGL_V, "STREAM: Author: %s\n", sinfo->author); | |
147 mp_msg(MSGT_OPEN,MSGL_V, "STREAM: Comment: %s\n", sinfo->comment); | |
148 | |
149 return s; | |
150 } | |
151 | |
152 | |
153 stream_t* open_stream_full(char* filename,int mode, char** options, int* file_format) { | |
154 int i,j,l,r; | |
155 stream_info_t* sinfo; | |
156 stream_t* s; | |
157 | |
158 for(i = 0 ; auto_open_streams[i] ; i++) { | |
159 sinfo = auto_open_streams[i]; | |
160 if(!sinfo->protocols) { | |
10735
8a10d5d0ce86
serious bugs - 1l absinth (changed to absinth against cola inflation)
alex
parents:
10625
diff
changeset
|
161 mp_msg(MSGT_OPEN,MSGL_WARN, "Stream type %s has protocols == NULL, it's a bug\n", sinfo->name); |
9794 | 162 continue; |
163 } | |
164 for(j = 0 ; sinfo->protocols[j] ; j++) { | |
165 l = strlen(sinfo->protocols[j]); | |
166 // l == 0 => Don't do protocol matching (ie network and filenames) | |
167 if((l == 0) || ((strncmp(sinfo->protocols[j],filename,l) == 0) && | |
168 (strncmp("://",filename+l,3) == 0))) { | |
169 *file_format = DEMUXER_TYPE_UNKNOWN; | |
170 s = open_stream_plugin(sinfo,filename,mode,options,file_format,&r); | |
171 if(s) return s; | |
172 if(r != STREAM_UNSUPORTED) { | |
173 mp_msg(MSGT_OPEN,MSGL_ERR, "Failed to open %s\n",filename); | |
174 return NULL; | |
175 } | |
176 break; | |
177 } | |
178 } | |
179 } | |
180 | |
181 mp_msg(MSGT_OPEN,MSGL_ERR, "No stream found to handle url %s\n",filename); | |
182 return NULL; | |
183 } | |
184 | |
1 | 185 //=================== STREAMER ========================= |
186 | |
187 int stream_fill_buffer(stream_t *s){ | |
188 int len; | |
9874
55a43ae66ceb
Oops, I just noticed albeu's revision 1.58 - so I backed out the
rsf
parents:
9873
diff
changeset
|
189 if (/*s->fd == NULL ||*/ s->eof) { s->buf_pos = s->buf_len = 0; return 0; } |
1 | 190 switch(s->type){ |
7630
4c51ce16c4a2
smb:// (samba client) support by Vladimir Moushkov <vlindos_mpdev@abv.bg>
arpi
parents:
7408
diff
changeset
|
191 #ifdef LIBSMBCLIENT |
4c51ce16c4a2
smb:// (samba client) support by Vladimir Moushkov <vlindos_mpdev@abv.bg>
arpi
parents:
7408
diff
changeset
|
192 case STREAMTYPE_SMB: |
4c51ce16c4a2
smb:// (samba client) support by Vladimir Moushkov <vlindos_mpdev@abv.bg>
arpi
parents:
7408
diff
changeset
|
193 len=smbc_read(s->fd,s->buffer,STREAM_BUFFER_SIZE); |
4c51ce16c4a2
smb:// (samba client) support by Vladimir Moushkov <vlindos_mpdev@abv.bg>
arpi
parents:
7408
diff
changeset
|
194 break; |
4c51ce16c4a2
smb:// (samba client) support by Vladimir Moushkov <vlindos_mpdev@abv.bg>
arpi
parents:
7408
diff
changeset
|
195 #endif |
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 |
5380
8a01cde9cf39
DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents:
5133
diff
changeset
|
206 #ifdef USE_DVDNAV |
8a01cde9cf39
DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents:
5133
diff
changeset
|
207 case STREAMTYPE_DVDNAV: { |
5472 | 208 dvdnav_stream_read((dvdnav_priv_t*)s->priv,s->buffer,&len); |
209 if (len==0) return 0; // this was an event, so repeat the read | |
5380
8a01cde9cf39
DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents:
5133
diff
changeset
|
210 break; |
8a01cde9cf39
DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents:
5133
diff
changeset
|
211 } |
8a01cde9cf39
DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents:
5133
diff
changeset
|
212 #endif |
1595 | 213 #ifdef USE_DVDREAD |
214 case STREAMTYPE_DVD: { | |
215 off_t pos=dvd_read_sector(s->priv,s->buffer); | |
216 if(pos>=0){ | |
217 len=2048; // full sector | |
218 s->pos=2048*pos-len; | |
219 } else len=-1; // error | |
220 break; | |
221 } | |
222 #endif | |
5133
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
4893
diff
changeset
|
223 case STREAMTYPE_DS: |
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
4893
diff
changeset
|
224 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
|
225 break; |
9610 | 226 |
227 | |
9794 | 228 default: |
229 len= s->fill_buffer ? s->fill_buffer(s,s->buffer,STREAM_BUFFER_SIZE) : 0; | |
1 | 230 } |
231 if(len<=0){ s->eof=1; s->buf_pos=s->buf_len=0; return 0; } | |
232 s->buf_pos=0; | |
233 s->buf_len=len; | |
234 s->pos+=len; | |
235 // printf("[%d]",len);fflush(stdout); | |
236 return len; | |
237 } | |
238 | |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1177
diff
changeset
|
239 int stream_seek_long(stream_t *s,off_t pos){ |
6814 | 240 off_t newpos=0; |
1 | 241 |
2144 | 242 // if(verbose>=3) printf("seek_long to 0x%X\n",(unsigned int)pos); |
1 | 243 |
244 s->buf_pos=s->buf_len=0; | |
245 | |
246 switch(s->type){ | |
7630
4c51ce16c4a2
smb:// (samba client) support by Vladimir Moushkov <vlindos_mpdev@abv.bg>
arpi
parents:
7408
diff
changeset
|
247 case STREAMTYPE_SMB: |
692 | 248 case STREAMTYPE_STREAM: |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1177
diff
changeset
|
249 #ifdef _LARGEFILE_SOURCE |
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1177
diff
changeset
|
250 newpos=pos&(~((long long)STREAM_BUFFER_SIZE-1));break; |
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1177
diff
changeset
|
251 #else |
492 | 252 newpos=pos&(~(STREAM_BUFFER_SIZE-1));break; |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1177
diff
changeset
|
253 #endif |
1595 | 254 case STREAMTYPE_DVD: |
255 newpos=pos/2048; newpos*=2048; break; | |
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){ |
271 #ifdef _LARGEFILE_SOURCE | |
272 printf("s->pos=%llX newpos=%llX new_bufpos=%llX buflen=%X \n", | |
273 (long long)s->pos,(long long)newpos,(long long)pos,s->buf_len); | |
274 #else | |
275 printf("s->pos=%X newpos=%X new_bufpos=%X buflen=%X \n", | |
276 (unsigned int)s->pos,newpos,pos,s->buf_len); | |
277 #endif | |
278 } | |
279 | |
1 | 280 pos-=newpos; |
281 | |
282 if(newpos==0 || newpos!=s->pos){ | |
283 switch(s->type){ | |
7630
4c51ce16c4a2
smb:// (samba client) support by Vladimir Moushkov <vlindos_mpdev@abv.bg>
arpi
parents:
7408
diff
changeset
|
284 #ifdef LIBSMBCLIENT |
4c51ce16c4a2
smb:// (samba client) support by Vladimir Moushkov <vlindos_mpdev@abv.bg>
arpi
parents:
7408
diff
changeset
|
285 case STREAMTYPE_SMB: |
4c51ce16c4a2
smb:// (samba client) support by Vladimir Moushkov <vlindos_mpdev@abv.bg>
arpi
parents:
7408
diff
changeset
|
286 s->pos=newpos; // real seek |
4c51ce16c4a2
smb:// (samba client) support by Vladimir Moushkov <vlindos_mpdev@abv.bg>
arpi
parents:
7408
diff
changeset
|
287 if(smbc_lseek(s->fd,s->pos,SEEK_SET)<0) s->eof=1; |
4c51ce16c4a2
smb:// (samba client) support by Vladimir Moushkov <vlindos_mpdev@abv.bg>
arpi
parents:
7408
diff
changeset
|
288 break; |
4c51ce16c4a2
smb:// (samba client) support by Vladimir Moushkov <vlindos_mpdev@abv.bg>
arpi
parents:
7408
diff
changeset
|
289 #endif |
5472 | 290 #ifdef USE_DVDNAV |
291 case STREAMTYPE_DVDNAV: { | |
292 if (newpos==0) { | |
293 if (dvdnav_stream_reset((dvdnav_priv_t*)s->priv)) | |
294 s->pos=0; | |
295 } | |
296 if(newpos!=s->pos){ | |
297 mp_msg(MSGT_STREAM,MSGL_INFO,"Cannot seek in DVDNAV streams yet!\n"); | |
298 return 1; | |
299 } | |
300 break; | |
301 } | |
302 #endif | |
1595 | 303 #ifdef USE_DVDREAD |
304 case STREAMTYPE_DVD: | |
305 s->pos=newpos; // real seek | |
306 dvd_seek(s->priv,s->pos/2048); | |
307 break; | |
308 #endif | |
692 | 309 case STREAMTYPE_STREAM: |
310 //s->pos=newpos; // real seek | |
3044
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
311 // 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
|
312 // 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
|
313 // doesn't support seeking. |
10121
d42177a0da2a
Changed the STREAMING defines to MPLAYER_NETWORK to avoid name definition clash.
bertrand
parents:
9915
diff
changeset
|
314 #ifdef MPLAYER_NETWORK |
11965 | 315 if(s->seek) { // new stream seek is much cleaner than streaming_ctrl one |
316 if(!s->seek(s,newpos)) { | |
317 mp_msg(MSGT_STREAM,MSGL_ERR, "Seek failed\n"); | |
12018 | 318 return 0; |
11965 | 319 } |
320 break; | |
321 } | |
322 | |
8929
c5ca1ae42555
check if seeking supported, otherwise fallback to null reading
arpi
parents:
8812
diff
changeset
|
323 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
|
324 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
|
325 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
|
326 return 1; |
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
327 } |
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
328 } |
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
329 #else |
692 | 330 if(newpos<s->pos){ |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1642
diff
changeset
|
331 mp_msg(MSGT_STREAM,MSGL_INFO,"Cannot seek backward in linear streams!\n"); |
692 | 332 return 1; |
333 } | |
334 while(s->pos<newpos){ | |
335 if(stream_fill_buffer(s)<=0) break; // EOF | |
336 } | |
3044
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
337 #endif |
692 | 338 break; |
7408 | 339 default: |
9794 | 340 // This should at the beginning as soon as all streams are converted |
341 if(!s->seek) | |
342 return 0; | |
343 // Now seek | |
344 if(!s->seek(s,newpos)) { | |
345 mp_msg(MSGT_STREAM,MSGL_ERR, "Seek failed\n"); | |
346 return 0; | |
347 } | |
1 | 348 } |
349 // putchar('.');fflush(stdout); | |
350 //} else { | |
351 // putchar('%');fflush(stdout); | |
352 } | |
353 | |
354 stream_fill_buffer(s); | |
1999 | 355 if(pos>=0 && pos<=s->buf_len){ |
1 | 356 s->buf_pos=pos; // byte position in sector |
357 return 1; | |
358 } | |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1642
diff
changeset
|
359 |
1999 | 360 // if(pos==s->buf_len) printf("XXX Seek to last byte of file -> EOF\n"); |
361 | |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1177
diff
changeset
|
362 #ifdef _LARGEFILE_SOURCE |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1642
diff
changeset
|
363 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
|
364 #else |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1642
diff
changeset
|
365 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
|
366 #endif |
1 | 367 return 0; |
368 } | |
369 | |
370 | |
371 void stream_reset(stream_t *s){ | |
372 if(s->eof){ | |
373 s->pos=0; //ftell(f); | |
374 // s->buf_pos=s->buf_len=0; | |
375 s->eof=0; | |
376 } | |
9853 | 377 if(s->control) s->control(s,STREAM_CTRL_RESET,NULL); |
1 | 378 //stream_seek(s,0); |
379 } | |
380 | |
2144 | 381 stream_t* new_memory_stream(unsigned char* data,int len){ |
382 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
|
383 memset(s,0,sizeof(stream_t)); |
2144 | 384 s->fd=-1; |
385 s->type=STREAMTYPE_MEMORY; | |
386 s->buf_pos=0; s->buf_len=len; | |
387 s->start_pos=0; s->end_pos=len; | |
388 stream_reset(s); | |
389 s->pos=len; | |
390 memcpy(s->buffer,data,len); | |
391 return s; | |
392 } | |
393 | |
1 | 394 stream_t* new_stream(int fd,int type){ |
395 stream_t *s=malloc(sizeof(stream_t)); | |
3291 | 396 if(s==NULL) return NULL; |
397 memset(s,0,sizeof(stream_t)); | |
10281 | 398 |
399 #ifdef HAVE_WINSOCK2 | |
400 { | |
401 WSADATA wsdata; | |
402 int temp = WSAStartup(0x0202, &wsdata); // there might be a better place for this (-> later) | |
403 mp_msg(MSGT_STREAM,MSGL_V,"WINSOCK2 init: %i\n", temp); | |
404 } | |
405 #endif | |
3291 | 406 |
1 | 407 s->fd=fd; |
408 s->type=type; | |
180 | 409 s->buf_pos=s->buf_len=0; |
598 | 410 s->start_pos=s->end_pos=0; |
1642 | 411 s->priv=NULL; |
7407 | 412 s->url=NULL; |
2322 | 413 s->cache_pid=0; |
1 | 414 stream_reset(s); |
415 return s; | |
416 } | |
417 | |
418 void free_stream(stream_t *s){ | |
6138
523014df7d32
big cosmetics patch, cleanup of messages printed by mplayer and libs.
arpi
parents:
5982
diff
changeset
|
419 // printf("\n*** free_stream() called ***\n"); |
9798 | 420 #ifdef USE_STREAM_CACHE |
4893 | 421 if(s->cache_pid) { |
9915 | 422 cache_uninit(s); |
4893 | 423 } |
9798 | 424 #endif |
6479 | 425 switch(s->type) { |
7630
4c51ce16c4a2
smb:// (samba client) support by Vladimir Moushkov <vlindos_mpdev@abv.bg>
arpi
parents:
7408
diff
changeset
|
426 #ifdef LIBSMBCLIENT |
4c51ce16c4a2
smb:// (samba client) support by Vladimir Moushkov <vlindos_mpdev@abv.bg>
arpi
parents:
7408
diff
changeset
|
427 case STREAMTYPE_SMB: |
4c51ce16c4a2
smb:// (samba client) support by Vladimir Moushkov <vlindos_mpdev@abv.bg>
arpi
parents:
7408
diff
changeset
|
428 smbc_close(s->fd); |
4c51ce16c4a2
smb:// (samba client) support by Vladimir Moushkov <vlindos_mpdev@abv.bg>
arpi
parents:
7408
diff
changeset
|
429 break; |
4c51ce16c4a2
smb:// (samba client) support by Vladimir Moushkov <vlindos_mpdev@abv.bg>
arpi
parents:
7408
diff
changeset
|
430 #endif |
9610 | 431 |
6479 | 432 #ifdef USE_DVDREAD |
433 case STREAMTYPE_DVD: | |
434 dvd_close(s->priv); | |
435 #endif | |
9794 | 436 default: |
437 if(s->close) s->close(s); | |
438 } | |
15421
ae5e1b9e3c92
fix segfaults caused by socket and file descriptor mismatches on windows
faust3
parents:
14836
diff
changeset
|
439 if(s->fd>0){ |
ae5e1b9e3c92
fix segfaults caused by socket and file descriptor mismatches on windows
faust3
parents:
14836
diff
changeset
|
440 /* on unix we define closesocket to close |
ae5e1b9e3c92
fix segfaults caused by socket and file descriptor mismatches on windows
faust3
parents:
14836
diff
changeset
|
441 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
|
442 network socket and file */ |
ae5e1b9e3c92
fix segfaults caused by socket and file descriptor mismatches on windows
faust3
parents:
14836
diff
changeset
|
443 if(s->url && strstr(s->url,"://")) |
ae5e1b9e3c92
fix segfaults caused by socket and file descriptor mismatches on windows
faust3
parents:
14836
diff
changeset
|
444 closesocket(s->fd); |
ae5e1b9e3c92
fix segfaults caused by socket and file descriptor mismatches on windows
faust3
parents:
14836
diff
changeset
|
445 else close(s->fd); |
ae5e1b9e3c92
fix segfaults caused by socket and file descriptor mismatches on windows
faust3
parents:
14836
diff
changeset
|
446 } |
10281 | 447 #ifdef HAVE_WINSOCK2 |
448 mp_msg(MSGT_STREAM,MSGL_V,"WINSOCK2 uninit\n"); | |
449 WSACleanup(); // there might be a better place for this (-> later) | |
450 #endif | |
9794 | 451 // Disabled atm, i don't like that. s->priv can be anything after all |
452 // streams should destroy their priv on close | |
453 //if(s->priv) free(s->priv); | |
454 if(s->url) free(s->url); | |
1 | 455 free(s); |
456 } | |
457 | |
5133
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
4893
diff
changeset
|
458 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
|
459 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
|
460 s->priv = ds; |
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
4893
diff
changeset
|
461 return s; |
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
4893
diff
changeset
|
462 } |