annotate stream/stream.c @ 36144:43bff9dd44be

Disable dangerous feature in ASX playlist parser.
author reimar
date Sun, 05 May 2013 17:02:30 +0000
parents a5fd69f820f3
children b50212f27ffa
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
36080
a5fd69f820f3 Make -chapter always available, even when compiled without DVD support.
reimar
parents: 35885
diff changeset
19 #include <ctype.h>
1430
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1428
diff changeset
20 #include <stdio.h>
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1428
diff changeset
21 #include <stdlib.h>
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1428
diff changeset
22 #include <unistd.h>
1428
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1177
diff changeset
23
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1177
diff changeset
24 #include <sys/types.h>
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1177
diff changeset
25 #include <sys/stat.h>
9798
02449faf87dd MINGW32 port
faust3
parents: 9794
diff changeset
26 #ifndef __MINGW32__
1428
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1177
diff changeset
27 #include <sys/ioctl.h>
6814
6863033786d1 warning fixes
atmos4
parents: 6810
diff changeset
28 #include <sys/wait.h>
9798
02449faf87dd MINGW32 port
faust3
parents: 9794
diff changeset
29 #endif
1428
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1177
diff changeset
30 #include <fcntl.h>
9794
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
31 #include <strings.h>
32794
77d81e27a176 Fix stream_write_buffer to make sure all requested bytes are written
ranma
parents: 32511
diff changeset
32 #include <assert.h>
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents: 537
diff changeset
33
1430
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1428
diff changeset
34 #include "config.h"
27472
c0b233cd30ca Revert moving closesocket definition and network headers to network.h.
diego
parents: 27464
diff changeset
35
28402
c884d17bd005 Convert HAVE_WINSOCK2_H into a 0/1 definition.
diego
parents: 27473
diff changeset
36 #if HAVE_WINSOCK2_H
27472
c0b233cd30ca Revert moving closesocket definition and network headers to network.h.
diego
parents: 27464
diff changeset
37 #include <winsock2.h>
c0b233cd30ca Revert moving closesocket definition and network headers to network.h.
diego
parents: 27464
diff changeset
38 #endif
c0b233cd30ca Revert moving closesocket definition and network headers to network.h.
diego
parents: 27464
diff changeset
39
1973
5216f108cb4f all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents: 1642
diff changeset
40 #include "mp_msg.h"
5216f108cb4f all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents: 1642
diff changeset
41 #include "help_mp.h"
17012
6ff3379a0862 Unify include path handling, -I.. is in CFLAGS.
diego
parents: 16793
diff changeset
42 #include "osdep/shmem.h"
31496
4c959d99d30a Add missing include for usec_sleep.
reimar
parents: 31194
diff changeset
43 #include "osdep/timer.h"
27473
ae5da477539e Move '#define closesocket close' preprocessor directive to a common place
diego
parents: 27472
diff changeset
44 #include "network.h"
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents: 537
diff changeset
45 #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
46 #include "libmpdemux/demuxer.h"
31592
a4ceb52caa30 Fix compilation broken due to GET_UTF8 being undefined.
reimar
parents: 31565
diff changeset
47 #include "libavutil/common.h"
30757
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
48 #include "libavutil/intreadwrite.h"
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents: 537
diff changeset
49
17012
6ff3379a0862 Unify include path handling, -I.. is in CFLAGS.
diego
parents: 16793
diff changeset
50 #include "m_option.h"
6ff3379a0862 Unify include path handling, -I.. is in CFLAGS.
diego
parents: 16793
diff changeset
51 #include "m_struct.h"
9794
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
52
19808
5385740067a1 * remove extern definitions of functions in .c files
attila
parents: 19568
diff changeset
53 #include "cache2.h"
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
54
26326
5bfc1d8bece9 Remove the need for code using stream to export an mp_input_check_interrupt()
albeu
parents: 26007
diff changeset
55 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
56
31836
dcd515ac5f6c Add support for bd:// streams as a test for a part of the AACS algorithm.
reimar
parents: 31683
diff changeset
57 extern const stream_info_t stream_info_bd;
25211
c1d17bd6683c Mark all stream_info_t as const
reimar
parents: 25210
diff changeset
58 extern const stream_info_t stream_info_vcd;
c1d17bd6683c Mark all stream_info_t as const
reimar
parents: 25210
diff changeset
59 extern const stream_info_t stream_info_cdda;
c1d17bd6683c Mark all stream_info_t as const
reimar
parents: 25210
diff changeset
60 extern const stream_info_t stream_info_netstream;
c1d17bd6683c Mark all stream_info_t as const
reimar
parents: 25210
diff changeset
61 extern const stream_info_t stream_info_pnm;
c1d17bd6683c Mark all stream_info_t as const
reimar
parents: 25210
diff changeset
62 extern const stream_info_t stream_info_asf;
c1d17bd6683c Mark all stream_info_t as const
reimar
parents: 25210
diff changeset
63 extern const stream_info_t stream_info_rtsp;
c1d17bd6683c Mark all stream_info_t as const
reimar
parents: 25210
diff changeset
64 extern const stream_info_t stream_info_rtp;
c1d17bd6683c Mark all stream_info_t as const
reimar
parents: 25210
diff changeset
65 extern const stream_info_t stream_info_udp;
c1d17bd6683c Mark all stream_info_t as const
reimar
parents: 25210
diff changeset
66 extern const stream_info_t stream_info_http1;
c1d17bd6683c Mark all stream_info_t as const
reimar
parents: 25210
diff changeset
67 extern const stream_info_t stream_info_http2;
c1d17bd6683c Mark all stream_info_t as const
reimar
parents: 25210
diff changeset
68 extern const stream_info_t stream_info_dvb;
c1d17bd6683c Mark all stream_info_t as const
reimar
parents: 25210
diff changeset
69 extern const stream_info_t stream_info_tv;
c1d17bd6683c Mark all stream_info_t as const
reimar
parents: 25210
diff changeset
70 extern const stream_info_t stream_info_radio;
c1d17bd6683c Mark all stream_info_t as const
reimar
parents: 25210
diff changeset
71 extern const stream_info_t stream_info_pvr;
c1d17bd6683c Mark all stream_info_t as const
reimar
parents: 25210
diff changeset
72 extern const stream_info_t stream_info_ftp;
c1d17bd6683c Mark all stream_info_t as const
reimar
parents: 25210
diff changeset
73 extern const stream_info_t stream_info_vstream;
c1d17bd6683c Mark all stream_info_t as const
reimar
parents: 25210
diff changeset
74 extern const stream_info_t stream_info_dvdnav;
c1d17bd6683c Mark all stream_info_t as const
reimar
parents: 25210
diff changeset
75 extern const stream_info_t stream_info_smb;
c1d17bd6683c Mark all stream_info_t as const
reimar
parents: 25210
diff changeset
76 extern const stream_info_t stream_info_sdp;
c1d17bd6683c Mark all stream_info_t as const
reimar
parents: 25210
diff changeset
77 extern const stream_info_t stream_info_rtsp_sip;
10560
11826d9f90c7 this patch fixes
arpi
parents: 10281
diff changeset
78
25211
c1d17bd6683c Mark all stream_info_t as const
reimar
parents: 25210
diff changeset
79 extern const stream_info_t stream_info_cue;
c1d17bd6683c Mark all stream_info_t as const
reimar
parents: 25210
diff changeset
80 extern const stream_info_t stream_info_null;
c1d17bd6683c Mark all stream_info_t as const
reimar
parents: 25210
diff changeset
81 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
82 extern const stream_info_t stream_info_ffmpeg;
25211
c1d17bd6683c Mark all stream_info_t as const
reimar
parents: 25210
diff changeset
83 extern const stream_info_t stream_info_file;
c1d17bd6683c Mark all stream_info_t as const
reimar
parents: 25210
diff changeset
84 extern const stream_info_t stream_info_ifo;
c1d17bd6683c Mark all stream_info_t as const
reimar
parents: 25210
diff changeset
85 extern const stream_info_t stream_info_dvd;
31565
9a590e7aac57 Support for unencrypted Blu-ray playback through libbluray.
ben
parents: 31496
diff changeset
86 extern const stream_info_t stream_info_bluray;
9794
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
87
25209
7d2a9ae30c67 Make auto_open_streams array itself const
reimar
parents: 25207
diff changeset
88 static const stream_info_t* const auto_open_streams[] = {
31836
dcd515ac5f6c Add support for bd:// streams as a test for a part of the AACS algorithm.
reimar
parents: 31683
diff changeset
89 &stream_info_bd,
27370
14c5017f40d2 Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents: 27341
diff changeset
90 #ifdef CONFIG_VCD
9886
e578e4375434 Port vcd to the new API
albeu
parents: 9874
diff changeset
91 &stream_info_vcd,
e578e4375434 Port vcd to the new API
albeu
parents: 9874
diff changeset
92 #endif
27391
1d2faa1020fb Rename a bunch of miscellaneous preprocessor directives.
diego
parents: 27370
diff changeset
93 #ifdef CONFIG_CDDA
9801
2f02809d32a8 URL is cdda://tracks[:speed][/device]
albeu
parents: 9798
diff changeset
94 &stream_info_cdda,
9810
pontscho
parents: 9801
diff changeset
95 #endif
31683
db0b49579eeb Rename network build system variable and command line option to networking.
diego
parents: 31592
diff changeset
96 #ifdef CONFIG_NETWORKING
9853
765cca786fec Add netstream
albeu
parents: 9826
diff changeset
97 &stream_info_netstream,
15585
281d155fb37f ported all network streams to the new API
nicodvb
parents: 15520
diff changeset
98 &stream_info_http1,
281d155fb37f ported all network streams to the new API
nicodvb
parents: 15520
diff changeset
99 &stream_info_asf,
281d155fb37f ported all network streams to the new API
nicodvb
parents: 15520
diff changeset
100 &stream_info_pnm,
281d155fb37f ported all network streams to the new API
nicodvb
parents: 15520
diff changeset
101 &stream_info_rtsp,
27397
d47744b95b78 Give a CONFIG_ prefix to preprocessor directives that lacked one and
diego
parents: 27391
diff changeset
102 #ifdef CONFIG_LIVE555
15585
281d155fb37f ported all network streams to the new API
nicodvb
parents: 15520
diff changeset
103 &stream_info_sdp,
281d155fb37f ported all network streams to the new API
nicodvb
parents: 15520
diff changeset
104 &stream_info_rtsp_sip,
281d155fb37f ported all network streams to the new API
nicodvb
parents: 15520
diff changeset
105 #endif
19313
0792ad01e9bf split rtp stack, udp input layer and rtp input layer from rtp.c
ben
parents: 19312
diff changeset
106 &stream_info_rtp,
0792ad01e9bf split rtp stack, udp input layer and rtp input layer from rtp.c
ben
parents: 19312
diff changeset
107 &stream_info_udp,
15585
281d155fb37f ported all network streams to the new API
nicodvb
parents: 15520
diff changeset
108 &stream_info_http2,
9853
765cca786fec Add netstream
albeu
parents: 9826
diff changeset
109 #endif
27370
14c5017f40d2 Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents: 27341
diff changeset
110 #ifdef CONFIG_DVBIN
10560
11826d9f90c7 this patch fixes
arpi
parents: 10281
diff changeset
111 &stream_info_dvb,
11826d9f90c7 this patch fixes
arpi
parents: 10281
diff changeset
112 #endif
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27178
diff changeset
113 #ifdef CONFIG_TV
19273
11ec1cb3a7ea add an explicit tv stream input instead of the previous hack in stream_null
ben
parents: 19271
diff changeset
114 &stream_info_tv,
11ec1cb3a7ea add an explicit tv stream input instead of the previous hack in stream_null
ben
parents: 19271
diff changeset
115 #endif
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27178
diff changeset
116 #ifdef CONFIG_RADIO
19568
bd821fd3e244 Radio support, patch by Vladimir Voroshilov (voroshil gmail com)
reimar
parents: 19313
diff changeset
117 &stream_info_radio,
bd821fd3e244 Radio support, patch by Vladimir Voroshilov (voroshil gmail com)
reimar
parents: 19313
diff changeset
118 #endif
27370
14c5017f40d2 Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents: 27341
diff changeset
119 #ifdef CONFIG_PVR
18997
73b8f5ff772d added new pvr:// input for ivtv based cards
ben
parents: 18712
diff changeset
120 &stream_info_pvr,
73b8f5ff772d added new pvr:// input for ivtv based cards
ben
parents: 18712
diff changeset
121 #endif
27391
1d2faa1020fb Rename a bunch of miscellaneous preprocessor directives.
diego
parents: 27370
diff changeset
122 #ifdef CONFIG_FTP
10625
620cc649f519 ftp support. The change on connect2Server is needed bcs we need 2
albeu
parents: 10560
diff changeset
123 &stream_info_ftp,
620cc649f519 ftp support. The change on connect2Server is needed bcs we need 2
albeu
parents: 10560
diff changeset
124 #endif
27391
1d2faa1020fb Rename a bunch of miscellaneous preprocessor directives.
diego
parents: 27370
diff changeset
125 #ifdef CONFIG_VSTREAM
14836
8b9738526dd7 added a stream module for the vstream client library
joey
parents: 12018
diff changeset
126 &stream_info_vstream,
8b9738526dd7 added a stream module for the vstream client library
joey
parents: 12018
diff changeset
127 #endif
27397
d47744b95b78 Give a CONFIG_ prefix to preprocessor directives that lacked one and
diego
parents: 27391
diff changeset
128 #ifdef CONFIG_LIBSMBCLIENT
15520
2c5186ed83b9 ported smb:// to the new stream api
nicodvb
parents: 15518
diff changeset
129 &stream_info_smb,
2c5186ed83b9 ported smb:// to the new stream api
nicodvb
parents: 15518
diff changeset
130 #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
131 &stream_info_cue,
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27178
diff changeset
132 #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
133 &stream_info_ifo,
15518
9391bf60ccdf ported dvd:// to the new stream api
nicodvb
parents: 15476
diff changeset
134 &stream_info_dvd,
17191
6ac0b5f0d1ed fix compilation when dvdkit and dvdread are not available
nicodvb
parents: 17012
diff changeset
135 #endif
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27178
diff changeset
136 #ifdef CONFIG_DVDNAV
18712
cb7da1894b00 restored support for dvdnav only in the stream layer; all other functionalities are disabled
nicodvb
parents: 18558
diff changeset
137 &stream_info_dvdnav,
15518
9391bf60ccdf ported dvd:// to the new stream api
nicodvb
parents: 15476
diff changeset
138 #endif
31565
9a590e7aac57 Support for unencrypted Blu-ray playback through libbluray.
ben
parents: 31496
diff changeset
139 #ifdef CONFIG_LIBBLURAY
9a590e7aac57 Support for unencrypted Blu-ray playback through libbluray.
ben
parents: 31496
diff changeset
140 &stream_info_bluray,
9a590e7aac57 Support for unencrypted Blu-ray playback through libbluray.
ben
parents: 31496
diff changeset
141 #endif
32142
4614728cab25 build system: Merge all FFmpeg library checks into a single FFmpeg check.
diego
parents: 31918
diff changeset
142 #ifdef CONFIG_FFMPEG
29881
5797dc687a8e Add preliminary support for streaming via FFmpeg's URProtocol functions.
reimar
parents: 29819
diff changeset
143 &stream_info_ffmpeg,
5797dc687a8e Add preliminary support for streaming via FFmpeg's URProtocol functions.
reimar
parents: 29819
diff changeset
144 #endif
15518
9391bf60ccdf ported dvd:// to the new stream api
nicodvb
parents: 15476
diff changeset
145
9901
233802490b0e Add a null streamv Currently used for tv and mf. Could be used to
albeu
parents: 9886
diff changeset
146 &stream_info_null,
19301
097e5bc71210 added dedicated file for mf:// input
ben
parents: 19273
diff changeset
147 &stream_info_mf,
9794
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
148 &stream_info_file,
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
149 NULL
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
150 };
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
151
30697
9a49143918aa Mark stream open filename parameter as const, the filename string is not
reimar
parents: 30626
diff changeset
152 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
153 int mode, char** options, int* file_format,
74a6c2a3dcce stream: Mark functions not used outside of their files as static.
diego
parents: 30426
diff changeset
154 int* ret, char** redirected_url)
74a6c2a3dcce stream: Mark functions not used outside of their files as static.
diego
parents: 30426
diff changeset
155 {
9794
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
156 void* arg = NULL;
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
157 stream_t* s;
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
158 m_struct_t* desc = (m_struct_t*)sinfo->opts;
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
159
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
160 // Parse options
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
161 if(desc) {
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
162 arg = m_struct_alloc(desc);
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
163 if(sinfo->opts_url) {
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28402
diff changeset
164 m_option_t url_opt =
9794
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
165 { "stream url", arg , CONF_TYPE_CUSTOM_URL, 0, 0 ,0, sinfo->opts };
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
166 if(m_option_parse(&url_opt,"stream url",filename,arg,M_CONFIG_FILE) < 0) {
33367
f7eda488c07a Make stream messages translatable.
ib
parents: 33035
diff changeset
167 mp_msg(MSGT_OPEN,MSGL_ERR, MSGTR_URLParsingFailed,filename);
9794
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
168 m_struct_free(desc,arg);
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
169 return NULL;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28402
diff changeset
170 }
9794
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
171 }
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
172 if(options) {
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
173 int i;
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
174 for(i = 0 ; options[i] != NULL ; i += 2) {
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
175 mp_msg(MSGT_OPEN,MSGL_DBG2, "Set stream arg %s=%s\n",
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
176 options[i],options[i+1]);
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
177 if(!m_struct_set(desc,arg,options[i],options[i+1]))
33367
f7eda488c07a Make stream messages translatable.
ib
parents: 33035
diff changeset
178 mp_msg(MSGT_OPEN,MSGL_WARN, MSGTR_FailedSetStreamOption,
9794
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
179 options[i],options[i+1]);
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
180 }
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
181 }
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
182 }
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
183 s = new_stream(-2,-2);
32438
faefba58f413 Implement a basic capture feature, available through -capture.
diego
parents: 32142
diff changeset
184 s->capture_file = NULL;
9794
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
185 s->url=strdup(filename);
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
186 s->flags |= mode;
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
187 *ret = sinfo->open(s,mode,arg,file_format);
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
188 if((*ret) != STREAM_OK) {
31683
db0b49579eeb Rename network build system variable and command line option to networking.
diego
parents: 31592
diff changeset
189 #ifdef CONFIG_NETWORKING
25135
66f628d13442 Support stream redirection from http to mms, fix bug #927.
ulion
parents: 24963
diff changeset
190 if (*ret == STREAM_REDIRECTED && redirected_url) {
66f628d13442 Support stream redirection from http to mms, fix bug #927.
ulion
parents: 24963
diff changeset
191 if (s->streaming_ctrl && s->streaming_ctrl->url
66f628d13442 Support stream redirection from http to mms, fix bug #927.
ulion
parents: 24963
diff changeset
192 && s->streaming_ctrl->url->url)
66f628d13442 Support stream redirection from http to mms, fix bug #927.
ulion
parents: 24963
diff changeset
193 *redirected_url = strdup(s->streaming_ctrl->url->url);
66f628d13442 Support stream redirection from http to mms, fix bug #927.
ulion
parents: 24963
diff changeset
194 else
66f628d13442 Support stream redirection from http to mms, fix bug #927.
ulion
parents: 24963
diff changeset
195 *redirected_url = NULL;
66f628d13442 Support stream redirection from http to mms, fix bug #927.
ulion
parents: 24963
diff changeset
196 }
66f628d13442 Support stream redirection from http to mms, fix bug #927.
ulion
parents: 24963
diff changeset
197 streaming_ctrl_free(s->streaming_ctrl);
66f628d13442 Support stream redirection from http to mms, fix bug #927.
ulion
parents: 24963
diff changeset
198 #endif
9794
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
199 free(s->url);
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
200 free(s);
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
201 return NULL;
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
202 }
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
203 if(s->type <= -2)
33367
f7eda488c07a Make stream messages translatable.
ib
parents: 33035
diff changeset
204 mp_msg(MSGT_OPEN,MSGL_WARN, MSGTR_StreamNeedType);
29920
4f740437ed2b Finally rename the STREAM_SEEK define to MP_STREAM_SEEK, there are just too many
reimar
parents: 29887
diff changeset
205 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
206 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
207 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
208 s->flags |= MP_STREAM_SEEK;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28402
diff changeset
209
21659
da09e69a0f01 support functions for writing to streams
nicodvb
parents: 21493
diff changeset
210 s->mode = mode;
9794
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
211
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
212 mp_msg(MSGT_OPEN,MSGL_V, "STREAM: [%s] %s\n",sinfo->name,filename);
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
213 mp_msg(MSGT_OPEN,MSGL_V, "STREAM: Description: %s\n",sinfo->info);
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
214 mp_msg(MSGT_OPEN,MSGL_V, "STREAM: Author: %s\n", sinfo->author);
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
215 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
216
9794
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
217 return s;
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
218 }
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
219
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
220
30697
9a49143918aa Mark stream open filename parameter as const, the filename string is not
reimar
parents: 30626
diff changeset
221 stream_t* open_stream_full(const char* filename,int mode, char** options, int* file_format) {
9794
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
222 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
223 const stream_info_t* sinfo;
9794
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
224 stream_t* s;
25135
66f628d13442 Support stream redirection from http to mms, fix bug #927.
ulion
parents: 24963
diff changeset
225 char *redirected_url = NULL;
9794
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
226
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
227 for(i = 0 ; auto_open_streams[i] ; i++) {
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
228 sinfo = auto_open_streams[i];
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
229 if(!sinfo->protocols) {
33367
f7eda488c07a Make stream messages translatable.
ib
parents: 33035
diff changeset
230 mp_msg(MSGT_OPEN,MSGL_WARN, MSGTR_StreamProtocolNULL, sinfo->name);
9794
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
231 continue;
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
232 }
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
233 for(j = 0 ; sinfo->protocols[j] ; j++) {
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
234 l = strlen(sinfo->protocols[j]);
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
235 // 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
236 if((l == 0 && !strstr(filename, "://")) ||
25429
76941781b521 Protocol name should be case insensitive.
ulion
parents: 25211
diff changeset
237 ((strncasecmp(sinfo->protocols[j],filename,l) == 0) &&
9794
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
238 (strncmp("://",filename+l,3) == 0))) {
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
239 *file_format = DEMUXER_TYPE_UNKNOWN;
25135
66f628d13442 Support stream redirection from http to mms, fix bug #927.
ulion
parents: 24963
diff changeset
240 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
241 &redirected_url);
9794
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
242 if(s) return s;
25135
66f628d13442 Support stream redirection from http to mms, fix bug #927.
ulion
parents: 24963
diff changeset
243 if(r == STREAM_REDIRECTED && redirected_url) {
66f628d13442 Support stream redirection from http to mms, fix bug #927.
ulion
parents: 24963
diff changeset
244 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
245 sinfo->info, filename, redirected_url);
66f628d13442 Support stream redirection from http to mms, fix bug #927.
ulion
parents: 24963
diff changeset
246 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
247 free(redirected_url);
66f628d13442 Support stream redirection from http to mms, fix bug #927.
ulion
parents: 24963
diff changeset
248 return s;
66f628d13442 Support stream redirection from http to mms, fix bug #927.
ulion
parents: 24963
diff changeset
249 }
66f628d13442 Support stream redirection from http to mms, fix bug #927.
ulion
parents: 24963
diff changeset
250 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
251 mp_msg(MSGT_OPEN,MSGL_ERR, MSGTR_FailedToOpen,filename);
9794
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
252 return NULL;
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
253 }
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
254 break;
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
255 }
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
256 }
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
257 }
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
258
33367
f7eda488c07a Make stream messages translatable.
ib
parents: 33035
diff changeset
259 mp_msg(MSGT_OPEN,MSGL_ERR, MSGTR_StreamCantHandleURL,filename);
9794
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
260 return NULL;
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
261 }
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
262
30697
9a49143918aa Mark stream open filename parameter as const, the filename string is not
reimar
parents: 30626
diff changeset
263 stream_t* open_output_stream(const char* filename, char** options) {
21659
da09e69a0f01 support functions for writing to streams
nicodvb
parents: 21493
diff changeset
264 int file_format; //unused
da09e69a0f01 support functions for writing to streams
nicodvb
parents: 21493
diff changeset
265 if(!filename) {
33367
f7eda488c07a Make stream messages translatable.
ib
parents: 33035
diff changeset
266 mp_msg(MSGT_OPEN,MSGL_ERR,MSGTR_StreamNULLFilename);
21659
da09e69a0f01 support functions for writing to streams
nicodvb
parents: 21493
diff changeset
267 return NULL;
da09e69a0f01 support functions for writing to streams
nicodvb
parents: 21493
diff changeset
268 }
da09e69a0f01 support functions for writing to streams
nicodvb
parents: 21493
diff changeset
269
da09e69a0f01 support functions for writing to streams
nicodvb
parents: 21493
diff changeset
270 return open_stream_full(filename,STREAM_WRITE,options,&file_format);
da09e69a0f01 support functions for writing to streams
nicodvb
parents: 21493
diff changeset
271 }
da09e69a0f01 support functions for writing to streams
nicodvb
parents: 21493
diff changeset
272
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
273 //=================== STREAMER =========================
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
274
32438
faefba58f413 Implement a basic capture feature, available through -capture.
diego
parents: 32142
diff changeset
275 void stream_capture_do(stream_t *s)
faefba58f413 Implement a basic capture feature, available through -capture.
diego
parents: 32142
diff changeset
276 {
faefba58f413 Implement a basic capture feature, available through -capture.
diego
parents: 32142
diff changeset
277 if (fwrite(s->buffer, s->buf_len, 1, s->capture_file) < 1) {
33367
f7eda488c07a Make stream messages translatable.
ib
parents: 33035
diff changeset
278 mp_msg(MSGT_GLOBAL, MSGL_ERR, MSGTR_StreamErrorWritingCapture,
32438
faefba58f413 Implement a basic capture feature, available through -capture.
diego
parents: 32142
diff changeset
279 strerror(errno));
faefba58f413 Implement a basic capture feature, available through -capture.
diego
parents: 32142
diff changeset
280 fclose(s->capture_file);
faefba58f413 Implement a basic capture feature, available through -capture.
diego
parents: 32142
diff changeset
281 s->capture_file = NULL;
faefba58f413 Implement a basic capture feature, available through -capture.
diego
parents: 32142
diff changeset
282 }
faefba58f413 Implement a basic capture feature, available through -capture.
diego
parents: 32142
diff changeset
283 }
faefba58f413 Implement a basic capture feature, available through -capture.
diego
parents: 32142
diff changeset
284
34783
1d4795fbdb67 Retry reconnecting several times.
reimar
parents: 33906
diff changeset
285 static int stream_reconnect(stream_t *s)
1d4795fbdb67 Retry reconnecting several times.
reimar
parents: 33906
diff changeset
286 {
1d4795fbdb67 Retry reconnecting several times.
reimar
parents: 33906
diff changeset
287 #define MAX_RECONNECT_RETRIES 5
1d4795fbdb67 Retry reconnecting several times.
reimar
parents: 33906
diff changeset
288 #define RECONNECT_SLEEP_MS 1000
1d4795fbdb67 Retry reconnecting several times.
reimar
parents: 33906
diff changeset
289 int retry = 0;
35885
3389262720da Fix previous commit, off_t must be replaced by int64_t
reimar
parents: 35881
diff changeset
290 int64_t pos = s->pos;
34783
1d4795fbdb67 Retry reconnecting several times.
reimar
parents: 33906
diff changeset
291 // Seeking is used as a hack to make network streams
1d4795fbdb67 Retry reconnecting several times.
reimar
parents: 33906
diff changeset
292 // reopen the connection, ideally they would implement
1d4795fbdb67 Retry reconnecting several times.
reimar
parents: 33906
diff changeset
293 // e.g. a STREAM_CTRL_RECONNECT to do this
1d4795fbdb67 Retry reconnecting several times.
reimar
parents: 33906
diff changeset
294 do {
1d4795fbdb67 Retry reconnecting several times.
reimar
parents: 33906
diff changeset
295 if (retry >= MAX_RECONNECT_RETRIES)
1d4795fbdb67 Retry reconnecting several times.
reimar
parents: 33906
diff changeset
296 return 0;
1d4795fbdb67 Retry reconnecting several times.
reimar
parents: 33906
diff changeset
297 if (retry) usec_sleep(RECONNECT_SLEEP_MS * 1000);
1d4795fbdb67 Retry reconnecting several times.
reimar
parents: 33906
diff changeset
298 retry++;
1d4795fbdb67 Retry reconnecting several times.
reimar
parents: 33906
diff changeset
299 s->eof=1;
1d4795fbdb67 Retry reconnecting several times.
reimar
parents: 33906
diff changeset
300 stream_reset(s);
1d4795fbdb67 Retry reconnecting several times.
reimar
parents: 33906
diff changeset
301 } while (stream_seek_internal(s, pos) >= 0 || s->pos != pos); // seek failed
1d4795fbdb67 Retry reconnecting several times.
reimar
parents: 33906
diff changeset
302 return 1;
1d4795fbdb67 Retry reconnecting several times.
reimar
parents: 33906
diff changeset
303 }
1d4795fbdb67 Retry reconnecting several times.
reimar
parents: 33906
diff changeset
304
32472
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
305 int stream_read_internal(stream_t *s, void *buf, int len)
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
306 {
32870
5321ce2ca6d9 100l, fix incorrect len when retrying read.
reimar
parents: 32867
diff changeset
307 int orig_len = len;
31169
ac84149bbdaf Retry reading even if we hit eof before.
reimar
parents: 30950
diff changeset
308 // we will retry even if we already reached EOF previously.
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
309 switch(s->type){
692
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
310 case STREAMTYPE_STREAM:
31683
db0b49579eeb Rename network build system variable and command line option to networking.
diego
parents: 31592
diff changeset
311 #ifdef CONFIG_NETWORKING
24963
0a733c2c577e Fix possible null-pointer-dereference in stream_fill_buffer().
cehoyos
parents: 24257
diff changeset
312 if( s->streaming_ctrl!=NULL && s->streaming_ctrl->streaming_read ) {
32472
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
313 len=s->streaming_ctrl->streaming_read(s->fd, buf, len, s->streaming_ctrl);
34785
b89534df8e1e Detect prematurely closed connection.
reimar
parents: 34783
diff changeset
314 if (s->streaming_ctrl->status == streaming_stopped_e &&
b89534df8e1e Detect prematurely closed connection.
reimar
parents: 34783
diff changeset
315 (!s->end_pos || s->pos == s->end_pos))
33720
0cb1d3b6539d Pass streaming_ctrl eof on.
reimar
parents: 33367
diff changeset
316 s->eof = 1;
29819
2c2733d12823 The code for the non-networking case is the same whether networking
reimar
parents: 29818
diff changeset
317 } else
2c2733d12823 The code for the non-networking case is the same whether networking
reimar
parents: 29818
diff changeset
318 #endif
29883
306e614b92cb Use fill_buffer if available also for STREAMTYPE_STREAM
reimar
parents: 29881
diff changeset
319 if (s->fill_buffer)
32472
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
320 len = s->fill_buffer(s, buf, len);
29883
306e614b92cb Use fill_buffer if available also for STREAMTYPE_STREAM
reimar
parents: 29881
diff changeset
321 else
32472
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
322 len = read(s->fd, buf, len);
29818
d133a1a83c17 Factor out triplicated break statement.
reimar
parents: 29263
diff changeset
323 break;
5133
9841a86d66f9 Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents: 4893
diff changeset
324 case STREAMTYPE_DS:
32472
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
325 len = demux_read_data((demux_stream_t*)s->priv, buf, len);
5133
9841a86d66f9 Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents: 4893
diff changeset
326 break;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28402
diff changeset
327
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28402
diff changeset
328
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28402
diff changeset
329 default:
32472
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
330 len= s->fill_buffer ? s->fill_buffer(s, buf, len) : 0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
331 }
32867
454f6decbd93 When reading from a stream fails, try one more time after a reset.
reimar
parents: 32794
diff changeset
332 if(len<=0){
33721
1bb847d89fd5 Improve checks for when to try reconnecting to be more thorough and readable.
reimar
parents: 33720
diff changeset
333 // do not retry if this looks like proper eof
34783
1d4795fbdb67 Retry reconnecting several times.
reimar
parents: 33906
diff changeset
334 if (s->eof || (s->end_pos && s->pos == s->end_pos))
33721
1bb847d89fd5 Improve checks for when to try reconnecting to be more thorough and readable.
reimar
parents: 33720
diff changeset
335 goto eof_out;
33035
f5dc85f6f84b Add ugly hack to compensate DVDNAV's ugly hacks and fix seeking.
reimar
parents: 32890
diff changeset
336 // dvdnav has some horrible hacks to "suspend" reads,
f5dc85f6f84b Add ugly hack to compensate DVDNAV's ugly hacks and fix seeking.
reimar
parents: 32890
diff changeset
337 // we need to skip this code or seeks will hang.
33721
1bb847d89fd5 Improve checks for when to try reconnecting to be more thorough and readable.
reimar
parents: 33720
diff changeset
338 if (s->type == STREAMTYPE_DVDNAV)
1bb847d89fd5 Improve checks for when to try reconnecting to be more thorough and readable.
reimar
parents: 33720
diff changeset
339 goto eof_out;
33722
5e80ff193bc2 Reindent, add empty lines.
reimar
parents: 33721
diff changeset
340
5e80ff193bc2 Reindent, add empty lines.
reimar
parents: 33721
diff changeset
341 // just in case this is an error e.g. due to network
5e80ff193bc2 Reindent, add empty lines.
reimar
parents: 33721
diff changeset
342 // timeout reset and retry
34783
1d4795fbdb67 Retry reconnecting several times.
reimar
parents: 33906
diff changeset
343 if (!stream_reconnect(s))
33721
1bb847d89fd5 Improve checks for when to try reconnecting to be more thorough and readable.
reimar
parents: 33720
diff changeset
344 goto eof_out;
33722
5e80ff193bc2 Reindent, add empty lines.
reimar
parents: 33721
diff changeset
345 // make sure EOF is set to ensure no endless loops
5e80ff193bc2 Reindent, add empty lines.
reimar
parents: 33721
diff changeset
346 s->eof=1;
5e80ff193bc2 Reindent, add empty lines.
reimar
parents: 33721
diff changeset
347 return stream_read_internal(s, buf, orig_len);
5e80ff193bc2 Reindent, add empty lines.
reimar
parents: 33721
diff changeset
348
33721
1bb847d89fd5 Improve checks for when to try reconnecting to be more thorough and readable.
reimar
parents: 33720
diff changeset
349 eof_out:
32867
454f6decbd93 When reading from a stream fails, try one more time after a reset.
reimar
parents: 32794
diff changeset
350 s->eof=1;
454f6decbd93 When reading from a stream fails, try one more time after a reset.
reimar
parents: 32794
diff changeset
351 return 0;
454f6decbd93 When reading from a stream fails, try one more time after a reset.
reimar
parents: 32794
diff changeset
352 }
31169
ac84149bbdaf Retry reading even if we hit eof before.
reimar
parents: 30950
diff changeset
353 // When reading succeeded we are obviously not at eof.
ac84149bbdaf Retry reading even if we hit eof before.
reimar
parents: 30950
diff changeset
354 // This e.g. avoids issues with eof getting stuck when lavf seeks in MPEG-TS
ac84149bbdaf Retry reading even if we hit eof before.
reimar
parents: 30950
diff changeset
355 s->eof=0;
32472
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
356 s->pos+=len;
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
357 return len;
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
358 }
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
359
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
360 int stream_fill_buffer(stream_t *s){
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
361 int len = stream_read_internal(s, s->buffer, STREAM_BUFFER_SIZE);
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
362 if (len <= 0)
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
363 return 0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
364 s->buf_pos=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
365 s->buf_len=len;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
366 // printf("[%d]",len);fflush(stdout);
32438
faefba58f413 Implement a basic capture feature, available through -capture.
diego
parents: 32142
diff changeset
367 if (s->capture_file)
faefba58f413 Implement a basic capture feature, available through -capture.
diego
parents: 32142
diff changeset
368 stream_capture_do(s);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
369 return len;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
370 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
371
21659
da09e69a0f01 support functions for writing to streams
nicodvb
parents: 21493
diff changeset
372 int stream_write_buffer(stream_t *s, unsigned char *buf, int len) {
da09e69a0f01 support functions for writing to streams
nicodvb
parents: 21493
diff changeset
373 int rd;
da09e69a0f01 support functions for writing to streams
nicodvb
parents: 21493
diff changeset
374 if(!s->write_buffer)
da09e69a0f01 support functions for writing to streams
nicodvb
parents: 21493
diff changeset
375 return -1;
da09e69a0f01 support functions for writing to streams
nicodvb
parents: 21493
diff changeset
376 rd = s->write_buffer(s, buf, len);
da09e69a0f01 support functions for writing to streams
nicodvb
parents: 21493
diff changeset
377 if(rd < 0)
da09e69a0f01 support functions for writing to streams
nicodvb
parents: 21493
diff changeset
378 return -1;
da09e69a0f01 support functions for writing to streams
nicodvb
parents: 21493
diff changeset
379 s->pos += rd;
32794
77d81e27a176 Fix stream_write_buffer to make sure all requested bytes are written
ranma
parents: 32511
diff changeset
380 assert(rd == len && "stream_write_buffer(): unexpected short write");
21659
da09e69a0f01 support functions for writing to streams
nicodvb
parents: 21493
diff changeset
381 return rd;
da09e69a0f01 support functions for writing to streams
nicodvb
parents: 21493
diff changeset
382 }
da09e69a0f01 support functions for writing to streams
nicodvb
parents: 21493
diff changeset
383
35885
3389262720da Fix previous commit, off_t must be replaced by int64_t
reimar
parents: 35881
diff changeset
384 int stream_seek_internal(stream_t *s, int64_t newpos)
32472
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
385 {
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
386 if(newpos==0 || newpos!=s->pos){
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
387 switch(s->type){
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
388 case STREAMTYPE_STREAM:
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
389 //s->pos=newpos; // real seek
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
390 // Some streaming protocol allow to seek backward and forward
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
391 // A function call that return -1 can tell that the protocol
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
392 // doesn't support seeking.
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
393 #ifdef CONFIG_NETWORKING
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
394 if(s->seek) { // new stream seek is much cleaner than streaming_ctrl one
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
395 if(!s->seek(s,newpos)) {
33367
f7eda488c07a Make stream messages translatable.
ib
parents: 33035
diff changeset
396 mp_msg(MSGT_STREAM,MSGL_ERR, MSGTR_StreamSeekFailed);
32472
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
397 return 0;
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
398 }
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
399 break;
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
400 }
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
401
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
402 if( s->streaming_ctrl!=NULL && s->streaming_ctrl->streaming_seek ) {
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
403 if( s->streaming_ctrl->streaming_seek( s->fd, newpos, s->streaming_ctrl )<0 ) {
33367
f7eda488c07a Make stream messages translatable.
ib
parents: 33035
diff changeset
404 mp_msg(MSGT_STREAM,MSGL_INFO,MSGTR_StreamNotSeekable);
32472
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
405 return 1;
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
406 }
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
407 break;
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
408 }
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
409 #endif
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
410 if(newpos<s->pos){
33367
f7eda488c07a Make stream messages translatable.
ib
parents: 33035
diff changeset
411 mp_msg(MSGT_STREAM,MSGL_INFO,MSGTR_StreamCannotSeekBackward);
32472
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
412 return 1;
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
413 }
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
414 break;
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
415 default:
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
416 // This should at the beginning as soon as all streams are converted
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
417 if(!s->seek)
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
418 return 0;
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
419 // Now seek
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
420 if(!s->seek(s,newpos)) {
33367
f7eda488c07a Make stream messages translatable.
ib
parents: 33035
diff changeset
421 mp_msg(MSGT_STREAM,MSGL_ERR, MSGTR_StreamSeekFailed);
32472
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
422 return 0;
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
423 }
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
424 }
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
425 // putchar('.');fflush(stdout);
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
426 //} else {
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
427 // putchar('%');fflush(stdout);
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
428 }
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
429 return -1;
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
430 }
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
431
35885
3389262720da Fix previous commit, off_t must be replaced by int64_t
reimar
parents: 35881
diff changeset
432 int stream_seek_long(stream_t *s, int64_t pos){
32472
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
433 int res;
35885
3389262720da Fix previous commit, off_t must be replaced by int64_t
reimar
parents: 35881
diff changeset
434 int64_t newpos=0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
435
17932
3fe3b2b3a6ce Convert all if(verbose>X) to mp_msg_test calls.
diego
parents: 17878
diff changeset
436 // if( mp_msg_test(MSGT_STREAM,MSGL_DBG3) ) printf("seek_long to 0x%X\n",(unsigned int)pos);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
437
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
438 s->buf_pos=s->buf_len=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
439
21659
da09e69a0f01 support functions for writing to streams
nicodvb
parents: 21493
diff changeset
440 if(s->mode == STREAM_WRITE) {
da09e69a0f01 support functions for writing to streams
nicodvb
parents: 21493
diff changeset
441 if(!s->seek || !s->seek(s,pos))
da09e69a0f01 support functions for writing to streams
nicodvb
parents: 21493
diff changeset
442 return 0;
da09e69a0f01 support functions for writing to streams
nicodvb
parents: 21493
diff changeset
443 return 1;
da09e69a0f01 support functions for writing to streams
nicodvb
parents: 21493
diff changeset
444 }
da09e69a0f01 support functions for writing to streams
nicodvb
parents: 21493
diff changeset
445
22362
e244d570ba44 cleaned stream_seek() : simplified the alignment to STREAM_BUFFER_SIZE or s->sector_size
nicodvb
parents: 21659
diff changeset
446 if(s->sector_size)
e244d570ba44 cleaned stream_seek() : simplified the alignment to STREAM_BUFFER_SIZE or s->sector_size
nicodvb
parents: 21659
diff changeset
447 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
448 else
35885
3389262720da Fix previous commit, off_t must be replaced by int64_t
reimar
parents: 35881
diff changeset
449 newpos = pos&(~((int64_t)STREAM_BUFFER_SIZE-1));
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
450
17932
3fe3b2b3a6ce Convert all if(verbose>X) to mp_msg_test calls.
diego
parents: 17878
diff changeset
451 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
452 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
453 (int64_t)s->pos,(int64_t)newpos,(int64_t)pos,s->buf_len);
2050
18f4dd5d568f -Wall warnings fixed
arpi
parents: 1999
diff changeset
454 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
455 pos-=newpos;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
456
32472
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
457 res = stream_seek_internal(s, newpos);
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
458 if (res >= 0)
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
459 return res;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28402
diff changeset
460
32472
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
461 while(s->pos<newpos){
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32438
diff changeset
462 if(stream_fill_buffer(s)<=0) break; // EOF
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
463 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
464
17878
ab0a3e3d32ed Fix a potential seek failure, fill_buffer doesn't have to
albeu
parents: 17712
diff changeset
465 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
466 if(pos<=s->buf_len){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
467 s->buf_pos=pos; // byte position in sector
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
468 return 1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
469 }
17878
ab0a3e3d32ed Fix a potential seek failure, fill_buffer doesn't have to
albeu
parents: 17712
diff changeset
470 pos -= s->buf_len;
ab0a3e3d32ed Fix a potential seek failure, fill_buffer doesn't have to
albeu
parents: 17712
diff changeset
471 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28402
diff changeset
472
1999
0c45328c9f8b fixed seek to EOF pos
arpi
parents: 1973
diff changeset
473 // 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
474
16750
0a31740dd5e6 Use PRI?64 defines as format strings for 64 bit variables.
reimar
parents: 16572
diff changeset
475 mp_msg(MSGT_STREAM,MSGL_V,"stream_seek: WARNING! Can't seek to 0x%"PRIX64" !\n",(int64_t)(pos+newpos));
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
476 return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
477 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
478
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
479
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
480 void stream_reset(stream_t *s){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
481 if(s->eof){
30626
27b133678bbd Do not discard stream buffer on eof, instead reuse it to slightly improve
reimar
parents: 30557
diff changeset
482 s->pos=0;
27b133678bbd Do not discard stream buffer on eof, instead reuse it to slightly improve
reimar
parents: 30557
diff changeset
483 s->buf_pos=s->buf_len=0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
484 s->eof=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
485 }
9853
765cca786fec Add netstream
albeu
parents: 9826
diff changeset
486 if(s->control) s->control(s,STREAM_CTRL_RESET,NULL);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
487 //stream_seek(s,0);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
488 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
489
17712
a320248c2450 stream_control() returns int, not void
nicodvb
parents: 17696
diff changeset
490 int stream_control(stream_t *s, int cmd, void *arg){
24257
d261f5109660 cosmetics: typo fix UNSUPORTED --> UNSUPPORTED
diego
parents: 22362
diff changeset
491 if(!s->control) return STREAM_UNSUPPORTED;
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27178
diff changeset
492 #ifdef CONFIG_STREAM_CACHE
26833
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
493 if (s->cache_pid)
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
494 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
495 #endif
17696
66d7afee9a46 added new stream_control() and new command: STREAM_CTRL_GET_TIME_LENGTH
nicodvb
parents: 17191
diff changeset
496 return s->control(s, cmd, arg);
66d7afee9a46 added new stream_control() and new command: STREAM_CTRL_GET_TIME_LENGTH
nicodvb
parents: 17191
diff changeset
497 }
66d7afee9a46 added new stream_control() and new command: STREAM_CTRL_GET_TIME_LENGTH
nicodvb
parents: 17191
diff changeset
498
2144
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
499 stream_t* new_memory_stream(unsigned char* data,int len){
18558
4928dd61f136 Fix potential integer overflows in memory allocation.
rtogni
parents: 18176
diff changeset
500 stream_t *s;
4928dd61f136 Fix potential integer overflows in memory allocation.
rtogni
parents: 18176
diff changeset
501
4928dd61f136 Fix potential integer overflows in memory allocation.
rtogni
parents: 18176
diff changeset
502 if(len < 0)
4928dd61f136 Fix potential integer overflows in memory allocation.
rtogni
parents: 18176
diff changeset
503 return NULL;
29887
195deae202cb Merge malloc+memset -> calloc
reimar
parents: 29884
diff changeset
504 s=calloc(1, sizeof(stream_t)+len);
2144
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
505 s->fd=-1;
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
506 s->type=STREAMTYPE_MEMORY;
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
507 s->buf_pos=0; s->buf_len=len;
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
508 s->start_pos=0; s->end_pos=len;
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
509 stream_reset(s);
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
510 s->pos=len;
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
511 memcpy(s->buffer,data,len);
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
512 return s;
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
513 }
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
514
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
515 stream_t* new_stream(int fd,int type){
29887
195deae202cb Merge malloc+memset -> calloc
reimar
parents: 29884
diff changeset
516 stream_t *s=calloc(1, sizeof(stream_t));
3291
2122a13b5a29 fixed startup crash
iive
parents: 3261
diff changeset
517 if(s==NULL) return NULL;
10281
54bcbf28698a Networking support under MinGW.
diego
parents: 10242
diff changeset
518
28402
c884d17bd005 Convert HAVE_WINSOCK2_H into a 0/1 definition.
diego
parents: 27473
diff changeset
519 #if HAVE_WINSOCK2_H
10281
54bcbf28698a Networking support under MinGW.
diego
parents: 10242
diff changeset
520 {
54bcbf28698a Networking support under MinGW.
diego
parents: 10242
diff changeset
521 WSADATA wsdata;
54bcbf28698a Networking support under MinGW.
diego
parents: 10242
diff changeset
522 int temp = WSAStartup(0x0202, &wsdata); // there might be a better place for this (-> later)
54bcbf28698a Networking support under MinGW.
diego
parents: 10242
diff changeset
523 mp_msg(MSGT_STREAM,MSGL_V,"WINSOCK2 init: %i\n", temp);
54bcbf28698a Networking support under MinGW.
diego
parents: 10242
diff changeset
524 }
54bcbf28698a Networking support under MinGW.
diego
parents: 10242
diff changeset
525 #endif
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28402
diff changeset
526
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
527 s->fd=fd;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
528 s->type=type;
180
afa2c05cfe43 terrible fatal bug fixed
arpi_esp
parents: 1
diff changeset
529 s->buf_pos=s->buf_len=0;
598
c7117e17e20b OSD seekbar fixed for mpeg/VCD
arpi_esp
parents: 578
diff changeset
530 s->start_pos=s->end_pos=0;
1642
78fa0713b823 free'ing priv struct
arpi
parents: 1595
diff changeset
531 s->priv=NULL;
7407
8780415baa87 stream layer cleanup - part 1
arpi
parents: 7406
diff changeset
532 s->url=NULL;
2322
e22ec6fce385 cache2 support
arpi
parents: 2310
diff changeset
533 s->cache_pid=0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
534 stream_reset(s);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
535 return s;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
536 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
537
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
538 void free_stream(stream_t *s){
6138
523014df7d32 big cosmetics patch, cleanup of messages printed by mplayer and libs.
arpi
parents: 5982
diff changeset
539 // printf("\n*** free_stream() called ***\n");
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27178
diff changeset
540 #ifdef CONFIG_STREAM_CACHE
9915
eabe876ab5e2 Fix cache uninit
albeu
parents: 9901
diff changeset
541 cache_uninit(s);
9798
02449faf87dd MINGW32 port
faust3
parents: 9794
diff changeset
542 #endif
32438
faefba58f413 Implement a basic capture feature, available through -capture.
diego
parents: 32142
diff changeset
543 if (s->capture_file) {
faefba58f413 Implement a basic capture feature, available through -capture.
diego
parents: 32142
diff changeset
544 fclose(s->capture_file);
faefba58f413 Implement a basic capture feature, available through -capture.
diego
parents: 32142
diff changeset
545 s->capture_file = NULL;
faefba58f413 Implement a basic capture feature, available through -capture.
diego
parents: 32142
diff changeset
546 }
faefba58f413 Implement a basic capture feature, available through -capture.
diego
parents: 32142
diff changeset
547
15520
2c5186ed83b9 ported smb:// to the new stream api
nicodvb
parents: 15518
diff changeset
548 if(s->close) s->close(s);
15421
ae5e1b9e3c92 fix segfaults caused by socket and file descriptor mismatches on windows
faust3
parents: 14836
diff changeset
549 if(s->fd>0){
ae5e1b9e3c92 fix segfaults caused by socket and file descriptor mismatches on windows
faust3
parents: 14836
diff changeset
550 /* on unix we define closesocket to close
ae5e1b9e3c92 fix segfaults caused by socket and file descriptor mismatches on windows
faust3
parents: 14836
diff changeset
551 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
552 network socket and file */
ae5e1b9e3c92 fix segfaults caused by socket and file descriptor mismatches on windows
faust3
parents: 14836
diff changeset
553 if(s->url && strstr(s->url,"://"))
ae5e1b9e3c92 fix segfaults caused by socket and file descriptor mismatches on windows
faust3
parents: 14836
diff changeset
554 closesocket(s->fd);
ae5e1b9e3c92 fix segfaults caused by socket and file descriptor mismatches on windows
faust3
parents: 14836
diff changeset
555 else close(s->fd);
ae5e1b9e3c92 fix segfaults caused by socket and file descriptor mismatches on windows
faust3
parents: 14836
diff changeset
556 }
28402
c884d17bd005 Convert HAVE_WINSOCK2_H into a 0/1 definition.
diego
parents: 27473
diff changeset
557 #if HAVE_WINSOCK2_H
10281
54bcbf28698a Networking support under MinGW.
diego
parents: 10242
diff changeset
558 mp_msg(MSGT_STREAM,MSGL_V,"WINSOCK2 uninit\n");
54bcbf28698a Networking support under MinGW.
diego
parents: 10242
diff changeset
559 WSACleanup(); // there might be a better place for this (-> later)
54bcbf28698a Networking support under MinGW.
diego
parents: 10242
diff changeset
560 #endif
9794
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
561 // Disabled atm, i don't like that. s->priv can be anything after all
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
562 // streams should destroy their priv on close
32511
b39155e98ac3 Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents: 32472
diff changeset
563 //free(s->priv);
b39155e98ac3 Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents: 32472
diff changeset
564 free(s->url);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
565 free(s);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
566 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
567
5133
9841a86d66f9 Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents: 4893
diff changeset
568 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
569 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
570 s->priv = ds;
9841a86d66f9 Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents: 4893
diff changeset
571 return s;
9841a86d66f9 Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents: 4893
diff changeset
572 }
26326
5bfc1d8bece9 Remove the need for code using stream to export an mp_input_check_interrupt()
albeu
parents: 26007
diff changeset
573
5bfc1d8bece9 Remove the need for code using stream to export an mp_input_check_interrupt()
albeu
parents: 26007
diff changeset
574 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
575 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
576 }
5bfc1d8bece9 Remove the need for code using stream to export an mp_input_check_interrupt()
albeu
parents: 26007
diff changeset
577
5bfc1d8bece9 Remove the need for code using stream to export an mp_input_check_interrupt()
albeu
parents: 26007
diff changeset
578 int stream_check_interrupt(int time) {
31194
b2bb87b92146 stream_check_interrupt should sleep even if no callback is set.
reimar
parents: 31169
diff changeset
579 if(!stream_check_interrupt_cb) {
b2bb87b92146 stream_check_interrupt should sleep even if no callback is set.
reimar
parents: 31169
diff changeset
580 usec_sleep(time * 1000);
b2bb87b92146 stream_check_interrupt should sleep even if no callback is set.
reimar
parents: 31169
diff changeset
581 return 0;
b2bb87b92146 stream_check_interrupt should sleep even if no callback is set.
reimar
parents: 31169
diff changeset
582 }
26326
5bfc1d8bece9 Remove the need for code using stream to export an mp_input_check_interrupt()
albeu
parents: 26007
diff changeset
583 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
584 }
30754
dff9ee89b7c1 Move stream_read_line implementation from stream.h to stream.c,
reimar
parents: 30697
diff changeset
585
30757
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
586 /**
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
587 * 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
588 */
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
589 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
590 {
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
591 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
592 *buf += 2;
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
593 return v;
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
594 }
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
595
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
596 /**
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
597 * 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
598 */
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
599 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
600 {
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
601 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
602 *buf += 2;
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
603 return v;
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
604 }
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
605
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
606 /**
33906
3c172a874b4b Convert stream_read_line function into more generic stream_read_until function.
reimar
parents: 33722
diff changeset
607 * Find a termination character in buffer
30757
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
608 * \param buf buffer to search
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
609 * \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
610 * \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
611 * 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
612 */
33906
3c172a874b4b Convert stream_read_line function into more generic stream_read_until function.
reimar
parents: 33722
diff changeset
613 static const uint8_t *find_term_char(const uint8_t *buf, int len, uint8_t term, int utf16)
30757
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
614 {
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
615 uint32_t c;
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
616 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
617 switch (utf16) {
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
618 case 0:
33906
3c172a874b4b Convert stream_read_line function into more generic stream_read_until function.
reimar
parents: 33722
diff changeset
619 return (uint8_t *)memchr(buf, term, len);
30757
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
620 case 1:
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
621 while (buf < end - 1) {
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
622 GET_UTF16(c, buf < end - 1 ? get_le16_inc(&buf) : 0, return NULL;)
33906
3c172a874b4b Convert stream_read_line function into more generic stream_read_until function.
reimar
parents: 33722
diff changeset
623 if (buf <= end && c == term)
30757
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
624 return buf - 1;
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
625 }
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
626 break;
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
627 case 2:
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
628 while (buf < end - 1) {
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
629 GET_UTF16(c, buf < end - 1 ? get_be16_inc(&buf) : 0, return NULL;)
33906
3c172a874b4b Convert stream_read_line function into more generic stream_read_until function.
reimar
parents: 33722
diff changeset
630 if (buf <= end && c == term)
30757
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
631 return buf - 1;
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
632 }
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
633 break;
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
634 }
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
635 return NULL;
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
636 }
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
637
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
638 /**
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
639 * 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
640 * \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
641 * \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
642 * \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
643 * \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
644 * \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
645 * 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
646 */
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
647 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
648 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
649 {
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
650 uint32_t c;
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
651 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
652 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
653 switch (utf16) {
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
654 case 0:
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
655 if (*len > dstsize)
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
656 *len = dstsize;
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
657 memcpy(dst, src, *len);
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
658 return *len;
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
659 case 1:
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
660 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
661 uint8_t tmp;
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
662 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
663 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
664 }
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
665 *len -= end - src;
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
666 return dstsize - (dst_end - dst);
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
667 case 2:
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
668 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
669 uint8_t tmp;
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
670 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
671 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
672 }
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
673 *len -= end - src;
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
674 return dstsize - (dst_end - dst);
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
675 }
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
676 return 0;
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
677 }
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
678
33906
3c172a874b4b Convert stream_read_line function into more generic stream_read_until function.
reimar
parents: 33722
diff changeset
679 uint8_t *stream_read_until(stream_t *s, uint8_t *mem, int max,
3c172a874b4b Convert stream_read_line function into more generic stream_read_until function.
reimar
parents: 33722
diff changeset
680 uint8_t term, int utf16)
3c172a874b4b Convert stream_read_line function into more generic stream_read_until function.
reimar
parents: 33722
diff changeset
681 {
30754
dff9ee89b7c1 Move stream_read_line implementation from stream.h to stream.c,
reimar
parents: 30697
diff changeset
682 int len;
30757
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
683 const unsigned char *end;
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
684 unsigned char *ptr = mem;
30754
dff9ee89b7c1 Move stream_read_line implementation from stream.h to stream.c,
reimar
parents: 30697
diff changeset
685 if (max < 1) return NULL;
dff9ee89b7c1 Move stream_read_line implementation from stream.h to stream.c,
reimar
parents: 30697
diff changeset
686 max--; // reserve one for 0-termination
dff9ee89b7c1 Move stream_read_line implementation from stream.h to stream.c,
reimar
parents: 30697
diff changeset
687 do {
dff9ee89b7c1 Move stream_read_line implementation from stream.h to stream.c,
reimar
parents: 30697
diff changeset
688 len = s->buf_len-s->buf_pos;
dff9ee89b7c1 Move stream_read_line implementation from stream.h to stream.c,
reimar
parents: 30697
diff changeset
689 // try to fill the buffer
dff9ee89b7c1 Move stream_read_line implementation from stream.h to stream.c,
reimar
parents: 30697
diff changeset
690 if(len <= 0 &&
dff9ee89b7c1 Move stream_read_line implementation from stream.h to stream.c,
reimar
parents: 30697
diff changeset
691 (!cache_stream_fill_buffer(s) ||
dff9ee89b7c1 Move stream_read_line implementation from stream.h to stream.c,
reimar
parents: 30697
diff changeset
692 (len = s->buf_len-s->buf_pos) <= 0)) break;
33906
3c172a874b4b Convert stream_read_line function into more generic stream_read_until function.
reimar
parents: 33722
diff changeset
693 end = find_term_char(s->buffer+s->buf_pos, len, term, utf16);
30754
dff9ee89b7c1 Move stream_read_line implementation from stream.h to stream.c,
reimar
parents: 30697
diff changeset
694 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
695 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
696 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
697 max -= l;
dff9ee89b7c1 Move stream_read_line implementation from stream.h to stream.c,
reimar
parents: 30697
diff changeset
698 ptr += l;
30757
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
699 if (!len)
6a5957bf5b70 Extend stream_read_line to support reading lines from UTF-16 encoded files
reimar
parents: 30754
diff changeset
700 break;
30754
dff9ee89b7c1 Move stream_read_line implementation from stream.h to stream.c,
reimar
parents: 30697
diff changeset
701 }
dff9ee89b7c1 Move stream_read_line implementation from stream.h to stream.c,
reimar
parents: 30697
diff changeset
702 s->buf_pos += len;
dff9ee89b7c1 Move stream_read_line implementation from stream.h to stream.c,
reimar
parents: 30697
diff changeset
703 } while(!end);
31918
3103448dcf28 Make sure we return an "empty" line on eof, to make sure we get
reimar
parents: 31836
diff changeset
704 ptr[0] = 0;
30754
dff9ee89b7c1 Move stream_read_line implementation from stream.h to stream.c,
reimar
parents: 30697
diff changeset
705 if(s->eof && ptr == mem) return NULL;
dff9ee89b7c1 Move stream_read_line implementation from stream.h to stream.c,
reimar
parents: 30697
diff changeset
706 return mem;
dff9ee89b7c1 Move stream_read_line implementation from stream.h to stream.c,
reimar
parents: 30697
diff changeset
707 }
36080
a5fd69f820f3 Make -chapter always available, even when compiled without DVD support.
reimar
parents: 35885
diff changeset
708
a5fd69f820f3 Make -chapter always available, even when compiled without DVD support.
reimar
parents: 35885
diff changeset
709 int parse_chapter_range(const m_option_t *conf, const char *range) {
a5fd69f820f3 Make -chapter always available, even when compiled without DVD support.
reimar
parents: 35885
diff changeset
710 const char *s;
a5fd69f820f3 Make -chapter always available, even when compiled without DVD support.
reimar
parents: 35885
diff changeset
711 char *t;
a5fd69f820f3 Make -chapter always available, even when compiled without DVD support.
reimar
parents: 35885
diff changeset
712 if (!range)
a5fd69f820f3 Make -chapter always available, even when compiled without DVD support.
reimar
parents: 35885
diff changeset
713 return M_OPT_MISSING_PARAM;
a5fd69f820f3 Make -chapter always available, even when compiled without DVD support.
reimar
parents: 35885
diff changeset
714 s = range;
a5fd69f820f3 Make -chapter always available, even when compiled without DVD support.
reimar
parents: 35885
diff changeset
715 dvd_chapter = 1;
a5fd69f820f3 Make -chapter always available, even when compiled without DVD support.
reimar
parents: 35885
diff changeset
716 dvd_last_chapter = 0;
a5fd69f820f3 Make -chapter always available, even when compiled without DVD support.
reimar
parents: 35885
diff changeset
717 if(*range && isdigit(*range)) {
a5fd69f820f3 Make -chapter always available, even when compiled without DVD support.
reimar
parents: 35885
diff changeset
718 dvd_chapter = strtol(range, (char **) &s, 10);
a5fd69f820f3 Make -chapter always available, even when compiled without DVD support.
reimar
parents: 35885
diff changeset
719 if(range == s) {
a5fd69f820f3 Make -chapter always available, even when compiled without DVD support.
reimar
parents: 35885
diff changeset
720 mp_msg(MSGT_OPEN, MSGL_ERR, MSGTR_DVDinvalidChapterRange, range);
a5fd69f820f3 Make -chapter always available, even when compiled without DVD support.
reimar
parents: 35885
diff changeset
721 return M_OPT_INVALID;
a5fd69f820f3 Make -chapter always available, even when compiled without DVD support.
reimar
parents: 35885
diff changeset
722 }
a5fd69f820f3 Make -chapter always available, even when compiled without DVD support.
reimar
parents: 35885
diff changeset
723 }
a5fd69f820f3 Make -chapter always available, even when compiled without DVD support.
reimar
parents: 35885
diff changeset
724 if(*s == 0)
a5fd69f820f3 Make -chapter always available, even when compiled without DVD support.
reimar
parents: 35885
diff changeset
725 return 0;
a5fd69f820f3 Make -chapter always available, even when compiled without DVD support.
reimar
parents: 35885
diff changeset
726 else if(*s != '-') {
a5fd69f820f3 Make -chapter always available, even when compiled without DVD support.
reimar
parents: 35885
diff changeset
727 mp_msg(MSGT_OPEN, MSGL_ERR, MSGTR_DVDinvalidChapterRange, range);
a5fd69f820f3 Make -chapter always available, even when compiled without DVD support.
reimar
parents: 35885
diff changeset
728 return M_OPT_INVALID;
a5fd69f820f3 Make -chapter always available, even when compiled without DVD support.
reimar
parents: 35885
diff changeset
729 }
a5fd69f820f3 Make -chapter always available, even when compiled without DVD support.
reimar
parents: 35885
diff changeset
730 ++s;
a5fd69f820f3 Make -chapter always available, even when compiled without DVD support.
reimar
parents: 35885
diff changeset
731 if(*s == 0)
a5fd69f820f3 Make -chapter always available, even when compiled without DVD support.
reimar
parents: 35885
diff changeset
732 return 0;
a5fd69f820f3 Make -chapter always available, even when compiled without DVD support.
reimar
parents: 35885
diff changeset
733 if(! isdigit(*s)) {
a5fd69f820f3 Make -chapter always available, even when compiled without DVD support.
reimar
parents: 35885
diff changeset
734 mp_msg(MSGT_OPEN, MSGL_ERR, MSGTR_DVDinvalidChapterRange, range);
a5fd69f820f3 Make -chapter always available, even when compiled without DVD support.
reimar
parents: 35885
diff changeset
735 return M_OPT_INVALID;
a5fd69f820f3 Make -chapter always available, even when compiled without DVD support.
reimar
parents: 35885
diff changeset
736 }
a5fd69f820f3 Make -chapter always available, even when compiled without DVD support.
reimar
parents: 35885
diff changeset
737 dvd_last_chapter = strtol(s, &t, 10);
a5fd69f820f3 Make -chapter always available, even when compiled without DVD support.
reimar
parents: 35885
diff changeset
738 if (s == t || *t) {
a5fd69f820f3 Make -chapter always available, even when compiled without DVD support.
reimar
parents: 35885
diff changeset
739 mp_msg(MSGT_OPEN, MSGL_ERR, MSGTR_DVDinvalidChapterRange, range);
a5fd69f820f3 Make -chapter always available, even when compiled without DVD support.
reimar
parents: 35885
diff changeset
740 return M_OPT_INVALID;
a5fd69f820f3 Make -chapter always available, even when compiled without DVD support.
reimar
parents: 35885
diff changeset
741 }
a5fd69f820f3 Make -chapter always available, even when compiled without DVD support.
reimar
parents: 35885
diff changeset
742 return 0;
a5fd69f820f3 Make -chapter always available, even when compiled without DVD support.
reimar
parents: 35885
diff changeset
743 }