Mercurial > mplayer.hg
annotate stream/stream.c @ 27470:355f0fad3a3c
Fix closesocket test, patch by Serge Levin, serge.levin.spb gmail com.
author | diego |
---|---|
date | Sun, 31 Aug 2008 13:54:08 +0000 |
parents | be85aae103f2 |
children | c0b233cd30ca |
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> |
9794 | 13 #include <strings.h> |
578 | 14 |
1430 | 15 #include "config.h" |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1642
diff
changeset
|
16 #include "mp_msg.h" |
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1642
diff
changeset
|
17 #include "help_mp.h" |
17012 | 18 #include "osdep/shmem.h" |
27464
be85aae103f2
Move duplicated '#define closesocket close' into network.h along with
diego
parents:
27461
diff
changeset
|
19 #include "network.h" |
578 | 20 #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
|
21 #include "libmpdemux/demuxer.h" |
578 | 22 |
17012 | 23 #include "m_option.h" |
24 #include "m_struct.h" | |
9794 | 25 |
19808
5385740067a1
* remove extern definitions of functions in .c files
attila
parents:
19568
diff
changeset
|
26 #include "cache2.h" |
1 | 27 |
8812 | 28 //#include "vcd_read_bincue.h" |
8782
6af7a6595cc9
cdrwin-style bin/cue VCD image support (-vcd <track> -cuefile file.cue)
arpi
parents:
8524
diff
changeset
|
29 |
26326
5bfc1d8bece9
Remove the need for code using stream to export an mp_input_check_interrupt()
albeu
parents:
26007
diff
changeset
|
30 static int (*stream_check_interrupt_cb)(int time) = NULL; |
5bfc1d8bece9
Remove the need for code using stream to export an mp_input_check_interrupt()
albeu
parents:
26007
diff
changeset
|
31 |
25211 | 32 extern const stream_info_t stream_info_vcd; |
33 extern const stream_info_t stream_info_cdda; | |
34 extern const stream_info_t stream_info_netstream; | |
35 extern const stream_info_t stream_info_pnm; | |
36 extern const stream_info_t stream_info_asf; | |
37 extern const stream_info_t stream_info_rtsp; | |
38 extern const stream_info_t stream_info_rtp; | |
39 extern const stream_info_t stream_info_udp; | |
40 extern const stream_info_t stream_info_http1; | |
41 extern const stream_info_t stream_info_http2; | |
42 extern const stream_info_t stream_info_dvb; | |
43 extern const stream_info_t stream_info_tv; | |
44 extern const stream_info_t stream_info_radio; | |
45 extern const stream_info_t stream_info_pvr; | |
46 extern const stream_info_t stream_info_ftp; | |
47 extern const stream_info_t stream_info_vstream; | |
48 extern const stream_info_t stream_info_dvdnav; | |
49 extern const stream_info_t stream_info_smb; | |
50 extern const stream_info_t stream_info_sdp; | |
51 extern const stream_info_t stream_info_rtsp_sip; | |
10560 | 52 |
25211 | 53 extern const stream_info_t stream_info_cue; |
54 extern const stream_info_t stream_info_null; | |
55 extern const stream_info_t stream_info_mf; | |
56 extern const stream_info_t stream_info_file; | |
57 extern const stream_info_t stream_info_ifo; | |
58 extern const stream_info_t stream_info_dvd; | |
9794 | 59 |
25209 | 60 static const stream_info_t* const auto_open_streams[] = { |
27370
14c5017f40d2
Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents:
27341
diff
changeset
|
61 #ifdef CONFIG_VCD |
9886 | 62 &stream_info_vcd, |
63 #endif | |
27391
1d2faa1020fb
Rename a bunch of miscellaneous preprocessor directives.
diego
parents:
27370
diff
changeset
|
64 #ifdef CONFIG_CDDA |
9801 | 65 &stream_info_cdda, |
9810 | 66 #endif |
27397
d47744b95b78
Give a CONFIG_ prefix to preprocessor directives that lacked one and
diego
parents:
27391
diff
changeset
|
67 #ifdef CONFIG_NETWORK |
9853 | 68 &stream_info_netstream, |
15585 | 69 &stream_info_http1, |
70 &stream_info_asf, | |
71 &stream_info_pnm, | |
72 &stream_info_rtsp, | |
27397
d47744b95b78
Give a CONFIG_ prefix to preprocessor directives that lacked one and
diego
parents:
27391
diff
changeset
|
73 #ifdef CONFIG_LIVE555 |
15585 | 74 &stream_info_sdp, |
75 &stream_info_rtsp_sip, | |
76 #endif | |
19313
0792ad01e9bf
split rtp stack, udp input layer and rtp input layer from rtp.c
ben
parents:
19312
diff
changeset
|
77 &stream_info_rtp, |
0792ad01e9bf
split rtp stack, udp input layer and rtp input layer from rtp.c
ben
parents:
19312
diff
changeset
|
78 &stream_info_udp, |
15585 | 79 &stream_info_http2, |
9853 | 80 #endif |
27370
14c5017f40d2
Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents:
27341
diff
changeset
|
81 #ifdef CONFIG_DVBIN |
10560 | 82 &stream_info_dvb, |
83 #endif | |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27178
diff
changeset
|
84 #ifdef CONFIG_TV |
19273
11ec1cb3a7ea
add an explicit tv stream input instead of the previous hack in stream_null
ben
parents:
19271
diff
changeset
|
85 &stream_info_tv, |
11ec1cb3a7ea
add an explicit tv stream input instead of the previous hack in stream_null
ben
parents:
19271
diff
changeset
|
86 #endif |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27178
diff
changeset
|
87 #ifdef CONFIG_RADIO |
19568
bd821fd3e244
Radio support, patch by Vladimir Voroshilov (voroshil gmail com)
reimar
parents:
19313
diff
changeset
|
88 &stream_info_radio, |
bd821fd3e244
Radio support, patch by Vladimir Voroshilov (voroshil gmail com)
reimar
parents:
19313
diff
changeset
|
89 #endif |
27370
14c5017f40d2
Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents:
27341
diff
changeset
|
90 #ifdef CONFIG_PVR |
18997 | 91 &stream_info_pvr, |
92 #endif | |
27391
1d2faa1020fb
Rename a bunch of miscellaneous preprocessor directives.
diego
parents:
27370
diff
changeset
|
93 #ifdef CONFIG_FTP |
10625
620cc649f519
ftp support. The change on connect2Server is needed bcs we need 2
albeu
parents:
10560
diff
changeset
|
94 &stream_info_ftp, |
620cc649f519
ftp support. The change on connect2Server is needed bcs we need 2
albeu
parents:
10560
diff
changeset
|
95 #endif |
27391
1d2faa1020fb
Rename a bunch of miscellaneous preprocessor directives.
diego
parents:
27370
diff
changeset
|
96 #ifdef CONFIG_VSTREAM |
14836
8b9738526dd7
added a stream module for the vstream client library
joey
parents:
12018
diff
changeset
|
97 &stream_info_vstream, |
8b9738526dd7
added a stream module for the vstream client library
joey
parents:
12018
diff
changeset
|
98 #endif |
27397
d47744b95b78
Give a CONFIG_ prefix to preprocessor directives that lacked one and
diego
parents:
27391
diff
changeset
|
99 #ifdef CONFIG_LIBSMBCLIENT |
15520 | 100 &stream_info_smb, |
101 #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
|
102 &stream_info_cue, |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27178
diff
changeset
|
103 #ifdef CONFIG_DVDREAD |
25210
92204ff32b27
When IFO file is opened (detected by extension), set dvd-device to IFO file's
voroshil
parents:
25209
diff
changeset
|
104 &stream_info_ifo, |
15518 | 105 &stream_info_dvd, |
17191
6ac0b5f0d1ed
fix compilation when dvdkit and dvdread are not available
nicodvb
parents:
17012
diff
changeset
|
106 #endif |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27178
diff
changeset
|
107 #ifdef CONFIG_DVDNAV |
18712
cb7da1894b00
restored support for dvdnav only in the stream layer; all other functionalities are disabled
nicodvb
parents:
18558
diff
changeset
|
108 &stream_info_dvdnav, |
15518 | 109 #endif |
110 | |
9901
233802490b0e
Add a null streamv Currently used for tv and mf. Could be used to
albeu
parents:
9886
diff
changeset
|
111 &stream_info_null, |
19301 | 112 &stream_info_mf, |
9794 | 113 &stream_info_file, |
114 NULL | |
115 }; | |
116 | |
25207
21d672c608ef
auto_open_streams should have const type, fix also the places where it is used
reimar
parents:
25186
diff
changeset
|
117 stream_t* open_stream_plugin(const stream_info_t* sinfo,char* filename,int mode, |
25135
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24963
diff
changeset
|
118 char** options, int* file_format, int* ret, |
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24963
diff
changeset
|
119 char** redirected_url) { |
9794 | 120 void* arg = NULL; |
121 stream_t* s; | |
122 m_struct_t* desc = (m_struct_t*)sinfo->opts; | |
123 | |
124 // Parse options | |
125 if(desc) { | |
126 arg = m_struct_alloc(desc); | |
127 if(sinfo->opts_url) { | |
128 m_option_t url_opt = | |
129 { "stream url", arg , CONF_TYPE_CUSTOM_URL, 0, 0 ,0, sinfo->opts }; | |
130 if(m_option_parse(&url_opt,"stream url",filename,arg,M_CONFIG_FILE) < 0) { | |
131 mp_msg(MSGT_OPEN,MSGL_ERR, "URL parsing failed on url %s\n",filename); | |
132 m_struct_free(desc,arg); | |
133 return NULL; | |
134 } | |
135 } | |
136 if(options) { | |
137 int i; | |
138 for(i = 0 ; options[i] != NULL ; i += 2) { | |
139 mp_msg(MSGT_OPEN,MSGL_DBG2, "Set stream arg %s=%s\n", | |
140 options[i],options[i+1]); | |
141 if(!m_struct_set(desc,arg,options[i],options[i+1])) | |
142 mp_msg(MSGT_OPEN,MSGL_WARN, "Failed to set stream option %s=%s\n", | |
143 options[i],options[i+1]); | |
144 } | |
145 } | |
146 } | |
147 s = new_stream(-2,-2); | |
148 s->url=strdup(filename); | |
149 s->flags |= mode; | |
150 *ret = sinfo->open(s,mode,arg,file_format); | |
151 if((*ret) != STREAM_OK) { | |
27397
d47744b95b78
Give a CONFIG_ prefix to preprocessor directives that lacked one and
diego
parents:
27391
diff
changeset
|
152 #ifdef CONFIG_NETWORK |
25135
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24963
diff
changeset
|
153 if (*ret == STREAM_REDIRECTED && redirected_url) { |
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24963
diff
changeset
|
154 if (s->streaming_ctrl && s->streaming_ctrl->url |
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24963
diff
changeset
|
155 && s->streaming_ctrl->url->url) |
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24963
diff
changeset
|
156 *redirected_url = strdup(s->streaming_ctrl->url->url); |
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24963
diff
changeset
|
157 else |
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24963
diff
changeset
|
158 *redirected_url = NULL; |
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24963
diff
changeset
|
159 } |
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24963
diff
changeset
|
160 streaming_ctrl_free(s->streaming_ctrl); |
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24963
diff
changeset
|
161 #endif |
9794 | 162 free(s->url); |
163 free(s); | |
164 return NULL; | |
165 } | |
166 if(s->type <= -2) | |
167 mp_msg(MSGT_OPEN,MSGL_WARN, "Warning streams need a type !!!!\n"); | |
168 if(s->flags & STREAM_SEEK && !s->seek) | |
169 s->flags &= ~STREAM_SEEK; | |
170 if(s->seek && !(s->flags & STREAM_SEEK)) | |
9853 | 171 s->flags |= STREAM_SEEK; |
9794 | 172 |
21659 | 173 s->mode = mode; |
9794 | 174 |
175 mp_msg(MSGT_OPEN,MSGL_V, "STREAM: [%s] %s\n",sinfo->name,filename); | |
176 mp_msg(MSGT_OPEN,MSGL_V, "STREAM: Description: %s\n",sinfo->info); | |
177 mp_msg(MSGT_OPEN,MSGL_V, "STREAM: Author: %s\n", sinfo->author); | |
178 mp_msg(MSGT_OPEN,MSGL_V, "STREAM: Comment: %s\n", sinfo->comment); | |
179 | |
180 return s; | |
181 } | |
182 | |
183 | |
184 stream_t* open_stream_full(char* filename,int mode, char** options, int* file_format) { | |
185 int i,j,l,r; | |
25207
21d672c608ef
auto_open_streams should have const type, fix also the places where it is used
reimar
parents:
25186
diff
changeset
|
186 const stream_info_t* sinfo; |
9794 | 187 stream_t* s; |
25135
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24963
diff
changeset
|
188 char *redirected_url = NULL; |
9794 | 189 |
190 for(i = 0 ; auto_open_streams[i] ; i++) { | |
191 sinfo = auto_open_streams[i]; | |
192 if(!sinfo->protocols) { | |
10735
8a10d5d0ce86
serious bugs - 1l absinth (changed to absinth against cola inflation)
alex
parents:
10625
diff
changeset
|
193 mp_msg(MSGT_OPEN,MSGL_WARN, "Stream type %s has protocols == NULL, it's a bug\n", sinfo->name); |
9794 | 194 continue; |
195 } | |
196 for(j = 0 ; sinfo->protocols[j] ; j++) { | |
197 l = strlen(sinfo->protocols[j]); | |
198 // l == 0 => Don't do protocol matching (ie network and filenames) | |
21493
8ca0be3a46a0
Make sure invalid protocols are rejected instead of treated
reimar
parents:
20635
diff
changeset
|
199 if((l == 0 && !strstr(filename, "://")) || |
25429 | 200 ((strncasecmp(sinfo->protocols[j],filename,l) == 0) && |
9794 | 201 (strncmp("://",filename+l,3) == 0))) { |
202 *file_format = DEMUXER_TYPE_UNKNOWN; | |
25135
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24963
diff
changeset
|
203 s = open_stream_plugin(sinfo,filename,mode,options,file_format,&r, |
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24963
diff
changeset
|
204 &redirected_url); |
9794 | 205 if(s) return s; |
25135
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24963
diff
changeset
|
206 if(r == STREAM_REDIRECTED && redirected_url) { |
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24963
diff
changeset
|
207 mp_msg(MSGT_OPEN,MSGL_V, "[%s] open %s redirected to %s\n", |
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24963
diff
changeset
|
208 sinfo->info, filename, redirected_url); |
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24963
diff
changeset
|
209 s = open_stream_full(redirected_url, mode, options, file_format); |
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24963
diff
changeset
|
210 free(redirected_url); |
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24963
diff
changeset
|
211 return s; |
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24963
diff
changeset
|
212 } |
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24963
diff
changeset
|
213 else if(r != STREAM_UNSUPPORTED) { |
16793
8d4fb5469efb
Make a few more messages translatable by moving them into help_mp-en.h.
diego
parents:
16762
diff
changeset
|
214 mp_msg(MSGT_OPEN,MSGL_ERR, MSGTR_FailedToOpen,filename); |
9794 | 215 return NULL; |
216 } | |
217 break; | |
218 } | |
219 } | |
220 } | |
221 | |
222 mp_msg(MSGT_OPEN,MSGL_ERR, "No stream found to handle url %s\n",filename); | |
223 return NULL; | |
224 } | |
225 | |
21659 | 226 stream_t* open_output_stream(char* filename,char** options) { |
227 int file_format; //unused | |
228 if(!filename) { | |
229 mp_msg(MSGT_OPEN,MSGL_ERR,"open_output_stream(), NULL filename, report this bug\n"); | |
230 return NULL; | |
231 } | |
232 | |
233 return open_stream_full(filename,STREAM_WRITE,options,&file_format); | |
234 } | |
235 | |
1 | 236 //=================== STREAMER ========================= |
237 | |
238 int stream_fill_buffer(stream_t *s){ | |
239 int len; | |
9874
55a43ae66ceb
Oops, I just noticed albeu's revision 1.58 - so I backed out the
rsf
parents:
9873
diff
changeset
|
240 if (/*s->fd == NULL ||*/ s->eof) { s->buf_pos = s->buf_len = 0; return 0; } |
1 | 241 switch(s->type){ |
692 | 242 case STREAMTYPE_STREAM: |
27397
d47744b95b78
Give a CONFIG_ prefix to preprocessor directives that lacked one and
diego
parents:
27391
diff
changeset
|
243 #ifdef CONFIG_NETWORK |
24963
0a733c2c577e
Fix possible null-pointer-dereference in stream_fill_buffer().
cehoyos
parents:
24257
diff
changeset
|
244 if( s->streaming_ctrl!=NULL && s->streaming_ctrl->streaming_read ) { |
3044
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
245 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
|
246 } else { |
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
247 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
|
248 } |
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
249 #else |
1 | 250 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
|
251 #endif |
5133
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
4893
diff
changeset
|
252 case STREAMTYPE_DS: |
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
4893
diff
changeset
|
253 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
|
254 break; |
9610 | 255 |
256 | |
9794 | 257 default: |
258 len= s->fill_buffer ? s->fill_buffer(s,s->buffer,STREAM_BUFFER_SIZE) : 0; | |
1 | 259 } |
260 if(len<=0){ s->eof=1; s->buf_pos=s->buf_len=0; return 0; } | |
261 s->buf_pos=0; | |
262 s->buf_len=len; | |
263 s->pos+=len; | |
264 // printf("[%d]",len);fflush(stdout); | |
265 return len; | |
266 } | |
267 | |
21659 | 268 int stream_write_buffer(stream_t *s, unsigned char *buf, int len) { |
269 int rd; | |
270 if(!s->write_buffer) | |
271 return -1; | |
272 rd = s->write_buffer(s, buf, len); | |
273 if(rd < 0) | |
274 return -1; | |
275 s->pos += rd; | |
276 return rd; | |
277 } | |
278 | |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1177
diff
changeset
|
279 int stream_seek_long(stream_t *s,off_t pos){ |
6814 | 280 off_t newpos=0; |
1 | 281 |
17932 | 282 // if( mp_msg_test(MSGT_STREAM,MSGL_DBG3) ) printf("seek_long to 0x%X\n",(unsigned int)pos); |
1 | 283 |
284 s->buf_pos=s->buf_len=0; | |
285 | |
21659 | 286 if(s->mode == STREAM_WRITE) { |
287 if(!s->seek || !s->seek(s,pos)) | |
288 return 0; | |
289 return 1; | |
290 } | |
291 | |
22362
e244d570ba44
cleaned stream_seek() : simplified the alignment to STREAM_BUFFER_SIZE or s->sector_size
nicodvb
parents:
21659
diff
changeset
|
292 if(s->sector_size) |
e244d570ba44
cleaned stream_seek() : simplified the alignment to STREAM_BUFFER_SIZE or s->sector_size
nicodvb
parents:
21659
diff
changeset
|
293 newpos = (pos/s->sector_size)*s->sector_size; |
e244d570ba44
cleaned stream_seek() : simplified the alignment to STREAM_BUFFER_SIZE or s->sector_size
nicodvb
parents:
21659
diff
changeset
|
294 else |
e244d570ba44
cleaned stream_seek() : simplified the alignment to STREAM_BUFFER_SIZE or s->sector_size
nicodvb
parents:
21659
diff
changeset
|
295 newpos = pos&(~((off_t)STREAM_BUFFER_SIZE-1)); |
1 | 296 |
17932 | 297 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
|
298 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
|
299 (int64_t)s->pos,(int64_t)newpos,(int64_t)pos,s->buf_len); |
2050 | 300 } |
1 | 301 pos-=newpos; |
302 | |
303 if(newpos==0 || newpos!=s->pos){ | |
304 switch(s->type){ | |
692 | 305 case STREAMTYPE_STREAM: |
306 //s->pos=newpos; // real seek | |
3044
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
307 // 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
|
308 // 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
|
309 // doesn't support seeking. |
27397
d47744b95b78
Give a CONFIG_ prefix to preprocessor directives that lacked one and
diego
parents:
27391
diff
changeset
|
310 #ifdef CONFIG_NETWORK |
11965 | 311 if(s->seek) { // new stream seek is much cleaner than streaming_ctrl one |
312 if(!s->seek(s,newpos)) { | |
313 mp_msg(MSGT_STREAM,MSGL_ERR, "Seek failed\n"); | |
12018 | 314 return 0; |
11965 | 315 } |
316 break; | |
317 } | |
318 | |
8929
c5ca1ae42555
check if seeking supported, otherwise fallback to null reading
arpi
parents:
8812
diff
changeset
|
319 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
|
320 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
|
321 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
|
322 return 1; |
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
323 } |
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
324 } |
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
325 #else |
692 | 326 if(newpos<s->pos){ |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1642
diff
changeset
|
327 mp_msg(MSGT_STREAM,MSGL_INFO,"Cannot seek backward in linear streams!\n"); |
692 | 328 return 1; |
329 } | |
330 while(s->pos<newpos){ | |
331 if(stream_fill_buffer(s)<=0) break; // EOF | |
332 } | |
3044
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
333 #endif |
692 | 334 break; |
7408 | 335 default: |
9794 | 336 // This should at the beginning as soon as all streams are converted |
337 if(!s->seek) | |
338 return 0; | |
339 // Now seek | |
340 if(!s->seek(s,newpos)) { | |
341 mp_msg(MSGT_STREAM,MSGL_ERR, "Seek failed\n"); | |
342 return 0; | |
343 } | |
1 | 344 } |
345 // putchar('.');fflush(stdout); | |
346 //} else { | |
347 // putchar('%');fflush(stdout); | |
348 } | |
349 | |
17878
ab0a3e3d32ed
Fix a potential seek failure, fill_buffer doesn't have to
albeu
parents:
17712
diff
changeset
|
350 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
|
351 if(pos<=s->buf_len){ |
1 | 352 s->buf_pos=pos; // byte position in sector |
353 return 1; | |
354 } | |
17878
ab0a3e3d32ed
Fix a potential seek failure, fill_buffer doesn't have to
albeu
parents:
17712
diff
changeset
|
355 pos -= s->buf_len; |
ab0a3e3d32ed
Fix a potential seek failure, fill_buffer doesn't have to
albeu
parents:
17712
diff
changeset
|
356 } |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1642
diff
changeset
|
357 |
1999 | 358 // if(pos==s->buf_len) printf("XXX Seek to last byte of file -> EOF\n"); |
359 | |
16750
0a31740dd5e6
Use PRI?64 defines as format strings for 64 bit variables.
reimar
parents:
16572
diff
changeset
|
360 mp_msg(MSGT_STREAM,MSGL_V,"stream_seek: WARNING! Can't seek to 0x%"PRIX64" !\n",(int64_t)(pos+newpos)); |
1 | 361 return 0; |
362 } | |
363 | |
364 | |
365 void stream_reset(stream_t *s){ | |
366 if(s->eof){ | |
367 s->pos=0; //ftell(f); | |
368 // s->buf_pos=s->buf_len=0; | |
369 s->eof=0; | |
370 } | |
9853 | 371 if(s->control) s->control(s,STREAM_CTRL_RESET,NULL); |
1 | 372 //stream_seek(s,0); |
373 } | |
374 | |
17712 | 375 int stream_control(stream_t *s, int cmd, void *arg){ |
24257 | 376 if(!s->control) return STREAM_UNSUPPORTED; |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27178
diff
changeset
|
377 #ifdef CONFIG_STREAM_CACHE |
26833
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
378 if (s->cache_pid) |
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
379 return cache_do_control(s, cmd, arg); |
27178
023835d5dfb9
Surround stream cache specific code by an appropriate #ifdef; fixes linking
diego
parents:
26833
diff
changeset
|
380 #endif |
17696
66d7afee9a46
added new stream_control() and new command: STREAM_CTRL_GET_TIME_LENGTH
nicodvb
parents:
17191
diff
changeset
|
381 return s->control(s, cmd, arg); |
66d7afee9a46
added new stream_control() and new command: STREAM_CTRL_GET_TIME_LENGTH
nicodvb
parents:
17191
diff
changeset
|
382 } |
66d7afee9a46
added new stream_control() and new command: STREAM_CTRL_GET_TIME_LENGTH
nicodvb
parents:
17191
diff
changeset
|
383 |
2144 | 384 stream_t* new_memory_stream(unsigned char* data,int len){ |
18558
4928dd61f136
Fix potential integer overflows in memory allocation.
rtogni
parents:
18176
diff
changeset
|
385 stream_t *s; |
4928dd61f136
Fix potential integer overflows in memory allocation.
rtogni
parents:
18176
diff
changeset
|
386 |
4928dd61f136
Fix potential integer overflows in memory allocation.
rtogni
parents:
18176
diff
changeset
|
387 if(len < 0) |
4928dd61f136
Fix potential integer overflows in memory allocation.
rtogni
parents:
18176
diff
changeset
|
388 return NULL; |
4928dd61f136
Fix potential integer overflows in memory allocation.
rtogni
parents:
18176
diff
changeset
|
389 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
|
390 memset(s,0,sizeof(stream_t)); |
2144 | 391 s->fd=-1; |
392 s->type=STREAMTYPE_MEMORY; | |
393 s->buf_pos=0; s->buf_len=len; | |
394 s->start_pos=0; s->end_pos=len; | |
395 stream_reset(s); | |
396 s->pos=len; | |
397 memcpy(s->buffer,data,len); | |
398 return s; | |
399 } | |
400 | |
1 | 401 stream_t* new_stream(int fd,int type){ |
402 stream_t *s=malloc(sizeof(stream_t)); | |
3291 | 403 if(s==NULL) return NULL; |
404 memset(s,0,sizeof(stream_t)); | |
10281 | 405 |
27461
5a30f5bc23a0
Rename HAVE_WINSOCK preprocessor condition to HAVE_WINSOCK_H.
diego
parents:
27397
diff
changeset
|
406 #ifdef HAVE_WINSOCK2_H |
10281 | 407 { |
408 WSADATA wsdata; | |
409 int temp = WSAStartup(0x0202, &wsdata); // there might be a better place for this (-> later) | |
410 mp_msg(MSGT_STREAM,MSGL_V,"WINSOCK2 init: %i\n", temp); | |
411 } | |
412 #endif | |
3291 | 413 |
1 | 414 s->fd=fd; |
415 s->type=type; | |
180 | 416 s->buf_pos=s->buf_len=0; |
598 | 417 s->start_pos=s->end_pos=0; |
1642 | 418 s->priv=NULL; |
7407 | 419 s->url=NULL; |
2322 | 420 s->cache_pid=0; |
1 | 421 stream_reset(s); |
422 return s; | |
423 } | |
424 | |
425 void free_stream(stream_t *s){ | |
6138
523014df7d32
big cosmetics patch, cleanup of messages printed by mplayer and libs.
arpi
parents:
5982
diff
changeset
|
426 // printf("\n*** free_stream() called ***\n"); |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27178
diff
changeset
|
427 #ifdef CONFIG_STREAM_CACHE |
4893 | 428 if(s->cache_pid) { |
9915 | 429 cache_uninit(s); |
4893 | 430 } |
9798 | 431 #endif |
15520 | 432 if(s->close) s->close(s); |
15421
ae5e1b9e3c92
fix segfaults caused by socket and file descriptor mismatches on windows
faust3
parents:
14836
diff
changeset
|
433 if(s->fd>0){ |
ae5e1b9e3c92
fix segfaults caused by socket and file descriptor mismatches on windows
faust3
parents:
14836
diff
changeset
|
434 /* on unix we define closesocket to close |
ae5e1b9e3c92
fix segfaults caused by socket and file descriptor mismatches on windows
faust3
parents:
14836
diff
changeset
|
435 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
|
436 network socket and file */ |
ae5e1b9e3c92
fix segfaults caused by socket and file descriptor mismatches on windows
faust3
parents:
14836
diff
changeset
|
437 if(s->url && strstr(s->url,"://")) |
ae5e1b9e3c92
fix segfaults caused by socket and file descriptor mismatches on windows
faust3
parents:
14836
diff
changeset
|
438 closesocket(s->fd); |
ae5e1b9e3c92
fix segfaults caused by socket and file descriptor mismatches on windows
faust3
parents:
14836
diff
changeset
|
439 else close(s->fd); |
ae5e1b9e3c92
fix segfaults caused by socket and file descriptor mismatches on windows
faust3
parents:
14836
diff
changeset
|
440 } |
27461
5a30f5bc23a0
Rename HAVE_WINSOCK preprocessor condition to HAVE_WINSOCK_H.
diego
parents:
27397
diff
changeset
|
441 #ifdef HAVE_WINSOCK2_H |
10281 | 442 mp_msg(MSGT_STREAM,MSGL_V,"WINSOCK2 uninit\n"); |
443 WSACleanup(); // there might be a better place for this (-> later) | |
444 #endif | |
9794 | 445 // Disabled atm, i don't like that. s->priv can be anything after all |
446 // streams should destroy their priv on close | |
447 //if(s->priv) free(s->priv); | |
448 if(s->url) free(s->url); | |
1 | 449 free(s); |
450 } | |
451 | |
5133
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
4893
diff
changeset
|
452 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
|
453 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
|
454 s->priv = ds; |
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
4893
diff
changeset
|
455 return s; |
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
4893
diff
changeset
|
456 } |
26326
5bfc1d8bece9
Remove the need for code using stream to export an mp_input_check_interrupt()
albeu
parents:
26007
diff
changeset
|
457 |
5bfc1d8bece9
Remove the need for code using stream to export an mp_input_check_interrupt()
albeu
parents:
26007
diff
changeset
|
458 void stream_set_interrupt_callback(int (*cb)(int)) { |
5bfc1d8bece9
Remove the need for code using stream to export an mp_input_check_interrupt()
albeu
parents:
26007
diff
changeset
|
459 stream_check_interrupt_cb = cb; |
5bfc1d8bece9
Remove the need for code using stream to export an mp_input_check_interrupt()
albeu
parents:
26007
diff
changeset
|
460 } |
5bfc1d8bece9
Remove the need for code using stream to export an mp_input_check_interrupt()
albeu
parents:
26007
diff
changeset
|
461 |
5bfc1d8bece9
Remove the need for code using stream to export an mp_input_check_interrupt()
albeu
parents:
26007
diff
changeset
|
462 int stream_check_interrupt(int time) { |
5bfc1d8bece9
Remove the need for code using stream to export an mp_input_check_interrupt()
albeu
parents:
26007
diff
changeset
|
463 if(!stream_check_interrupt_cb) return 0; |
5bfc1d8bece9
Remove the need for code using stream to export an mp_input_check_interrupt()
albeu
parents:
26007
diff
changeset
|
464 return stream_check_interrupt_cb(time); |
5bfc1d8bece9
Remove the need for code using stream to export an mp_input_check_interrupt()
albeu
parents:
26007
diff
changeset
|
465 } |