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