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