Mercurial > mplayer.hg
annotate stream/stream.c @ 32764:da6f5584da98
sync with en/mplayer.1 rev. 32842
author | jrash |
---|---|
date | Sat, 05 Feb 2011 03:35:40 +0000 |
parents | b39155e98ac3 |
children | 77d81e27a176 |
rev | line source |
---|---|
30426
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
30361
diff
changeset
|
1 /* |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
30361
diff
changeset
|
2 * This file is part of MPlayer. |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
30361
diff
changeset
|
3 * |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
30361
diff
changeset
|
4 * MPlayer is free software; you can redistribute it and/or modify |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
30361
diff
changeset
|
5 * it under the terms of the GNU General Public License as published by |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
30361
diff
changeset
|
6 * the Free Software Foundation; either version 2 of the License, or |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
30361
diff
changeset
|
7 * (at your option) any later version. |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
30361
diff
changeset
|
8 * |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
30361
diff
changeset
|
9 * MPlayer is distributed in the hope that it will be useful, |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
30361
diff
changeset
|
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
30361
diff
changeset
|
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
30361
diff
changeset
|
12 * GNU General Public License for more details. |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
30361
diff
changeset
|
13 * |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
30361
diff
changeset
|
14 * You should have received a copy of the GNU General Public License along |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
30361
diff
changeset
|
15 * with MPlayer; if not, write to the Free Software Foundation, Inc., |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
30361
diff
changeset
|
16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
30361
diff
changeset
|
17 */ |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1177
diff
changeset
|
18 |
1430 | 19 #include <stdio.h> |
20 #include <stdlib.h> | |
21 #include <unistd.h> | |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1177
diff
changeset
|
22 |
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1177
diff
changeset
|
23 #include <sys/types.h> |
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1177
diff
changeset
|
24 #include <sys/stat.h> |
9798 | 25 #ifndef __MINGW32__ |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1177
diff
changeset
|
26 #include <sys/ioctl.h> |
6814 | 27 #include <sys/wait.h> |
9798 | 28 #endif |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1177
diff
changeset
|
29 #include <fcntl.h> |
9794 | 30 #include <strings.h> |
578 | 31 |
1430 | 32 #include "config.h" |
27472
c0b233cd30ca
Revert moving closesocket definition and network headers to network.h.
diego
parents:
27464
diff
changeset
|
33 |
28402 | 34 #if HAVE_WINSOCK2_H |
27472
c0b233cd30ca
Revert moving closesocket definition and network headers to network.h.
diego
parents:
27464
diff
changeset
|
35 #include <winsock2.h> |
c0b233cd30ca
Revert moving closesocket definition and network headers to network.h.
diego
parents:
27464
diff
changeset
|
36 #endif |
c0b233cd30ca
Revert moving closesocket definition and network headers to network.h.
diego
parents:
27464
diff
changeset
|
37 |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1642
diff
changeset
|
38 #include "mp_msg.h" |
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1642
diff
changeset
|
39 #include "help_mp.h" |
17012 | 40 #include "osdep/shmem.h" |
31496 | 41 #include "osdep/timer.h" |
27473
ae5da477539e
Move '#define closesocket close' preprocessor directive to a common place
diego
parents:
27472
diff
changeset
|
42 #include "network.h" |
578 | 43 #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
|
44 #include "libmpdemux/demuxer.h" |
31592
a4ceb52caa30
Fix compilation broken due to GET_UTF8 being undefined.
reimar
parents:
31565
diff
changeset
|
45 #include "libavutil/common.h" |
30757
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
46 #include "libavutil/intreadwrite.h" |
578 | 47 |
17012 | 48 #include "m_option.h" |
49 #include "m_struct.h" | |
9794 | 50 |
19808
5385740067a1
* remove extern definitions of functions in .c files
attila
parents:
19568
diff
changeset
|
51 #include "cache2.h" |
1 | 52 |
26326
5bfc1d8bece9
Remove the need for code using stream to export an mp_input_check_interrupt()
albeu
parents:
26007
diff
changeset
|
53 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
|
54 |
31836
dcd515ac5f6c
Add support for bd:// streams as a test for a part of the AACS algorithm.
reimar
parents:
31683
diff
changeset
|
55 extern const stream_info_t stream_info_bd; |
25211 | 56 extern const stream_info_t stream_info_vcd; |
57 extern const stream_info_t stream_info_cdda; | |
58 extern const stream_info_t stream_info_netstream; | |
59 extern const stream_info_t stream_info_pnm; | |
60 extern const stream_info_t stream_info_asf; | |
61 extern const stream_info_t stream_info_rtsp; | |
62 extern const stream_info_t stream_info_rtp; | |
63 extern const stream_info_t stream_info_udp; | |
64 extern const stream_info_t stream_info_http1; | |
65 extern const stream_info_t stream_info_http2; | |
66 extern const stream_info_t stream_info_dvb; | |
67 extern const stream_info_t stream_info_tv; | |
68 extern const stream_info_t stream_info_radio; | |
69 extern const stream_info_t stream_info_pvr; | |
70 extern const stream_info_t stream_info_ftp; | |
71 extern const stream_info_t stream_info_vstream; | |
72 extern const stream_info_t stream_info_dvdnav; | |
73 extern const stream_info_t stream_info_smb; | |
74 extern const stream_info_t stream_info_sdp; | |
75 extern const stream_info_t stream_info_rtsp_sip; | |
10560 | 76 |
25211 | 77 extern const stream_info_t stream_info_cue; |
78 extern const stream_info_t stream_info_null; | |
79 extern const stream_info_t stream_info_mf; | |
29881
5797dc687a8e
Add preliminary support for streaming via FFmpeg's URProtocol functions.
reimar
parents:
29819
diff
changeset
|
80 extern const stream_info_t stream_info_ffmpeg; |
25211 | 81 extern const stream_info_t stream_info_file; |
82 extern const stream_info_t stream_info_ifo; | |
83 extern const stream_info_t stream_info_dvd; | |
31565
9a590e7aac57
Support for unencrypted Blu-ray playback through libbluray.
ben
parents:
31496
diff
changeset
|
84 extern const stream_info_t stream_info_bluray; |
9794 | 85 |
25209 | 86 static const stream_info_t* const auto_open_streams[] = { |
31836
dcd515ac5f6c
Add support for bd:// streams as a test for a part of the AACS algorithm.
reimar
parents:
31683
diff
changeset
|
87 &stream_info_bd, |
27370
14c5017f40d2
Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents:
27341
diff
changeset
|
88 #ifdef CONFIG_VCD |
9886 | 89 &stream_info_vcd, |
90 #endif | |
27391
1d2faa1020fb
Rename a bunch of miscellaneous preprocessor directives.
diego
parents:
27370
diff
changeset
|
91 #ifdef CONFIG_CDDA |
9801 | 92 &stream_info_cdda, |
9810 | 93 #endif |
31683
db0b49579eeb
Rename network build system variable and command line option to networking.
diego
parents:
31592
diff
changeset
|
94 #ifdef CONFIG_NETWORKING |
9853 | 95 &stream_info_netstream, |
15585 | 96 &stream_info_http1, |
97 &stream_info_asf, | |
98 &stream_info_pnm, | |
99 &stream_info_rtsp, | |
27397
d47744b95b78
Give a CONFIG_ prefix to preprocessor directives that lacked one and
diego
parents:
27391
diff
changeset
|
100 #ifdef CONFIG_LIVE555 |
15585 | 101 &stream_info_sdp, |
102 &stream_info_rtsp_sip, | |
103 #endif | |
19313
0792ad01e9bf
split rtp stack, udp input layer and rtp input layer from rtp.c
ben
parents:
19312
diff
changeset
|
104 &stream_info_rtp, |
0792ad01e9bf
split rtp stack, udp input layer and rtp input layer from rtp.c
ben
parents:
19312
diff
changeset
|
105 &stream_info_udp, |
15585 | 106 &stream_info_http2, |
9853 | 107 #endif |
27370
14c5017f40d2
Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents:
27341
diff
changeset
|
108 #ifdef CONFIG_DVBIN |
10560 | 109 &stream_info_dvb, |
110 #endif | |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27178
diff
changeset
|
111 #ifdef CONFIG_TV |
19273
11ec1cb3a7ea
add an explicit tv stream input instead of the previous hack in stream_null
ben
parents:
19271
diff
changeset
|
112 &stream_info_tv, |
11ec1cb3a7ea
add an explicit tv stream input instead of the previous hack in stream_null
ben
parents:
19271
diff
changeset
|
113 #endif |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27178
diff
changeset
|
114 #ifdef CONFIG_RADIO |
19568
bd821fd3e244
Radio support, patch by Vladimir Voroshilov (voroshil gmail com)
reimar
parents:
19313
diff
changeset
|
115 &stream_info_radio, |
bd821fd3e244
Radio support, patch by Vladimir Voroshilov (voroshil gmail com)
reimar
parents:
19313
diff
changeset
|
116 #endif |
27370
14c5017f40d2
Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents:
27341
diff
changeset
|
117 #ifdef CONFIG_PVR |
18997 | 118 &stream_info_pvr, |
119 #endif | |
27391
1d2faa1020fb
Rename a bunch of miscellaneous preprocessor directives.
diego
parents:
27370
diff
changeset
|
120 #ifdef CONFIG_FTP |
10625
620cc649f519
ftp support. The change on connect2Server is needed bcs we need 2
albeu
parents:
10560
diff
changeset
|
121 &stream_info_ftp, |
620cc649f519
ftp support. The change on connect2Server is needed bcs we need 2
albeu
parents:
10560
diff
changeset
|
122 #endif |
27391
1d2faa1020fb
Rename a bunch of miscellaneous preprocessor directives.
diego
parents:
27370
diff
changeset
|
123 #ifdef CONFIG_VSTREAM |
14836
8b9738526dd7
added a stream module for the vstream client library
joey
parents:
12018
diff
changeset
|
124 &stream_info_vstream, |
8b9738526dd7
added a stream module for the vstream client library
joey
parents:
12018
diff
changeset
|
125 #endif |
27397
d47744b95b78
Give a CONFIG_ prefix to preprocessor directives that lacked one and
diego
parents:
27391
diff
changeset
|
126 #ifdef CONFIG_LIBSMBCLIENT |
15520 | 127 &stream_info_smb, |
128 #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
|
129 &stream_info_cue, |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27178
diff
changeset
|
130 #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
|
131 &stream_info_ifo, |
15518 | 132 &stream_info_dvd, |
17191
6ac0b5f0d1ed
fix compilation when dvdkit and dvdread are not available
nicodvb
parents:
17012
diff
changeset
|
133 #endif |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27178
diff
changeset
|
134 #ifdef CONFIG_DVDNAV |
18712
cb7da1894b00
restored support for dvdnav only in the stream layer; all other functionalities are disabled
nicodvb
parents:
18558
diff
changeset
|
135 &stream_info_dvdnav, |
15518 | 136 #endif |
31565
9a590e7aac57
Support for unencrypted Blu-ray playback through libbluray.
ben
parents:
31496
diff
changeset
|
137 #ifdef CONFIG_LIBBLURAY |
9a590e7aac57
Support for unencrypted Blu-ray playback through libbluray.
ben
parents:
31496
diff
changeset
|
138 &stream_info_bluray, |
9a590e7aac57
Support for unencrypted Blu-ray playback through libbluray.
ben
parents:
31496
diff
changeset
|
139 #endif |
32142
4614728cab25
build system: Merge all FFmpeg library checks into a single FFmpeg check.
diego
parents:
31918
diff
changeset
|
140 #ifdef CONFIG_FFMPEG |
29881
5797dc687a8e
Add preliminary support for streaming via FFmpeg's URProtocol functions.
reimar
parents:
29819
diff
changeset
|
141 &stream_info_ffmpeg, |
5797dc687a8e
Add preliminary support for streaming via FFmpeg's URProtocol functions.
reimar
parents:
29819
diff
changeset
|
142 #endif |
15518 | 143 |
9901
233802490b0e
Add a null streamv Currently used for tv and mf. Could be used to
albeu
parents:
9886
diff
changeset
|
144 &stream_info_null, |
19301 | 145 &stream_info_mf, |
9794 | 146 &stream_info_file, |
147 NULL | |
148 }; | |
149 | |
30697
9a49143918aa
Mark stream open filename parameter as const, the filename string is not
reimar
parents:
30626
diff
changeset
|
150 static stream_t* open_stream_plugin(const stream_info_t* sinfo, const char* filename, |
30557
74a6c2a3dcce
stream: Mark functions not used outside of their files as static.
diego
parents:
30426
diff
changeset
|
151 int mode, char** options, int* file_format, |
74a6c2a3dcce
stream: Mark functions not used outside of their files as static.
diego
parents:
30426
diff
changeset
|
152 int* ret, char** redirected_url) |
74a6c2a3dcce
stream: Mark functions not used outside of their files as static.
diego
parents:
30426
diff
changeset
|
153 { |
9794 | 154 void* arg = NULL; |
155 stream_t* s; | |
156 m_struct_t* desc = (m_struct_t*)sinfo->opts; | |
157 | |
158 // Parse options | |
159 if(desc) { | |
160 arg = m_struct_alloc(desc); | |
161 if(sinfo->opts_url) { | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
162 m_option_t url_opt = |
9794 | 163 { "stream url", arg , CONF_TYPE_CUSTOM_URL, 0, 0 ,0, sinfo->opts }; |
164 if(m_option_parse(&url_opt,"stream url",filename,arg,M_CONFIG_FILE) < 0) { | |
165 mp_msg(MSGT_OPEN,MSGL_ERR, "URL parsing failed on url %s\n",filename); | |
166 m_struct_free(desc,arg); | |
167 return NULL; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
168 } |
9794 | 169 } |
170 if(options) { | |
171 int i; | |
172 for(i = 0 ; options[i] != NULL ; i += 2) { | |
173 mp_msg(MSGT_OPEN,MSGL_DBG2, "Set stream arg %s=%s\n", | |
174 options[i],options[i+1]); | |
175 if(!m_struct_set(desc,arg,options[i],options[i+1])) | |
176 mp_msg(MSGT_OPEN,MSGL_WARN, "Failed to set stream option %s=%s\n", | |
177 options[i],options[i+1]); | |
178 } | |
179 } | |
180 } | |
181 s = new_stream(-2,-2); | |
32438
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32142
diff
changeset
|
182 s->capture_file = NULL; |
9794 | 183 s->url=strdup(filename); |
184 s->flags |= mode; | |
185 *ret = sinfo->open(s,mode,arg,file_format); | |
186 if((*ret) != STREAM_OK) { | |
31683
db0b49579eeb
Rename network build system variable and command line option to networking.
diego
parents:
31592
diff
changeset
|
187 #ifdef CONFIG_NETWORKING |
25135
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24963
diff
changeset
|
188 if (*ret == STREAM_REDIRECTED && redirected_url) { |
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24963
diff
changeset
|
189 if (s->streaming_ctrl && s->streaming_ctrl->url |
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24963
diff
changeset
|
190 && s->streaming_ctrl->url->url) |
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24963
diff
changeset
|
191 *redirected_url = strdup(s->streaming_ctrl->url->url); |
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24963
diff
changeset
|
192 else |
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24963
diff
changeset
|
193 *redirected_url = NULL; |
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24963
diff
changeset
|
194 } |
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24963
diff
changeset
|
195 streaming_ctrl_free(s->streaming_ctrl); |
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24963
diff
changeset
|
196 #endif |
9794 | 197 free(s->url); |
198 free(s); | |
199 return NULL; | |
200 } | |
201 if(s->type <= -2) | |
202 mp_msg(MSGT_OPEN,MSGL_WARN, "Warning streams need a type !!!!\n"); | |
29920
4f740437ed2b
Finally rename the STREAM_SEEK define to MP_STREAM_SEEK, there are just too many
reimar
parents:
29887
diff
changeset
|
203 if(s->flags & MP_STREAM_SEEK && !s->seek) |
4f740437ed2b
Finally rename the STREAM_SEEK define to MP_STREAM_SEEK, there are just too many
reimar
parents:
29887
diff
changeset
|
204 s->flags &= ~MP_STREAM_SEEK; |
4f740437ed2b
Finally rename the STREAM_SEEK define to MP_STREAM_SEEK, there are just too many
reimar
parents:
29887
diff
changeset
|
205 if(s->seek && !(s->flags & MP_STREAM_SEEK)) |
4f740437ed2b
Finally rename the STREAM_SEEK define to MP_STREAM_SEEK, there are just too many
reimar
parents:
29887
diff
changeset
|
206 s->flags |= MP_STREAM_SEEK; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
207 |
21659 | 208 s->mode = mode; |
9794 | 209 |
210 mp_msg(MSGT_OPEN,MSGL_V, "STREAM: [%s] %s\n",sinfo->name,filename); | |
211 mp_msg(MSGT_OPEN,MSGL_V, "STREAM: Description: %s\n",sinfo->info); | |
212 mp_msg(MSGT_OPEN,MSGL_V, "STREAM: Author: %s\n", sinfo->author); | |
213 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
|
214 |
9794 | 215 return s; |
216 } | |
217 | |
218 | |
30697
9a49143918aa
Mark stream open filename parameter as const, the filename string is not
reimar
parents:
30626
diff
changeset
|
219 stream_t* open_stream_full(const char* filename,int mode, char** options, int* file_format) { |
9794 | 220 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
|
221 const stream_info_t* sinfo; |
9794 | 222 stream_t* s; |
25135
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24963
diff
changeset
|
223 char *redirected_url = NULL; |
9794 | 224 |
225 for(i = 0 ; auto_open_streams[i] ; i++) { | |
226 sinfo = auto_open_streams[i]; | |
227 if(!sinfo->protocols) { | |
10735
8a10d5d0ce86
serious bugs - 1l absinth (changed to absinth against cola inflation)
alex
parents:
10625
diff
changeset
|
228 mp_msg(MSGT_OPEN,MSGL_WARN, "Stream type %s has protocols == NULL, it's a bug\n", sinfo->name); |
9794 | 229 continue; |
230 } | |
231 for(j = 0 ; sinfo->protocols[j] ; j++) { | |
232 l = strlen(sinfo->protocols[j]); | |
233 // 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
|
234 if((l == 0 && !strstr(filename, "://")) || |
25429 | 235 ((strncasecmp(sinfo->protocols[j],filename,l) == 0) && |
9794 | 236 (strncmp("://",filename+l,3) == 0))) { |
237 *file_format = DEMUXER_TYPE_UNKNOWN; | |
25135
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24963
diff
changeset
|
238 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
|
239 &redirected_url); |
9794 | 240 if(s) return s; |
25135
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24963
diff
changeset
|
241 if(r == STREAM_REDIRECTED && redirected_url) { |
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24963
diff
changeset
|
242 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
|
243 sinfo->info, filename, redirected_url); |
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24963
diff
changeset
|
244 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
|
245 free(redirected_url); |
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24963
diff
changeset
|
246 return s; |
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24963
diff
changeset
|
247 } |
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24963
diff
changeset
|
248 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
|
249 mp_msg(MSGT_OPEN,MSGL_ERR, MSGTR_FailedToOpen,filename); |
9794 | 250 return NULL; |
251 } | |
252 break; | |
253 } | |
254 } | |
255 } | |
256 | |
257 mp_msg(MSGT_OPEN,MSGL_ERR, "No stream found to handle url %s\n",filename); | |
258 return NULL; | |
259 } | |
260 | |
30697
9a49143918aa
Mark stream open filename parameter as const, the filename string is not
reimar
parents:
30626
diff
changeset
|
261 stream_t* open_output_stream(const char* filename, char** options) { |
21659 | 262 int file_format; //unused |
263 if(!filename) { | |
264 mp_msg(MSGT_OPEN,MSGL_ERR,"open_output_stream(), NULL filename, report this bug\n"); | |
265 return NULL; | |
266 } | |
267 | |
268 return open_stream_full(filename,STREAM_WRITE,options,&file_format); | |
269 } | |
270 | |
1 | 271 //=================== STREAMER ========================= |
272 | |
32438
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32142
diff
changeset
|
273 void stream_capture_do(stream_t *s) |
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32142
diff
changeset
|
274 { |
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32142
diff
changeset
|
275 if (fwrite(s->buffer, s->buf_len, 1, s->capture_file) < 1) { |
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32142
diff
changeset
|
276 mp_msg(MSGT_GLOBAL, MSGL_ERR, "Error writing capture file: %s\n", |
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32142
diff
changeset
|
277 strerror(errno)); |
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32142
diff
changeset
|
278 fclose(s->capture_file); |
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32142
diff
changeset
|
279 s->capture_file = NULL; |
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32142
diff
changeset
|
280 } |
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32142
diff
changeset
|
281 } |
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32142
diff
changeset
|
282 |
32472
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
283 int stream_read_internal(stream_t *s, void *buf, int len) |
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
284 { |
31169 | 285 // we will retry even if we already reached EOF previously. |
1 | 286 switch(s->type){ |
692 | 287 case STREAMTYPE_STREAM: |
31683
db0b49579eeb
Rename network build system variable and command line option to networking.
diego
parents:
31592
diff
changeset
|
288 #ifdef CONFIG_NETWORKING |
24963
0a733c2c577e
Fix possible null-pointer-dereference in stream_fill_buffer().
cehoyos
parents:
24257
diff
changeset
|
289 if( s->streaming_ctrl!=NULL && s->streaming_ctrl->streaming_read ) { |
32472
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
290 len=s->streaming_ctrl->streaming_read(s->fd, buf, len, s->streaming_ctrl); |
29819
2c2733d12823
The code for the non-networking case is the same whether networking
reimar
parents:
29818
diff
changeset
|
291 } else |
2c2733d12823
The code for the non-networking case is the same whether networking
reimar
parents:
29818
diff
changeset
|
292 #endif |
29883
306e614b92cb
Use fill_buffer if available also for STREAMTYPE_STREAM
reimar
parents:
29881
diff
changeset
|
293 if (s->fill_buffer) |
32472
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
294 len = s->fill_buffer(s, buf, len); |
29883
306e614b92cb
Use fill_buffer if available also for STREAMTYPE_STREAM
reimar
parents:
29881
diff
changeset
|
295 else |
32472
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
296 len = read(s->fd, buf, len); |
29818 | 297 break; |
5133
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
4893
diff
changeset
|
298 case STREAMTYPE_DS: |
32472
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
299 len = demux_read_data((demux_stream_t*)s->priv, buf, len); |
5133
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
4893
diff
changeset
|
300 break; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
301 |
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
302 |
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
303 default: |
32472
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
304 len= s->fill_buffer ? s->fill_buffer(s, buf, len) : 0; |
1 | 305 } |
30626
27b133678bbd
Do not discard stream buffer on eof, instead reuse it to slightly improve
reimar
parents:
30557
diff
changeset
|
306 if(len<=0){ s->eof=1; return 0; } |
31169 | 307 // When reading succeeded we are obviously not at eof. |
308 // This e.g. avoids issues with eof getting stuck when lavf seeks in MPEG-TS | |
309 s->eof=0; | |
32472
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
310 s->pos+=len; |
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
311 return len; |
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
312 } |
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
313 |
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
314 int stream_fill_buffer(stream_t *s){ |
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
315 int len = stream_read_internal(s, s->buffer, STREAM_BUFFER_SIZE); |
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
316 if (len <= 0) |
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
317 return 0; |
1 | 318 s->buf_pos=0; |
319 s->buf_len=len; | |
320 // printf("[%d]",len);fflush(stdout); | |
32438
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32142
diff
changeset
|
321 if (s->capture_file) |
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32142
diff
changeset
|
322 stream_capture_do(s); |
1 | 323 return len; |
324 } | |
325 | |
21659 | 326 int stream_write_buffer(stream_t *s, unsigned char *buf, int len) { |
327 int rd; | |
328 if(!s->write_buffer) | |
329 return -1; | |
330 rd = s->write_buffer(s, buf, len); | |
331 if(rd < 0) | |
332 return -1; | |
333 s->pos += rd; | |
334 return rd; | |
335 } | |
336 | |
32472
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
337 int stream_seek_internal(stream_t *s, off_t newpos) |
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
338 { |
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
339 if(newpos==0 || newpos!=s->pos){ |
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
340 switch(s->type){ |
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
341 case STREAMTYPE_STREAM: |
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
342 //s->pos=newpos; // real seek |
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
343 // Some streaming protocol allow to seek backward and forward |
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
344 // A function call that return -1 can tell that the protocol |
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
345 // doesn't support seeking. |
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
346 #ifdef CONFIG_NETWORKING |
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
347 if(s->seek) { // new stream seek is much cleaner than streaming_ctrl one |
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
348 if(!s->seek(s,newpos)) { |
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
349 mp_msg(MSGT_STREAM,MSGL_ERR, "Seek failed\n"); |
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
350 return 0; |
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
351 } |
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
352 break; |
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
353 } |
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
354 |
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
355 if( s->streaming_ctrl!=NULL && s->streaming_ctrl->streaming_seek ) { |
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
356 if( s->streaming_ctrl->streaming_seek( s->fd, newpos, s->streaming_ctrl )<0 ) { |
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
357 mp_msg(MSGT_STREAM,MSGL_INFO,"Stream not seekable!\n"); |
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
358 return 1; |
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
359 } |
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
360 break; |
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
361 } |
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
362 #endif |
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
363 if(newpos<s->pos){ |
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
364 mp_msg(MSGT_STREAM,MSGL_INFO,"Cannot seek backward in linear streams!\n"); |
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
365 return 1; |
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
366 } |
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
367 break; |
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
368 default: |
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
369 // This should at the beginning as soon as all streams are converted |
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
370 if(!s->seek) |
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
371 return 0; |
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
372 // Now seek |
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
373 if(!s->seek(s,newpos)) { |
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
374 mp_msg(MSGT_STREAM,MSGL_ERR, "Seek failed\n"); |
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
375 return 0; |
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
376 } |
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
377 } |
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
378 // putchar('.');fflush(stdout); |
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
379 //} else { |
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
380 // putchar('%');fflush(stdout); |
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
381 } |
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
382 return -1; |
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
383 } |
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
384 |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1177
diff
changeset
|
385 int stream_seek_long(stream_t *s,off_t pos){ |
32472
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
386 int res; |
6814 | 387 off_t newpos=0; |
1 | 388 |
17932 | 389 // if( mp_msg_test(MSGT_STREAM,MSGL_DBG3) ) printf("seek_long to 0x%X\n",(unsigned int)pos); |
1 | 390 |
391 s->buf_pos=s->buf_len=0; | |
392 | |
21659 | 393 if(s->mode == STREAM_WRITE) { |
394 if(!s->seek || !s->seek(s,pos)) | |
395 return 0; | |
396 return 1; | |
397 } | |
398 | |
22362
e244d570ba44
cleaned stream_seek() : simplified the alignment to STREAM_BUFFER_SIZE or s->sector_size
nicodvb
parents:
21659
diff
changeset
|
399 if(s->sector_size) |
e244d570ba44
cleaned stream_seek() : simplified the alignment to STREAM_BUFFER_SIZE or s->sector_size
nicodvb
parents:
21659
diff
changeset
|
400 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
|
401 else |
e244d570ba44
cleaned stream_seek() : simplified the alignment to STREAM_BUFFER_SIZE or s->sector_size
nicodvb
parents:
21659
diff
changeset
|
402 newpos = pos&(~((off_t)STREAM_BUFFER_SIZE-1)); |
1 | 403 |
17932 | 404 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
|
405 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
|
406 (int64_t)s->pos,(int64_t)newpos,(int64_t)pos,s->buf_len); |
2050 | 407 } |
1 | 408 pos-=newpos; |
409 | |
32472
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
410 res = stream_seek_internal(s, newpos); |
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
411 if (res >= 0) |
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
412 return res; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
413 |
32472
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
414 while(s->pos<newpos){ |
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32438
diff
changeset
|
415 if(stream_fill_buffer(s)<=0) break; // EOF |
1 | 416 } |
417 | |
17878
ab0a3e3d32ed
Fix a potential seek failure, fill_buffer doesn't have to
albeu
parents:
17712
diff
changeset
|
418 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
|
419 if(pos<=s->buf_len){ |
1 | 420 s->buf_pos=pos; // byte position in sector |
421 return 1; | |
422 } | |
17878
ab0a3e3d32ed
Fix a potential seek failure, fill_buffer doesn't have to
albeu
parents:
17712
diff
changeset
|
423 pos -= s->buf_len; |
ab0a3e3d32ed
Fix a potential seek failure, fill_buffer doesn't have to
albeu
parents:
17712
diff
changeset
|
424 } |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
425 |
1999 | 426 // 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
|
427 |
16750
0a31740dd5e6
Use PRI?64 defines as format strings for 64 bit variables.
reimar
parents:
16572
diff
changeset
|
428 mp_msg(MSGT_STREAM,MSGL_V,"stream_seek: WARNING! Can't seek to 0x%"PRIX64" !\n",(int64_t)(pos+newpos)); |
1 | 429 return 0; |
430 } | |
431 | |
432 | |
433 void stream_reset(stream_t *s){ | |
434 if(s->eof){ | |
30626
27b133678bbd
Do not discard stream buffer on eof, instead reuse it to slightly improve
reimar
parents:
30557
diff
changeset
|
435 s->pos=0; |
27b133678bbd
Do not discard stream buffer on eof, instead reuse it to slightly improve
reimar
parents:
30557
diff
changeset
|
436 s->buf_pos=s->buf_len=0; |
1 | 437 s->eof=0; |
438 } | |
9853 | 439 if(s->control) s->control(s,STREAM_CTRL_RESET,NULL); |
1 | 440 //stream_seek(s,0); |
441 } | |
442 | |
17712 | 443 int stream_control(stream_t *s, int cmd, void *arg){ |
24257 | 444 if(!s->control) return STREAM_UNSUPPORTED; |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27178
diff
changeset
|
445 #ifdef CONFIG_STREAM_CACHE |
26833
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
446 if (s->cache_pid) |
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
447 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
|
448 #endif |
17696
66d7afee9a46
added new stream_control() and new command: STREAM_CTRL_GET_TIME_LENGTH
nicodvb
parents:
17191
diff
changeset
|
449 return s->control(s, cmd, arg); |
66d7afee9a46
added new stream_control() and new command: STREAM_CTRL_GET_TIME_LENGTH
nicodvb
parents:
17191
diff
changeset
|
450 } |
66d7afee9a46
added new stream_control() and new command: STREAM_CTRL_GET_TIME_LENGTH
nicodvb
parents:
17191
diff
changeset
|
451 |
2144 | 452 stream_t* new_memory_stream(unsigned char* data,int len){ |
18558
4928dd61f136
Fix potential integer overflows in memory allocation.
rtogni
parents:
18176
diff
changeset
|
453 stream_t *s; |
4928dd61f136
Fix potential integer overflows in memory allocation.
rtogni
parents:
18176
diff
changeset
|
454 |
4928dd61f136
Fix potential integer overflows in memory allocation.
rtogni
parents:
18176
diff
changeset
|
455 if(len < 0) |
4928dd61f136
Fix potential integer overflows in memory allocation.
rtogni
parents:
18176
diff
changeset
|
456 return NULL; |
29887 | 457 s=calloc(1, sizeof(stream_t)+len); |
2144 | 458 s->fd=-1; |
459 s->type=STREAMTYPE_MEMORY; | |
460 s->buf_pos=0; s->buf_len=len; | |
461 s->start_pos=0; s->end_pos=len; | |
462 stream_reset(s); | |
463 s->pos=len; | |
464 memcpy(s->buffer,data,len); | |
465 return s; | |
466 } | |
467 | |
1 | 468 stream_t* new_stream(int fd,int type){ |
29887 | 469 stream_t *s=calloc(1, sizeof(stream_t)); |
3291 | 470 if(s==NULL) return NULL; |
10281 | 471 |
28402 | 472 #if HAVE_WINSOCK2_H |
10281 | 473 { |
474 WSADATA wsdata; | |
475 int temp = WSAStartup(0x0202, &wsdata); // there might be a better place for this (-> later) | |
476 mp_msg(MSGT_STREAM,MSGL_V,"WINSOCK2 init: %i\n", temp); | |
477 } | |
478 #endif | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
479 |
1 | 480 s->fd=fd; |
481 s->type=type; | |
180 | 482 s->buf_pos=s->buf_len=0; |
598 | 483 s->start_pos=s->end_pos=0; |
1642 | 484 s->priv=NULL; |
7407 | 485 s->url=NULL; |
2322 | 486 s->cache_pid=0; |
1 | 487 stream_reset(s); |
488 return s; | |
489 } | |
490 | |
491 void free_stream(stream_t *s){ | |
6138
523014df7d32
big cosmetics patch, cleanup of messages printed by mplayer and libs.
arpi
parents:
5982
diff
changeset
|
492 // printf("\n*** free_stream() called ***\n"); |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27178
diff
changeset
|
493 #ifdef CONFIG_STREAM_CACHE |
9915 | 494 cache_uninit(s); |
9798 | 495 #endif |
32438
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32142
diff
changeset
|
496 if (s->capture_file) { |
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32142
diff
changeset
|
497 fclose(s->capture_file); |
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32142
diff
changeset
|
498 s->capture_file = NULL; |
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32142
diff
changeset
|
499 } |
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32142
diff
changeset
|
500 |
15520 | 501 if(s->close) s->close(s); |
15421
ae5e1b9e3c92
fix segfaults caused by socket and file descriptor mismatches on windows
faust3
parents:
14836
diff
changeset
|
502 if(s->fd>0){ |
ae5e1b9e3c92
fix segfaults caused by socket and file descriptor mismatches on windows
faust3
parents:
14836
diff
changeset
|
503 /* on unix we define closesocket to close |
ae5e1b9e3c92
fix segfaults caused by socket and file descriptor mismatches on windows
faust3
parents:
14836
diff
changeset
|
504 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
|
505 network socket and file */ |
ae5e1b9e3c92
fix segfaults caused by socket and file descriptor mismatches on windows
faust3
parents:
14836
diff
changeset
|
506 if(s->url && strstr(s->url,"://")) |
ae5e1b9e3c92
fix segfaults caused by socket and file descriptor mismatches on windows
faust3
parents:
14836
diff
changeset
|
507 closesocket(s->fd); |
ae5e1b9e3c92
fix segfaults caused by socket and file descriptor mismatches on windows
faust3
parents:
14836
diff
changeset
|
508 else close(s->fd); |
ae5e1b9e3c92
fix segfaults caused by socket and file descriptor mismatches on windows
faust3
parents:
14836
diff
changeset
|
509 } |
28402 | 510 #if HAVE_WINSOCK2_H |
10281 | 511 mp_msg(MSGT_STREAM,MSGL_V,"WINSOCK2 uninit\n"); |
512 WSACleanup(); // there might be a better place for this (-> later) | |
513 #endif | |
9794 | 514 // Disabled atm, i don't like that. s->priv can be anything after all |
515 // streams should destroy their priv on close | |
32511
b39155e98ac3
Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents:
32472
diff
changeset
|
516 //free(s->priv); |
b39155e98ac3
Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents:
32472
diff
changeset
|
517 free(s->url); |
1 | 518 free(s); |
519 } | |
520 | |
5133
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
4893
diff
changeset
|
521 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
|
522 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
|
523 s->priv = ds; |
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
4893
diff
changeset
|
524 return s; |
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
4893
diff
changeset
|
525 } |
26326
5bfc1d8bece9
Remove the need for code using stream to export an mp_input_check_interrupt()
albeu
parents:
26007
diff
changeset
|
526 |
5bfc1d8bece9
Remove the need for code using stream to export an mp_input_check_interrupt()
albeu
parents:
26007
diff
changeset
|
527 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
|
528 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
|
529 } |
5bfc1d8bece9
Remove the need for code using stream to export an mp_input_check_interrupt()
albeu
parents:
26007
diff
changeset
|
530 |
5bfc1d8bece9
Remove the need for code using stream to export an mp_input_check_interrupt()
albeu
parents:
26007
diff
changeset
|
531 int stream_check_interrupt(int time) { |
31194
b2bb87b92146
stream_check_interrupt should sleep even if no callback is set.
reimar
parents:
31169
diff
changeset
|
532 if(!stream_check_interrupt_cb) { |
b2bb87b92146
stream_check_interrupt should sleep even if no callback is set.
reimar
parents:
31169
diff
changeset
|
533 usec_sleep(time * 1000); |
b2bb87b92146
stream_check_interrupt should sleep even if no callback is set.
reimar
parents:
31169
diff
changeset
|
534 return 0; |
b2bb87b92146
stream_check_interrupt should sleep even if no callback is set.
reimar
parents:
31169
diff
changeset
|
535 } |
26326
5bfc1d8bece9
Remove the need for code using stream to export an mp_input_check_interrupt()
albeu
parents:
26007
diff
changeset
|
536 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
|
537 } |
30754
dff9ee89b7c1
Move stream_read_line implementation from stream.h to stream.c,
reimar
parents:
30697
diff
changeset
|
538 |
30757
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
539 /** |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
540 * Helper function to read 16 bits little-endian and advance pointer |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
541 */ |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
542 static uint16_t get_le16_inc(const uint8_t **buf) |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
543 { |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
544 uint16_t v = AV_RL16(*buf); |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
545 *buf += 2; |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
546 return v; |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
547 } |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
548 |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
549 /** |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
550 * Helper function to read 16 bits big-endian and advance pointer |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
551 */ |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
552 static uint16_t get_be16_inc(const uint8_t **buf) |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
553 { |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
554 uint16_t v = AV_RB16(*buf); |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
555 *buf += 2; |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
556 return v; |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
557 } |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
558 |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
559 /** |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
560 * Find a newline character in buffer |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
561 * \param buf buffer to search |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
562 * \param len amount of bytes to search in buffer, may not overread |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
563 * \param utf16 chose between UTF-8/ASCII/other and LE and BE UTF-16 |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
564 * 0 = UTF-8/ASCII/other, 1 = UTF-16-LE, 2 = UTF-16-BE |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
565 */ |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
566 static const uint8_t *find_newline(const uint8_t *buf, int len, int utf16) |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
567 { |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
568 uint32_t c; |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
569 const uint8_t *end = buf + len; |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
570 switch (utf16) { |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
571 case 0: |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
572 return (uint8_t *)memchr(buf, '\n', len); |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
573 case 1: |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
574 while (buf < end - 1) { |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
575 GET_UTF16(c, buf < end - 1 ? get_le16_inc(&buf) : 0, return NULL;) |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
576 if (buf <= end && c == '\n') |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
577 return buf - 1; |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
578 } |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
579 break; |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
580 case 2: |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
581 while (buf < end - 1) { |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
582 GET_UTF16(c, buf < end - 1 ? get_be16_inc(&buf) : 0, return NULL;) |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
583 if (buf <= end && c == '\n') |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
584 return buf - 1; |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
585 } |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
586 break; |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
587 } |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
588 return NULL; |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
589 } |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
590 |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
591 /** |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
592 * Copy a number of bytes, converting to UTF-8 if input is UTF-16 |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
593 * \param dst buffer to copy to |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
594 * \param dstsize size of dst buffer |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
595 * \param src buffer to copy from |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
596 * \param len amount of bytes to copy from src |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
597 * \param utf16 chose between UTF-8/ASCII/other and LE and BE UTF-16 |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
598 * 0 = UTF-8/ASCII/other, 1 = UTF-16-LE, 2 = UTF-16-BE |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
599 */ |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
600 static int copy_characters(uint8_t *dst, int dstsize, |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
601 const uint8_t *src, int *len, int utf16) |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
602 { |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
603 uint32_t c; |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
604 uint8_t *dst_end = dst + dstsize; |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
605 const uint8_t *end = src + *len; |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
606 switch (utf16) { |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
607 case 0: |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
608 if (*len > dstsize) |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
609 *len = dstsize; |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
610 memcpy(dst, src, *len); |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
611 return *len; |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
612 case 1: |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
613 while (src < end - 1 && dst_end - dst > 8) { |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
614 uint8_t tmp; |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
615 GET_UTF16(c, src < end - 1 ? get_le16_inc(&src) : 0, ;) |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
616 PUT_UTF8(c, tmp, *dst++ = tmp;) |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
617 } |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
618 *len -= end - src; |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
619 return dstsize - (dst_end - dst); |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
620 case 2: |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
621 while (src < end - 1 && dst_end - dst > 8) { |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
622 uint8_t tmp; |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
623 GET_UTF16(c, src < end - 1 ? get_be16_inc(&src) : 0, ;) |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
624 PUT_UTF8(c, tmp, *dst++ = tmp;) |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
625 } |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
626 *len -= end - src; |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
627 return dstsize - (dst_end - dst); |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
628 } |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
629 return 0; |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
630 } |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
631 |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
632 unsigned char* stream_read_line(stream_t *s,unsigned char* mem, int max, int utf16) { |
30754
dff9ee89b7c1
Move stream_read_line implementation from stream.h to stream.c,
reimar
parents:
30697
diff
changeset
|
633 int len; |
30757
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
634 const unsigned char *end; |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
635 unsigned char *ptr = mem; |
30754
dff9ee89b7c1
Move stream_read_line implementation from stream.h to stream.c,
reimar
parents:
30697
diff
changeset
|
636 if (max < 1) return NULL; |
dff9ee89b7c1
Move stream_read_line implementation from stream.h to stream.c,
reimar
parents:
30697
diff
changeset
|
637 max--; // reserve one for 0-termination |
dff9ee89b7c1
Move stream_read_line implementation from stream.h to stream.c,
reimar
parents:
30697
diff
changeset
|
638 do { |
dff9ee89b7c1
Move stream_read_line implementation from stream.h to stream.c,
reimar
parents:
30697
diff
changeset
|
639 len = s->buf_len-s->buf_pos; |
dff9ee89b7c1
Move stream_read_line implementation from stream.h to stream.c,
reimar
parents:
30697
diff
changeset
|
640 // try to fill the buffer |
dff9ee89b7c1
Move stream_read_line implementation from stream.h to stream.c,
reimar
parents:
30697
diff
changeset
|
641 if(len <= 0 && |
dff9ee89b7c1
Move stream_read_line implementation from stream.h to stream.c,
reimar
parents:
30697
diff
changeset
|
642 (!cache_stream_fill_buffer(s) || |
dff9ee89b7c1
Move stream_read_line implementation from stream.h to stream.c,
reimar
parents:
30697
diff
changeset
|
643 (len = s->buf_len-s->buf_pos) <= 0)) break; |
30757
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
644 end = find_newline(s->buffer+s->buf_pos, len, utf16); |
30754
dff9ee89b7c1
Move stream_read_line implementation from stream.h to stream.c,
reimar
parents:
30697
diff
changeset
|
645 if(end) len = end - (s->buffer+s->buf_pos) + 1; |
dff9ee89b7c1
Move stream_read_line implementation from stream.h to stream.c,
reimar
parents:
30697
diff
changeset
|
646 if(len > 0 && max > 0) { |
30757
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
647 int l = copy_characters(ptr, max, s->buffer+s->buf_pos, &len, utf16); |
30754
dff9ee89b7c1
Move stream_read_line implementation from stream.h to stream.c,
reimar
parents:
30697
diff
changeset
|
648 max -= l; |
dff9ee89b7c1
Move stream_read_line implementation from stream.h to stream.c,
reimar
parents:
30697
diff
changeset
|
649 ptr += l; |
30757
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
650 if (!len) |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
651 break; |
30754
dff9ee89b7c1
Move stream_read_line implementation from stream.h to stream.c,
reimar
parents:
30697
diff
changeset
|
652 } |
dff9ee89b7c1
Move stream_read_line implementation from stream.h to stream.c,
reimar
parents:
30697
diff
changeset
|
653 s->buf_pos += len; |
dff9ee89b7c1
Move stream_read_line implementation from stream.h to stream.c,
reimar
parents:
30697
diff
changeset
|
654 } while(!end); |
31918
3103448dcf28
Make sure we return an "empty" line on eof, to make sure we get
reimar
parents:
31836
diff
changeset
|
655 ptr[0] = 0; |
30754
dff9ee89b7c1
Move stream_read_line implementation from stream.h to stream.c,
reimar
parents:
30697
diff
changeset
|
656 if(s->eof && ptr == mem) return NULL; |
dff9ee89b7c1
Move stream_read_line implementation from stream.h to stream.c,
reimar
parents:
30697
diff
changeset
|
657 return mem; |
dff9ee89b7c1
Move stream_read_line implementation from stream.h to stream.c,
reimar
parents:
30697
diff
changeset
|
658 } |