Mercurial > mplayer.hg
annotate stream/stream.c @ 30953:d3f31670562d
Share more code between the two ATI fragment shader YUV to RGB
conversion methods and extend them to support more accurate
conversion (though at the cost of some speed).
author | reimar |
---|---|
date | Sun, 04 Apr 2010 11:45:05 +0000 |
parents | 39d953a7ee22 |
children | ac84149bbdaf |
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" |
27473
ae5da477539e
Move '#define closesocket close' preprocessor directive to a common place
diego
parents:
27472
diff
changeset
|
41 #include "network.h" |
578 | 42 #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
|
43 #include "libmpdemux/demuxer.h" |
30757
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
44 #include "libavutil/intreadwrite.h" |
578 | 45 |
17012 | 46 #include "m_option.h" |
47 #include "m_struct.h" | |
9794 | 48 |
19808
5385740067a1
* remove extern definitions of functions in .c files
attila
parents:
19568
diff
changeset
|
49 #include "cache2.h" |
1 | 50 |
26326
5bfc1d8bece9
Remove the need for code using stream to export an mp_input_check_interrupt()
albeu
parents:
26007
diff
changeset
|
51 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
|
52 |
25211 | 53 extern const stream_info_t stream_info_vcd; |
54 extern const stream_info_t stream_info_cdda; | |
55 extern const stream_info_t stream_info_netstream; | |
56 extern const stream_info_t stream_info_pnm; | |
57 extern const stream_info_t stream_info_asf; | |
58 extern const stream_info_t stream_info_rtsp; | |
59 extern const stream_info_t stream_info_rtp; | |
60 extern const stream_info_t stream_info_udp; | |
61 extern const stream_info_t stream_info_http1; | |
62 extern const stream_info_t stream_info_http2; | |
63 extern const stream_info_t stream_info_dvb; | |
64 extern const stream_info_t stream_info_tv; | |
65 extern const stream_info_t stream_info_radio; | |
66 extern const stream_info_t stream_info_pvr; | |
67 extern const stream_info_t stream_info_ftp; | |
68 extern const stream_info_t stream_info_vstream; | |
69 extern const stream_info_t stream_info_dvdnav; | |
70 extern const stream_info_t stream_info_smb; | |
71 extern const stream_info_t stream_info_sdp; | |
72 extern const stream_info_t stream_info_rtsp_sip; | |
10560 | 73 |
25211 | 74 extern const stream_info_t stream_info_cue; |
75 extern const stream_info_t stream_info_null; | |
76 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
|
77 extern const stream_info_t stream_info_ffmpeg; |
25211 | 78 extern const stream_info_t stream_info_file; |
79 extern const stream_info_t stream_info_ifo; | |
80 extern const stream_info_t stream_info_dvd; | |
9794 | 81 |
25209 | 82 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
|
83 #ifdef CONFIG_VCD |
9886 | 84 &stream_info_vcd, |
85 #endif | |
27391
1d2faa1020fb
Rename a bunch of miscellaneous preprocessor directives.
diego
parents:
27370
diff
changeset
|
86 #ifdef CONFIG_CDDA |
9801 | 87 &stream_info_cdda, |
9810 | 88 #endif |
27397
d47744b95b78
Give a CONFIG_ prefix to preprocessor directives that lacked one and
diego
parents:
27391
diff
changeset
|
89 #ifdef CONFIG_NETWORK |
9853 | 90 &stream_info_netstream, |
15585 | 91 &stream_info_http1, |
92 &stream_info_asf, | |
93 &stream_info_pnm, | |
94 &stream_info_rtsp, | |
27397
d47744b95b78
Give a CONFIG_ prefix to preprocessor directives that lacked one and
diego
parents:
27391
diff
changeset
|
95 #ifdef CONFIG_LIVE555 |
15585 | 96 &stream_info_sdp, |
97 &stream_info_rtsp_sip, | |
98 #endif | |
19313
0792ad01e9bf
split rtp stack, udp input layer and rtp input layer from rtp.c
ben
parents:
19312
diff
changeset
|
99 &stream_info_rtp, |
0792ad01e9bf
split rtp stack, udp input layer and rtp input layer from rtp.c
ben
parents:
19312
diff
changeset
|
100 &stream_info_udp, |
15585 | 101 &stream_info_http2, |
9853 | 102 #endif |
27370
14c5017f40d2
Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents:
27341
diff
changeset
|
103 #ifdef CONFIG_DVBIN |
10560 | 104 &stream_info_dvb, |
105 #endif | |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27178
diff
changeset
|
106 #ifdef CONFIG_TV |
19273
11ec1cb3a7ea
add an explicit tv stream input instead of the previous hack in stream_null
ben
parents:
19271
diff
changeset
|
107 &stream_info_tv, |
11ec1cb3a7ea
add an explicit tv stream input instead of the previous hack in stream_null
ben
parents:
19271
diff
changeset
|
108 #endif |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27178
diff
changeset
|
109 #ifdef CONFIG_RADIO |
19568
bd821fd3e244
Radio support, patch by Vladimir Voroshilov (voroshil gmail com)
reimar
parents:
19313
diff
changeset
|
110 &stream_info_radio, |
bd821fd3e244
Radio support, patch by Vladimir Voroshilov (voroshil gmail com)
reimar
parents:
19313
diff
changeset
|
111 #endif |
27370
14c5017f40d2
Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents:
27341
diff
changeset
|
112 #ifdef CONFIG_PVR |
18997 | 113 &stream_info_pvr, |
114 #endif | |
27391
1d2faa1020fb
Rename a bunch of miscellaneous preprocessor directives.
diego
parents:
27370
diff
changeset
|
115 #ifdef CONFIG_FTP |
10625
620cc649f519
ftp support. The change on connect2Server is needed bcs we need 2
albeu
parents:
10560
diff
changeset
|
116 &stream_info_ftp, |
620cc649f519
ftp support. The change on connect2Server is needed bcs we need 2
albeu
parents:
10560
diff
changeset
|
117 #endif |
27391
1d2faa1020fb
Rename a bunch of miscellaneous preprocessor directives.
diego
parents:
27370
diff
changeset
|
118 #ifdef CONFIG_VSTREAM |
14836
8b9738526dd7
added a stream module for the vstream client library
joey
parents:
12018
diff
changeset
|
119 &stream_info_vstream, |
8b9738526dd7
added a stream module for the vstream client library
joey
parents:
12018
diff
changeset
|
120 #endif |
27397
d47744b95b78
Give a CONFIG_ prefix to preprocessor directives that lacked one and
diego
parents:
27391
diff
changeset
|
121 #ifdef CONFIG_LIBSMBCLIENT |
15520 | 122 &stream_info_smb, |
123 #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
|
124 &stream_info_cue, |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27178
diff
changeset
|
125 #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
|
126 &stream_info_ifo, |
15518 | 127 &stream_info_dvd, |
17191
6ac0b5f0d1ed
fix compilation when dvdkit and dvdread are not available
nicodvb
parents:
17012
diff
changeset
|
128 #endif |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27178
diff
changeset
|
129 #ifdef CONFIG_DVDNAV |
18712
cb7da1894b00
restored support for dvdnav only in the stream layer; all other functionalities are disabled
nicodvb
parents:
18558
diff
changeset
|
130 &stream_info_dvdnav, |
15518 | 131 #endif |
29881
5797dc687a8e
Add preliminary support for streaming via FFmpeg's URProtocol functions.
reimar
parents:
29819
diff
changeset
|
132 #ifdef CONFIG_LIBAVFORMAT |
5797dc687a8e
Add preliminary support for streaming via FFmpeg's URProtocol functions.
reimar
parents:
29819
diff
changeset
|
133 &stream_info_ffmpeg, |
5797dc687a8e
Add preliminary support for streaming via FFmpeg's URProtocol functions.
reimar
parents:
29819
diff
changeset
|
134 #endif |
15518 | 135 |
9901
233802490b0e
Add a null streamv Currently used for tv and mf. Could be used to
albeu
parents:
9886
diff
changeset
|
136 &stream_info_null, |
19301 | 137 &stream_info_mf, |
9794 | 138 &stream_info_file, |
139 NULL | |
140 }; | |
141 | |
30697
9a49143918aa
Mark stream open filename parameter as const, the filename string is not
reimar
parents:
30626
diff
changeset
|
142 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
|
143 int mode, char** options, int* file_format, |
74a6c2a3dcce
stream: Mark functions not used outside of their files as static.
diego
parents:
30426
diff
changeset
|
144 int* ret, char** redirected_url) |
74a6c2a3dcce
stream: Mark functions not used outside of their files as static.
diego
parents:
30426
diff
changeset
|
145 { |
9794 | 146 void* arg = NULL; |
147 stream_t* s; | |
148 m_struct_t* desc = (m_struct_t*)sinfo->opts; | |
149 | |
150 // Parse options | |
151 if(desc) { | |
152 arg = m_struct_alloc(desc); | |
153 if(sinfo->opts_url) { | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
154 m_option_t url_opt = |
9794 | 155 { "stream url", arg , CONF_TYPE_CUSTOM_URL, 0, 0 ,0, sinfo->opts }; |
156 if(m_option_parse(&url_opt,"stream url",filename,arg,M_CONFIG_FILE) < 0) { | |
157 mp_msg(MSGT_OPEN,MSGL_ERR, "URL parsing failed on url %s\n",filename); | |
158 m_struct_free(desc,arg); | |
159 return NULL; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
160 } |
9794 | 161 } |
162 if(options) { | |
163 int i; | |
164 for(i = 0 ; options[i] != NULL ; i += 2) { | |
165 mp_msg(MSGT_OPEN,MSGL_DBG2, "Set stream arg %s=%s\n", | |
166 options[i],options[i+1]); | |
167 if(!m_struct_set(desc,arg,options[i],options[i+1])) | |
168 mp_msg(MSGT_OPEN,MSGL_WARN, "Failed to set stream option %s=%s\n", | |
169 options[i],options[i+1]); | |
170 } | |
171 } | |
172 } | |
173 s = new_stream(-2,-2); | |
174 s->url=strdup(filename); | |
175 s->flags |= mode; | |
176 *ret = sinfo->open(s,mode,arg,file_format); | |
177 if((*ret) != STREAM_OK) { | |
27397
d47744b95b78
Give a CONFIG_ prefix to preprocessor directives that lacked one and
diego
parents:
27391
diff
changeset
|
178 #ifdef CONFIG_NETWORK |
25135
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24963
diff
changeset
|
179 if (*ret == STREAM_REDIRECTED && redirected_url) { |
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24963
diff
changeset
|
180 if (s->streaming_ctrl && s->streaming_ctrl->url |
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24963
diff
changeset
|
181 && s->streaming_ctrl->url->url) |
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24963
diff
changeset
|
182 *redirected_url = strdup(s->streaming_ctrl->url->url); |
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24963
diff
changeset
|
183 else |
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24963
diff
changeset
|
184 *redirected_url = NULL; |
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24963
diff
changeset
|
185 } |
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24963
diff
changeset
|
186 streaming_ctrl_free(s->streaming_ctrl); |
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24963
diff
changeset
|
187 #endif |
9794 | 188 free(s->url); |
189 free(s); | |
190 return NULL; | |
191 } | |
192 if(s->type <= -2) | |
193 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
|
194 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
|
195 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
|
196 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
|
197 s->flags |= MP_STREAM_SEEK; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
198 |
21659 | 199 s->mode = mode; |
9794 | 200 |
201 mp_msg(MSGT_OPEN,MSGL_V, "STREAM: [%s] %s\n",sinfo->name,filename); | |
202 mp_msg(MSGT_OPEN,MSGL_V, "STREAM: Description: %s\n",sinfo->info); | |
203 mp_msg(MSGT_OPEN,MSGL_V, "STREAM: Author: %s\n", sinfo->author); | |
204 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
|
205 |
9794 | 206 return s; |
207 } | |
208 | |
209 | |
30697
9a49143918aa
Mark stream open filename parameter as const, the filename string is not
reimar
parents:
30626
diff
changeset
|
210 stream_t* open_stream_full(const char* filename,int mode, char** options, int* file_format) { |
9794 | 211 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
|
212 const stream_info_t* sinfo; |
9794 | 213 stream_t* s; |
25135
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24963
diff
changeset
|
214 char *redirected_url = NULL; |
9794 | 215 |
216 for(i = 0 ; auto_open_streams[i] ; i++) { | |
217 sinfo = auto_open_streams[i]; | |
218 if(!sinfo->protocols) { | |
10735
8a10d5d0ce86
serious bugs - 1l absinth (changed to absinth against cola inflation)
alex
parents:
10625
diff
changeset
|
219 mp_msg(MSGT_OPEN,MSGL_WARN, "Stream type %s has protocols == NULL, it's a bug\n", sinfo->name); |
9794 | 220 continue; |
221 } | |
222 for(j = 0 ; sinfo->protocols[j] ; j++) { | |
223 l = strlen(sinfo->protocols[j]); | |
224 // 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
|
225 if((l == 0 && !strstr(filename, "://")) || |
25429 | 226 ((strncasecmp(sinfo->protocols[j],filename,l) == 0) && |
9794 | 227 (strncmp("://",filename+l,3) == 0))) { |
228 *file_format = DEMUXER_TYPE_UNKNOWN; | |
25135
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24963
diff
changeset
|
229 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
|
230 &redirected_url); |
9794 | 231 if(s) return s; |
25135
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24963
diff
changeset
|
232 if(r == STREAM_REDIRECTED && redirected_url) { |
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24963
diff
changeset
|
233 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
|
234 sinfo->info, filename, redirected_url); |
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24963
diff
changeset
|
235 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
|
236 free(redirected_url); |
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24963
diff
changeset
|
237 return s; |
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24963
diff
changeset
|
238 } |
66f628d13442
Support stream redirection from http to mms, fix bug #927.
ulion
parents:
24963
diff
changeset
|
239 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
|
240 mp_msg(MSGT_OPEN,MSGL_ERR, MSGTR_FailedToOpen,filename); |
9794 | 241 return NULL; |
242 } | |
243 break; | |
244 } | |
245 } | |
246 } | |
247 | |
248 mp_msg(MSGT_OPEN,MSGL_ERR, "No stream found to handle url %s\n",filename); | |
249 return NULL; | |
250 } | |
251 | |
30697
9a49143918aa
Mark stream open filename parameter as const, the filename string is not
reimar
parents:
30626
diff
changeset
|
252 stream_t* open_output_stream(const char* filename, char** options) { |
21659 | 253 int file_format; //unused |
254 if(!filename) { | |
255 mp_msg(MSGT_OPEN,MSGL_ERR,"open_output_stream(), NULL filename, report this bug\n"); | |
256 return NULL; | |
257 } | |
258 | |
259 return open_stream_full(filename,STREAM_WRITE,options,&file_format); | |
260 } | |
261 | |
1 | 262 //=================== STREAMER ========================= |
263 | |
264 int stream_fill_buffer(stream_t *s){ | |
265 int len; | |
30626
27b133678bbd
Do not discard stream buffer on eof, instead reuse it to slightly improve
reimar
parents:
30557
diff
changeset
|
266 if (/*s->fd == NULL ||*/ s->eof) { return 0; } |
1 | 267 switch(s->type){ |
692 | 268 case STREAMTYPE_STREAM: |
27397
d47744b95b78
Give a CONFIG_ prefix to preprocessor directives that lacked one and
diego
parents:
27391
diff
changeset
|
269 #ifdef CONFIG_NETWORK |
24963
0a733c2c577e
Fix possible null-pointer-dereference in stream_fill_buffer().
cehoyos
parents:
24257
diff
changeset
|
270 if( s->streaming_ctrl!=NULL && s->streaming_ctrl->streaming_read ) { |
29818 | 271 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
|
272 } else |
2c2733d12823
The code for the non-networking case is the same whether networking
reimar
parents:
29818
diff
changeset
|
273 #endif |
29883
306e614b92cb
Use fill_buffer if available also for STREAMTYPE_STREAM
reimar
parents:
29881
diff
changeset
|
274 if (s->fill_buffer) |
306e614b92cb
Use fill_buffer if available also for STREAMTYPE_STREAM
reimar
parents:
29881
diff
changeset
|
275 len = s->fill_buffer(s, s->buffer, STREAM_BUFFER_SIZE); |
306e614b92cb
Use fill_buffer if available also for STREAMTYPE_STREAM
reimar
parents:
29881
diff
changeset
|
276 else |
29818 | 277 len=read(s->fd,s->buffer,STREAM_BUFFER_SIZE); |
278 break; | |
5133
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
4893
diff
changeset
|
279 case STREAMTYPE_DS: |
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
4893
diff
changeset
|
280 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
|
281 break; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
282 |
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
283 |
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
284 default: |
9794 | 285 len= s->fill_buffer ? s->fill_buffer(s,s->buffer,STREAM_BUFFER_SIZE) : 0; |
1 | 286 } |
30626
27b133678bbd
Do not discard stream buffer on eof, instead reuse it to slightly improve
reimar
parents:
30557
diff
changeset
|
287 if(len<=0){ s->eof=1; return 0; } |
1 | 288 s->buf_pos=0; |
289 s->buf_len=len; | |
290 s->pos+=len; | |
291 // printf("[%d]",len);fflush(stdout); | |
292 return len; | |
293 } | |
294 | |
21659 | 295 int stream_write_buffer(stream_t *s, unsigned char *buf, int len) { |
296 int rd; | |
297 if(!s->write_buffer) | |
298 return -1; | |
299 rd = s->write_buffer(s, buf, len); | |
300 if(rd < 0) | |
301 return -1; | |
302 s->pos += rd; | |
303 return rd; | |
304 } | |
305 | |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1177
diff
changeset
|
306 int stream_seek_long(stream_t *s,off_t pos){ |
6814 | 307 off_t newpos=0; |
1 | 308 |
17932 | 309 // if( mp_msg_test(MSGT_STREAM,MSGL_DBG3) ) printf("seek_long to 0x%X\n",(unsigned int)pos); |
1 | 310 |
311 s->buf_pos=s->buf_len=0; | |
312 | |
21659 | 313 if(s->mode == STREAM_WRITE) { |
314 if(!s->seek || !s->seek(s,pos)) | |
315 return 0; | |
316 return 1; | |
317 } | |
318 | |
22362
e244d570ba44
cleaned stream_seek() : simplified the alignment to STREAM_BUFFER_SIZE or s->sector_size
nicodvb
parents:
21659
diff
changeset
|
319 if(s->sector_size) |
e244d570ba44
cleaned stream_seek() : simplified the alignment to STREAM_BUFFER_SIZE or s->sector_size
nicodvb
parents:
21659
diff
changeset
|
320 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
|
321 else |
e244d570ba44
cleaned stream_seek() : simplified the alignment to STREAM_BUFFER_SIZE or s->sector_size
nicodvb
parents:
21659
diff
changeset
|
322 newpos = pos&(~((off_t)STREAM_BUFFER_SIZE-1)); |
1 | 323 |
17932 | 324 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
|
325 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
|
326 (int64_t)s->pos,(int64_t)newpos,(int64_t)pos,s->buf_len); |
2050 | 327 } |
1 | 328 pos-=newpos; |
329 | |
330 if(newpos==0 || newpos!=s->pos){ | |
331 switch(s->type){ | |
692 | 332 case STREAMTYPE_STREAM: |
333 //s->pos=newpos; // real seek | |
3044
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
334 // 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
|
335 // 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
|
336 // doesn't support seeking. |
27397
d47744b95b78
Give a CONFIG_ prefix to preprocessor directives that lacked one and
diego
parents:
27391
diff
changeset
|
337 #ifdef CONFIG_NETWORK |
11965 | 338 if(s->seek) { // new stream seek is much cleaner than streaming_ctrl one |
339 if(!s->seek(s,newpos)) { | |
340 mp_msg(MSGT_STREAM,MSGL_ERR, "Seek failed\n"); | |
12018 | 341 return 0; |
11965 | 342 } |
343 break; | |
344 } | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
345 |
8929
c5ca1ae42555
check if seeking supported, otherwise fallback to null reading
arpi
parents:
8812
diff
changeset
|
346 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
|
347 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
|
348 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
|
349 return 1; |
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
350 } |
29884
9112683a9a02
Enable the read-based forward seek fallback also when CONFIG_NETWORK is
reimar
parents:
29883
diff
changeset
|
351 break; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
352 } |
29884
9112683a9a02
Enable the read-based forward seek fallback also when CONFIG_NETWORK is
reimar
parents:
29883
diff
changeset
|
353 #endif |
692 | 354 if(newpos<s->pos){ |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1642
diff
changeset
|
355 mp_msg(MSGT_STREAM,MSGL_INFO,"Cannot seek backward in linear streams!\n"); |
692 | 356 return 1; |
357 } | |
358 while(s->pos<newpos){ | |
359 if(stream_fill_buffer(s)<=0) break; // EOF | |
360 } | |
361 break; | |
7408 | 362 default: |
9794 | 363 // This should at the beginning as soon as all streams are converted |
364 if(!s->seek) | |
365 return 0; | |
366 // Now seek | |
367 if(!s->seek(s,newpos)) { | |
368 mp_msg(MSGT_STREAM,MSGL_ERR, "Seek failed\n"); | |
369 return 0; | |
370 } | |
1 | 371 } |
372 // putchar('.');fflush(stdout); | |
373 //} else { | |
374 // putchar('%');fflush(stdout); | |
375 } | |
376 | |
17878
ab0a3e3d32ed
Fix a potential seek failure, fill_buffer doesn't have to
albeu
parents:
17712
diff
changeset
|
377 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
|
378 if(pos<=s->buf_len){ |
1 | 379 s->buf_pos=pos; // byte position in sector |
380 return 1; | |
381 } | |
17878
ab0a3e3d32ed
Fix a potential seek failure, fill_buffer doesn't have to
albeu
parents:
17712
diff
changeset
|
382 pos -= s->buf_len; |
ab0a3e3d32ed
Fix a potential seek failure, fill_buffer doesn't have to
albeu
parents:
17712
diff
changeset
|
383 } |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
384 |
1999 | 385 // 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
|
386 |
16750
0a31740dd5e6
Use PRI?64 defines as format strings for 64 bit variables.
reimar
parents:
16572
diff
changeset
|
387 mp_msg(MSGT_STREAM,MSGL_V,"stream_seek: WARNING! Can't seek to 0x%"PRIX64" !\n",(int64_t)(pos+newpos)); |
1 | 388 return 0; |
389 } | |
390 | |
391 | |
392 void stream_reset(stream_t *s){ | |
393 if(s->eof){ | |
30626
27b133678bbd
Do not discard stream buffer on eof, instead reuse it to slightly improve
reimar
parents:
30557
diff
changeset
|
394 s->pos=0; |
27b133678bbd
Do not discard stream buffer on eof, instead reuse it to slightly improve
reimar
parents:
30557
diff
changeset
|
395 s->buf_pos=s->buf_len=0; |
1 | 396 s->eof=0; |
397 } | |
9853 | 398 if(s->control) s->control(s,STREAM_CTRL_RESET,NULL); |
1 | 399 //stream_seek(s,0); |
400 } | |
401 | |
17712 | 402 int stream_control(stream_t *s, int cmd, void *arg){ |
24257 | 403 if(!s->control) return STREAM_UNSUPPORTED; |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27178
diff
changeset
|
404 #ifdef CONFIG_STREAM_CACHE |
26833
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
405 if (s->cache_pid) |
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
406 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
|
407 #endif |
17696
66d7afee9a46
added new stream_control() and new command: STREAM_CTRL_GET_TIME_LENGTH
nicodvb
parents:
17191
diff
changeset
|
408 return s->control(s, cmd, arg); |
66d7afee9a46
added new stream_control() and new command: STREAM_CTRL_GET_TIME_LENGTH
nicodvb
parents:
17191
diff
changeset
|
409 } |
66d7afee9a46
added new stream_control() and new command: STREAM_CTRL_GET_TIME_LENGTH
nicodvb
parents:
17191
diff
changeset
|
410 |
2144 | 411 stream_t* new_memory_stream(unsigned char* data,int len){ |
18558
4928dd61f136
Fix potential integer overflows in memory allocation.
rtogni
parents:
18176
diff
changeset
|
412 stream_t *s; |
4928dd61f136
Fix potential integer overflows in memory allocation.
rtogni
parents:
18176
diff
changeset
|
413 |
4928dd61f136
Fix potential integer overflows in memory allocation.
rtogni
parents:
18176
diff
changeset
|
414 if(len < 0) |
4928dd61f136
Fix potential integer overflows in memory allocation.
rtogni
parents:
18176
diff
changeset
|
415 return NULL; |
29887 | 416 s=calloc(1, sizeof(stream_t)+len); |
2144 | 417 s->fd=-1; |
418 s->type=STREAMTYPE_MEMORY; | |
419 s->buf_pos=0; s->buf_len=len; | |
420 s->start_pos=0; s->end_pos=len; | |
421 stream_reset(s); | |
422 s->pos=len; | |
423 memcpy(s->buffer,data,len); | |
424 return s; | |
425 } | |
426 | |
1 | 427 stream_t* new_stream(int fd,int type){ |
29887 | 428 stream_t *s=calloc(1, sizeof(stream_t)); |
3291 | 429 if(s==NULL) return NULL; |
10281 | 430 |
28402 | 431 #if HAVE_WINSOCK2_H |
10281 | 432 { |
433 WSADATA wsdata; | |
434 int temp = WSAStartup(0x0202, &wsdata); // there might be a better place for this (-> later) | |
435 mp_msg(MSGT_STREAM,MSGL_V,"WINSOCK2 init: %i\n", temp); | |
436 } | |
437 #endif | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28402
diff
changeset
|
438 |
1 | 439 s->fd=fd; |
440 s->type=type; | |
180 | 441 s->buf_pos=s->buf_len=0; |
598 | 442 s->start_pos=s->end_pos=0; |
1642 | 443 s->priv=NULL; |
7407 | 444 s->url=NULL; |
2322 | 445 s->cache_pid=0; |
1 | 446 stream_reset(s); |
447 return s; | |
448 } | |
449 | |
450 void free_stream(stream_t *s){ | |
6138
523014df7d32
big cosmetics patch, cleanup of messages printed by mplayer and libs.
arpi
parents:
5982
diff
changeset
|
451 // printf("\n*** free_stream() called ***\n"); |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27178
diff
changeset
|
452 #ifdef CONFIG_STREAM_CACHE |
9915 | 453 cache_uninit(s); |
9798 | 454 #endif |
15520 | 455 if(s->close) s->close(s); |
15421
ae5e1b9e3c92
fix segfaults caused by socket and file descriptor mismatches on windows
faust3
parents:
14836
diff
changeset
|
456 if(s->fd>0){ |
ae5e1b9e3c92
fix segfaults caused by socket and file descriptor mismatches on windows
faust3
parents:
14836
diff
changeset
|
457 /* on unix we define closesocket to close |
ae5e1b9e3c92
fix segfaults caused by socket and file descriptor mismatches on windows
faust3
parents:
14836
diff
changeset
|
458 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
|
459 network socket and file */ |
ae5e1b9e3c92
fix segfaults caused by socket and file descriptor mismatches on windows
faust3
parents:
14836
diff
changeset
|
460 if(s->url && strstr(s->url,"://")) |
ae5e1b9e3c92
fix segfaults caused by socket and file descriptor mismatches on windows
faust3
parents:
14836
diff
changeset
|
461 closesocket(s->fd); |
ae5e1b9e3c92
fix segfaults caused by socket and file descriptor mismatches on windows
faust3
parents:
14836
diff
changeset
|
462 else close(s->fd); |
ae5e1b9e3c92
fix segfaults caused by socket and file descriptor mismatches on windows
faust3
parents:
14836
diff
changeset
|
463 } |
28402 | 464 #if HAVE_WINSOCK2_H |
10281 | 465 mp_msg(MSGT_STREAM,MSGL_V,"WINSOCK2 uninit\n"); |
466 WSACleanup(); // there might be a better place for this (-> later) | |
467 #endif | |
9794 | 468 // Disabled atm, i don't like that. s->priv can be anything after all |
469 // streams should destroy their priv on close | |
470 //if(s->priv) free(s->priv); | |
471 if(s->url) free(s->url); | |
1 | 472 free(s); |
473 } | |
474 | |
5133
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
4893
diff
changeset
|
475 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
|
476 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
|
477 s->priv = ds; |
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
4893
diff
changeset
|
478 return s; |
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
4893
diff
changeset
|
479 } |
26326
5bfc1d8bece9
Remove the need for code using stream to export an mp_input_check_interrupt()
albeu
parents:
26007
diff
changeset
|
480 |
5bfc1d8bece9
Remove the need for code using stream to export an mp_input_check_interrupt()
albeu
parents:
26007
diff
changeset
|
481 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
|
482 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
|
483 } |
5bfc1d8bece9
Remove the need for code using stream to export an mp_input_check_interrupt()
albeu
parents:
26007
diff
changeset
|
484 |
5bfc1d8bece9
Remove the need for code using stream to export an mp_input_check_interrupt()
albeu
parents:
26007
diff
changeset
|
485 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
|
486 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
|
487 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
|
488 } |
30754
dff9ee89b7c1
Move stream_read_line implementation from stream.h to stream.c,
reimar
parents:
30697
diff
changeset
|
489 |
30757
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
490 /** |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
491 * 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
|
492 */ |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
493 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
|
494 { |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
495 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
|
496 *buf += 2; |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
497 return v; |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
498 } |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
499 |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
500 /** |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
501 * 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
|
502 */ |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
503 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
|
504 { |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
505 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
|
506 *buf += 2; |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
507 return v; |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
508 } |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
509 |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
510 /** |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
511 * 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
|
512 * \param buf buffer to search |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
513 * \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
|
514 * \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
|
515 * 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
|
516 */ |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
517 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
|
518 { |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
519 uint32_t c; |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
520 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
|
521 switch (utf16) { |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
522 case 0: |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
523 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
|
524 case 1: |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
525 while (buf < end - 1) { |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
526 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
|
527 if (buf <= end && c == '\n') |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
528 return buf - 1; |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
529 } |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
530 break; |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
531 case 2: |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
532 while (buf < end - 1) { |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
533 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
|
534 if (buf <= end && c == '\n') |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
535 return buf - 1; |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
536 } |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
537 break; |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
538 } |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
539 return NULL; |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
540 } |
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 /** |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
543 * 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
|
544 * \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
|
545 * \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
|
546 * \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
|
547 * \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
|
548 * \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
|
549 * 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
|
550 */ |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
551 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
|
552 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
|
553 { |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
554 uint32_t c; |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
555 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
|
556 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
|
557 switch (utf16) { |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
558 case 0: |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
559 if (*len > dstsize) |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
560 *len = dstsize; |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
561 memcpy(dst, src, *len); |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
562 return *len; |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
563 case 1: |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
564 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
|
565 uint8_t tmp; |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
566 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
|
567 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
|
568 } |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
569 *len -= end - src; |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
570 return dstsize - (dst_end - dst); |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
571 case 2: |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
572 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
|
573 uint8_t tmp; |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
574 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
|
575 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
|
576 } |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
577 *len -= end - src; |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
578 return dstsize - (dst_end - dst); |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
579 } |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
580 return 0; |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
581 } |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
582 |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
583 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
|
584 int len; |
30757
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
585 const unsigned char *end; |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
586 unsigned char *ptr = mem; |
30754
dff9ee89b7c1
Move stream_read_line implementation from stream.h to stream.c,
reimar
parents:
30697
diff
changeset
|
587 if (max < 1) return NULL; |
dff9ee89b7c1
Move stream_read_line implementation from stream.h to stream.c,
reimar
parents:
30697
diff
changeset
|
588 max--; // reserve one for 0-termination |
dff9ee89b7c1
Move stream_read_line implementation from stream.h to stream.c,
reimar
parents:
30697
diff
changeset
|
589 do { |
dff9ee89b7c1
Move stream_read_line implementation from stream.h to stream.c,
reimar
parents:
30697
diff
changeset
|
590 len = s->buf_len-s->buf_pos; |
dff9ee89b7c1
Move stream_read_line implementation from stream.h to stream.c,
reimar
parents:
30697
diff
changeset
|
591 // try to fill the buffer |
dff9ee89b7c1
Move stream_read_line implementation from stream.h to stream.c,
reimar
parents:
30697
diff
changeset
|
592 if(len <= 0 && |
dff9ee89b7c1
Move stream_read_line implementation from stream.h to stream.c,
reimar
parents:
30697
diff
changeset
|
593 (!cache_stream_fill_buffer(s) || |
dff9ee89b7c1
Move stream_read_line implementation from stream.h to stream.c,
reimar
parents:
30697
diff
changeset
|
594 (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
|
595 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
|
596 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
|
597 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
|
598 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
|
599 max -= l; |
dff9ee89b7c1
Move stream_read_line implementation from stream.h to stream.c,
reimar
parents:
30697
diff
changeset
|
600 ptr += l; |
30757
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
601 if (!len) |
6a5957bf5b70
Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents:
30754
diff
changeset
|
602 break; |
30754
dff9ee89b7c1
Move stream_read_line implementation from stream.h to stream.c,
reimar
parents:
30697
diff
changeset
|
603 } |
dff9ee89b7c1
Move stream_read_line implementation from stream.h to stream.c,
reimar
parents:
30697
diff
changeset
|
604 s->buf_pos += len; |
dff9ee89b7c1
Move stream_read_line implementation from stream.h to stream.c,
reimar
parents:
30697
diff
changeset
|
605 } while(!end); |
dff9ee89b7c1
Move stream_read_line implementation from stream.h to stream.c,
reimar
parents:
30697
diff
changeset
|
606 if(s->eof && ptr == mem) return NULL; |
dff9ee89b7c1
Move stream_read_line implementation from stream.h to stream.c,
reimar
parents:
30697
diff
changeset
|
607 ptr[0] = 0; |
dff9ee89b7c1
Move stream_read_line implementation from stream.h to stream.c,
reimar
parents:
30697
diff
changeset
|
608 return mem; |
dff9ee89b7c1
Move stream_read_line implementation from stream.h to stream.c,
reimar
parents:
30697
diff
changeset
|
609 } |