annotate stream/stream.c @ 30754:dff9ee89b7c1

Move stream_read_line implementation from stream.h to stream.c, it is not speed critical and the function call overhead is not relevant for its overall speed anyway.
author reimar
date Sun, 28 Feb 2010 13:54:55 +0000
parents 9a49143918aa
children 6a5957bf5b70
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
1430
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1428
diff changeset
19 #include <stdio.h>
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1428
diff changeset
20 #include <stdlib.h>
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1428
diff changeset
21 #include <unistd.h>
1428
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1177
diff changeset
22
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1177
diff changeset
23 #include <sys/types.h>
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1177
diff changeset
24 #include <sys/stat.h>
9798
02449faf87dd MINGW32 port
faust3
parents: 9794
diff changeset
25 #ifndef __MINGW32__
1428
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1177
diff changeset
26 #include <sys/ioctl.h>
6814
6863033786d1 warning fixes
atmos4
parents: 6810
diff changeset
27 #include <sys/wait.h>
9798
02449faf87dd MINGW32 port
faust3
parents: 9794
diff changeset
28 #endif
1428
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1177
diff changeset
29 #include <fcntl.h>
9794
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
30 #include <strings.h>
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents: 537
diff changeset
31
1430
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1428
diff changeset
32 #include "config.h"
27472
c0b233cd30ca Revert moving closesocket definition and network headers to network.h.
diego
parents: 27464
diff changeset
33
28402
c884d17bd005 Convert HAVE_WINSOCK2_H into a 0/1 definition.
diego
parents: 27473
diff changeset
34 #if HAVE_WINSOCK2_H
27472
c0b233cd30ca Revert moving closesocket definition and network headers to network.h.
diego
parents: 27464
diff changeset
35 #include <winsock2.h>
c0b233cd30ca Revert moving closesocket definition and network headers to network.h.
diego
parents: 27464
diff changeset
36 #endif
c0b233cd30ca Revert moving closesocket definition and network headers to network.h.
diego
parents: 27464
diff changeset
37
1973
5216f108cb4f all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents: 1642
diff changeset
38 #include "mp_msg.h"
5216f108cb4f all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents: 1642
diff changeset
39 #include "help_mp.h"
17012
6ff3379a0862 Unify include path handling, -I.. is in CFLAGS.
diego
parents: 16793
diff changeset
40 #include "osdep/shmem.h"
27473
ae5da477539e Move '#define closesocket close' preprocessor directive to a common place
diego
parents: 27472
diff changeset
41 #include "network.h"
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents: 537
diff changeset
42 #include "stream.h"
19312
ab8d6b6deb63 proper inclusion of demuxer.h (including libmpdemux in Makefile only was to make previous split easier)
ben
parents: 19301
diff changeset
43 #include "libmpdemux/demuxer.h"
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents: 537
diff changeset
44
17012
6ff3379a0862 Unify include path handling, -I.. is in CFLAGS.
diego
parents: 16793
diff changeset
45 #include "m_option.h"
6ff3379a0862 Unify include path handling, -I.. is in CFLAGS.
diego
parents: 16793
diff changeset
46 #include "m_struct.h"
9794
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
47
19808
5385740067a1 * remove extern definitions of functions in .c files
attila
parents: 19568
diff changeset
48 #include "cache2.h"
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
49
8812
f6456b177fdc vcd_read_cue.h -> cue_read.c+h
arpi
parents: 8782
diff changeset
50 //#include "vcd_read_bincue.h"
8782
6af7a6595cc9 cdrwin-style bin/cue VCD image support (-vcd <track> -cuefile file.cue)
arpi
parents: 8524
diff changeset
51
26326
5bfc1d8bece9 Remove the need for code using stream to export an mp_input_check_interrupt()
albeu
parents: 26007
diff changeset
52 static int (*stream_check_interrupt_cb)(int time) = NULL;
5bfc1d8bece9 Remove the need for code using stream to export an mp_input_check_interrupt()
albeu
parents: 26007
diff changeset
53
25211
c1d17bd6683c Mark all stream_info_t as const
reimar
parents: 25210
diff changeset
54 extern const stream_info_t stream_info_vcd;
c1d17bd6683c Mark all stream_info_t as const
reimar
parents: 25210
diff changeset
55 extern const stream_info_t stream_info_cdda;
c1d17bd6683c Mark all stream_info_t as const
reimar
parents: 25210
diff changeset
56 extern const stream_info_t stream_info_netstream;
c1d17bd6683c Mark all stream_info_t as const
reimar
parents: 25210
diff changeset
57 extern const stream_info_t stream_info_pnm;
c1d17bd6683c Mark all stream_info_t as const
reimar
parents: 25210
diff changeset
58 extern const stream_info_t stream_info_asf;
c1d17bd6683c Mark all stream_info_t as const
reimar
parents: 25210
diff changeset
59 extern const stream_info_t stream_info_rtsp;
c1d17bd6683c Mark all stream_info_t as const
reimar
parents: 25210
diff changeset
60 extern const stream_info_t stream_info_rtp;
c1d17bd6683c Mark all stream_info_t as const
reimar
parents: 25210
diff changeset
61 extern const stream_info_t stream_info_udp;
c1d17bd6683c Mark all stream_info_t as const
reimar
parents: 25210
diff changeset
62 extern const stream_info_t stream_info_http1;
c1d17bd6683c Mark all stream_info_t as const
reimar
parents: 25210
diff changeset
63 extern const stream_info_t stream_info_http2;
c1d17bd6683c Mark all stream_info_t as const
reimar
parents: 25210
diff changeset
64 extern const stream_info_t stream_info_dvb;
c1d17bd6683c Mark all stream_info_t as const
reimar
parents: 25210
diff changeset
65 extern const stream_info_t stream_info_tv;
c1d17bd6683c Mark all stream_info_t as const
reimar
parents: 25210
diff changeset
66 extern const stream_info_t stream_info_radio;
c1d17bd6683c Mark all stream_info_t as const
reimar
parents: 25210
diff changeset
67 extern const stream_info_t stream_info_pvr;
c1d17bd6683c Mark all stream_info_t as const
reimar
parents: 25210
diff changeset
68 extern const stream_info_t stream_info_ftp;
c1d17bd6683c Mark all stream_info_t as const
reimar
parents: 25210
diff changeset
69 extern const stream_info_t stream_info_vstream;
c1d17bd6683c Mark all stream_info_t as const
reimar
parents: 25210
diff changeset
70 extern const stream_info_t stream_info_dvdnav;
c1d17bd6683c Mark all stream_info_t as const
reimar
parents: 25210
diff changeset
71 extern const stream_info_t stream_info_smb;
c1d17bd6683c Mark all stream_info_t as const
reimar
parents: 25210
diff changeset
72 extern const stream_info_t stream_info_sdp;
c1d17bd6683c Mark all stream_info_t as const
reimar
parents: 25210
diff changeset
73 extern const stream_info_t stream_info_rtsp_sip;
10560
11826d9f90c7 this patch fixes
arpi
parents: 10281
diff changeset
74
25211
c1d17bd6683c Mark all stream_info_t as const
reimar
parents: 25210
diff changeset
75 extern const stream_info_t stream_info_cue;
c1d17bd6683c Mark all stream_info_t as const
reimar
parents: 25210
diff changeset
76 extern const stream_info_t stream_info_null;
c1d17bd6683c Mark all stream_info_t as const
reimar
parents: 25210
diff changeset
77 extern const stream_info_t stream_info_mf;
29881
5797dc687a8e Add preliminary support for streaming via FFmpeg's URProtocol functions.
reimar
parents: 29819
diff changeset
78 extern const stream_info_t stream_info_ffmpeg;
25211
c1d17bd6683c Mark all stream_info_t as const
reimar
parents: 25210
diff changeset
79 extern const stream_info_t stream_info_file;
c1d17bd6683c Mark all stream_info_t as const
reimar
parents: 25210
diff changeset
80 extern const stream_info_t stream_info_ifo;
c1d17bd6683c Mark all stream_info_t as const
reimar
parents: 25210
diff changeset
81 extern const stream_info_t stream_info_dvd;
9794
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
82
25209
7d2a9ae30c67 Make auto_open_streams array itself const
reimar
parents: 25207
diff changeset
83 static const stream_info_t* const auto_open_streams[] = {
27370
14c5017f40d2 Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents: 27341
diff changeset
84 #ifdef CONFIG_VCD
9886
e578e4375434 Port vcd to the new API
albeu
parents: 9874
diff changeset
85 &stream_info_vcd,
e578e4375434 Port vcd to the new API
albeu
parents: 9874
diff changeset
86 #endif
27391
1d2faa1020fb Rename a bunch of miscellaneous preprocessor directives.
diego
parents: 27370
diff changeset
87 #ifdef CONFIG_CDDA
9801
2f02809d32a8 URL is cdda://tracks[:speed][/device]
albeu
parents: 9798
diff changeset
88 &stream_info_cdda,
9810
pontscho
parents: 9801
diff changeset
89 #endif
27397
d47744b95b78 Give a CONFIG_ prefix to preprocessor directives that lacked one and
diego
parents: 27391
diff changeset
90 #ifdef CONFIG_NETWORK
9853
765cca786fec Add netstream
albeu
parents: 9826
diff changeset
91 &stream_info_netstream,
15585
281d155fb37f ported all network streams to the new API
nicodvb
parents: 15520
diff changeset
92 &stream_info_http1,
281d155fb37f ported all network streams to the new API
nicodvb
parents: 15520
diff changeset
93 &stream_info_asf,
281d155fb37f ported all network streams to the new API
nicodvb
parents: 15520
diff changeset
94 &stream_info_pnm,
281d155fb37f ported all network streams to the new API
nicodvb
parents: 15520
diff changeset
95 &stream_info_rtsp,
27397
d47744b95b78 Give a CONFIG_ prefix to preprocessor directives that lacked one and
diego
parents: 27391
diff changeset
96 #ifdef CONFIG_LIVE555
15585
281d155fb37f ported all network streams to the new API
nicodvb
parents: 15520
diff changeset
97 &stream_info_sdp,
281d155fb37f ported all network streams to the new API
nicodvb
parents: 15520
diff changeset
98 &stream_info_rtsp_sip,
281d155fb37f ported all network streams to the new API
nicodvb
parents: 15520
diff changeset
99 #endif
19313
0792ad01e9bf split rtp stack, udp input layer and rtp input layer from rtp.c
ben
parents: 19312
diff changeset
100 &stream_info_rtp,
0792ad01e9bf split rtp stack, udp input layer and rtp input layer from rtp.c
ben
parents: 19312
diff changeset
101 &stream_info_udp,
15585
281d155fb37f ported all network streams to the new API
nicodvb
parents: 15520
diff changeset
102 &stream_info_http2,
9853
765cca786fec Add netstream
albeu
parents: 9826
diff changeset
103 #endif
27370
14c5017f40d2 Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents: 27341
diff changeset
104 #ifdef CONFIG_DVBIN
10560
11826d9f90c7 this patch fixes
arpi
parents: 10281
diff changeset
105 &stream_info_dvb,
11826d9f90c7 this patch fixes
arpi
parents: 10281
diff changeset
106 #endif
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27178
diff changeset
107 #ifdef CONFIG_TV
19273
11ec1cb3a7ea add an explicit tv stream input instead of the previous hack in stream_null
ben
parents: 19271
diff changeset
108 &stream_info_tv,
11ec1cb3a7ea add an explicit tv stream input instead of the previous hack in stream_null
ben
parents: 19271
diff changeset
109 #endif
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27178
diff changeset
110 #ifdef CONFIG_RADIO
19568
bd821fd3e244 Radio support, patch by Vladimir Voroshilov (voroshil gmail com)
reimar
parents: 19313
diff changeset
111 &stream_info_radio,
bd821fd3e244 Radio support, patch by Vladimir Voroshilov (voroshil gmail com)
reimar
parents: 19313
diff changeset
112 #endif
27370
14c5017f40d2 Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents: 27341
diff changeset
113 #ifdef CONFIG_PVR
18997
73b8f5ff772d added new pvr:// input for ivtv based cards
ben
parents: 18712
diff changeset
114 &stream_info_pvr,
73b8f5ff772d added new pvr:// input for ivtv based cards
ben
parents: 18712
diff changeset
115 #endif
27391
1d2faa1020fb Rename a bunch of miscellaneous preprocessor directives.
diego
parents: 27370
diff changeset
116 #ifdef CONFIG_FTP
10625
620cc649f519 ftp support. The change on connect2Server is needed bcs we need 2
albeu
parents: 10560
diff changeset
117 &stream_info_ftp,
620cc649f519 ftp support. The change on connect2Server is needed bcs we need 2
albeu
parents: 10560
diff changeset
118 #endif
27391
1d2faa1020fb Rename a bunch of miscellaneous preprocessor directives.
diego
parents: 27370
diff changeset
119 #ifdef CONFIG_VSTREAM
14836
8b9738526dd7 added a stream module for the vstream client library
joey
parents: 12018
diff changeset
120 &stream_info_vstream,
8b9738526dd7 added a stream module for the vstream client library
joey
parents: 12018
diff changeset
121 #endif
27397
d47744b95b78 Give a CONFIG_ prefix to preprocessor directives that lacked one and
diego
parents: 27391
diff changeset
122 #ifdef CONFIG_LIBSMBCLIENT
15520
2c5186ed83b9 ported smb:// to the new stream api
nicodvb
parents: 15518
diff changeset
123 &stream_info_smb,
2c5186ed83b9 ported smb:// to the new stream api
nicodvb
parents: 15518
diff changeset
124 #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
125 &stream_info_cue,
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27178
diff changeset
126 #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
127 &stream_info_ifo,
15518
9391bf60ccdf ported dvd:// to the new stream api
nicodvb
parents: 15476
diff changeset
128 &stream_info_dvd,
17191
6ac0b5f0d1ed fix compilation when dvdkit and dvdread are not available
nicodvb
parents: 17012
diff changeset
129 #endif
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27178
diff changeset
130 #ifdef CONFIG_DVDNAV
18712
cb7da1894b00 restored support for dvdnav only in the stream layer; all other functionalities are disabled
nicodvb
parents: 18558
diff changeset
131 &stream_info_dvdnav,
15518
9391bf60ccdf ported dvd:// to the new stream api
nicodvb
parents: 15476
diff changeset
132 #endif
29881
5797dc687a8e Add preliminary support for streaming via FFmpeg's URProtocol functions.
reimar
parents: 29819
diff changeset
133 #ifdef CONFIG_LIBAVFORMAT
5797dc687a8e Add preliminary support for streaming via FFmpeg's URProtocol functions.
reimar
parents: 29819
diff changeset
134 &stream_info_ffmpeg,
5797dc687a8e Add preliminary support for streaming via FFmpeg's URProtocol functions.
reimar
parents: 29819
diff changeset
135 #endif
15518
9391bf60ccdf ported dvd:// to the new stream api
nicodvb
parents: 15476
diff changeset
136
9901
233802490b0e Add a null streamv Currently used for tv and mf. Could be used to
albeu
parents: 9886
diff changeset
137 &stream_info_null,
19301
097e5bc71210 added dedicated file for mf:// input
ben
parents: 19273
diff changeset
138 &stream_info_mf,
9794
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
139 &stream_info_file,
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
140 NULL
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
141 };
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
142
30697
9a49143918aa Mark stream open filename parameter as const, the filename string is not
reimar
parents: 30626
diff changeset
143 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
144 int mode, char** options, int* file_format,
74a6c2a3dcce stream: Mark functions not used outside of their files as static.
diego
parents: 30426
diff changeset
145 int* ret, char** redirected_url)
74a6c2a3dcce stream: Mark functions not used outside of their files as static.
diego
parents: 30426
diff changeset
146 {
9794
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
147 void* arg = NULL;
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
148 stream_t* s;
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
149 m_struct_t* desc = (m_struct_t*)sinfo->opts;
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
150
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
151 // Parse options
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
152 if(desc) {
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
153 arg = m_struct_alloc(desc);
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
154 if(sinfo->opts_url) {
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28402
diff changeset
155 m_option_t url_opt =
9794
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
156 { "stream url", arg , CONF_TYPE_CUSTOM_URL, 0, 0 ,0, sinfo->opts };
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
157 if(m_option_parse(&url_opt,"stream url",filename,arg,M_CONFIG_FILE) < 0) {
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
158 mp_msg(MSGT_OPEN,MSGL_ERR, "URL parsing failed on url %s\n",filename);
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
159 m_struct_free(desc,arg);
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
160 return NULL;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28402
diff changeset
161 }
9794
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
162 }
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
163 if(options) {
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
164 int i;
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
165 for(i = 0 ; options[i] != NULL ; i += 2) {
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
166 mp_msg(MSGT_OPEN,MSGL_DBG2, "Set stream arg %s=%s\n",
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
167 options[i],options[i+1]);
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
168 if(!m_struct_set(desc,arg,options[i],options[i+1]))
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
169 mp_msg(MSGT_OPEN,MSGL_WARN, "Failed to set stream option %s=%s\n",
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
170 options[i],options[i+1]);
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
171 }
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
172 }
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
173 }
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
174 s = new_stream(-2,-2);
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
175 s->url=strdup(filename);
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
176 s->flags |= mode;
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
177 *ret = sinfo->open(s,mode,arg,file_format);
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
178 if((*ret) != STREAM_OK) {
27397
d47744b95b78 Give a CONFIG_ prefix to preprocessor directives that lacked one and
diego
parents: 27391
diff changeset
179 #ifdef CONFIG_NETWORK
25135
66f628d13442 Support stream redirection from http to mms, fix bug #927.
ulion
parents: 24963
diff changeset
180 if (*ret == STREAM_REDIRECTED && redirected_url) {
66f628d13442 Support stream redirection from http to mms, fix bug #927.
ulion
parents: 24963
diff changeset
181 if (s->streaming_ctrl && s->streaming_ctrl->url
66f628d13442 Support stream redirection from http to mms, fix bug #927.
ulion
parents: 24963
diff changeset
182 && s->streaming_ctrl->url->url)
66f628d13442 Support stream redirection from http to mms, fix bug #927.
ulion
parents: 24963
diff changeset
183 *redirected_url = strdup(s->streaming_ctrl->url->url);
66f628d13442 Support stream redirection from http to mms, fix bug #927.
ulion
parents: 24963
diff changeset
184 else
66f628d13442 Support stream redirection from http to mms, fix bug #927.
ulion
parents: 24963
diff changeset
185 *redirected_url = NULL;
66f628d13442 Support stream redirection from http to mms, fix bug #927.
ulion
parents: 24963
diff changeset
186 }
66f628d13442 Support stream redirection from http to mms, fix bug #927.
ulion
parents: 24963
diff changeset
187 streaming_ctrl_free(s->streaming_ctrl);
66f628d13442 Support stream redirection from http to mms, fix bug #927.
ulion
parents: 24963
diff changeset
188 #endif
9794
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
189 free(s->url);
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
190 free(s);
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
191 return NULL;
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
192 }
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
193 if(s->type <= -2)
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
194 mp_msg(MSGT_OPEN,MSGL_WARN, "Warning streams need a type !!!!\n");
29920
4f740437ed2b Finally rename the STREAM_SEEK define to MP_STREAM_SEEK, there are just too many
reimar
parents: 29887
diff changeset
195 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
196 s->flags &= ~MP_STREAM_SEEK;
4f740437ed2b Finally rename the STREAM_SEEK define to MP_STREAM_SEEK, there are just too many
reimar
parents: 29887
diff changeset
197 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
198 s->flags |= MP_STREAM_SEEK;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28402
diff changeset
199
21659
da09e69a0f01 support functions for writing to streams
nicodvb
parents: 21493
diff changeset
200 s->mode = mode;
9794
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
201
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
202 mp_msg(MSGT_OPEN,MSGL_V, "STREAM: [%s] %s\n",sinfo->name,filename);
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
203 mp_msg(MSGT_OPEN,MSGL_V, "STREAM: Description: %s\n",sinfo->info);
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
204 mp_msg(MSGT_OPEN,MSGL_V, "STREAM: Author: %s\n", sinfo->author);
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
205 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
206
9794
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
207 return s;
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
208 }
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
209
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
210
30697
9a49143918aa Mark stream open filename parameter as const, the filename string is not
reimar
parents: 30626
diff changeset
211 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
212 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
213 const stream_info_t* sinfo;
9794
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
214 stream_t* s;
25135
66f628d13442 Support stream redirection from http to mms, fix bug #927.
ulion
parents: 24963
diff changeset
215 char *redirected_url = NULL;
9794
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
216
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
217 for(i = 0 ; auto_open_streams[i] ; i++) {
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
218 sinfo = auto_open_streams[i];
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
219 if(!sinfo->protocols) {
10735
8a10d5d0ce86 serious bugs - 1l absinth (changed to absinth against cola inflation)
alex
parents: 10625
diff changeset
220 mp_msg(MSGT_OPEN,MSGL_WARN, "Stream type %s has protocols == NULL, it's a bug\n", sinfo->name);
9794
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
221 continue;
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
222 }
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
223 for(j = 0 ; sinfo->protocols[j] ; j++) {
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
224 l = strlen(sinfo->protocols[j]);
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
225 // 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
226 if((l == 0 && !strstr(filename, "://")) ||
25429
76941781b521 Protocol name should be case insensitive.
ulion
parents: 25211
diff changeset
227 ((strncasecmp(sinfo->protocols[j],filename,l) == 0) &&
9794
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
228 (strncmp("://",filename+l,3) == 0))) {
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
229 *file_format = DEMUXER_TYPE_UNKNOWN;
25135
66f628d13442 Support stream redirection from http to mms, fix bug #927.
ulion
parents: 24963
diff changeset
230 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
231 &redirected_url);
9794
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
232 if(s) return s;
25135
66f628d13442 Support stream redirection from http to mms, fix bug #927.
ulion
parents: 24963
diff changeset
233 if(r == STREAM_REDIRECTED && redirected_url) {
66f628d13442 Support stream redirection from http to mms, fix bug #927.
ulion
parents: 24963
diff changeset
234 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
235 sinfo->info, filename, redirected_url);
66f628d13442 Support stream redirection from http to mms, fix bug #927.
ulion
parents: 24963
diff changeset
236 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
237 free(redirected_url);
66f628d13442 Support stream redirection from http to mms, fix bug #927.
ulion
parents: 24963
diff changeset
238 return s;
66f628d13442 Support stream redirection from http to mms, fix bug #927.
ulion
parents: 24963
diff changeset
239 }
66f628d13442 Support stream redirection from http to mms, fix bug #927.
ulion
parents: 24963
diff changeset
240 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
241 mp_msg(MSGT_OPEN,MSGL_ERR, MSGTR_FailedToOpen,filename);
9794
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
242 return NULL;
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
243 }
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
244 break;
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
245 }
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
246 }
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
247 }
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
248
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
249 mp_msg(MSGT_OPEN,MSGL_ERR, "No stream found to handle url %s\n",filename);
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
250 return NULL;
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
251 }
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
252
30697
9a49143918aa Mark stream open filename parameter as const, the filename string is not
reimar
parents: 30626
diff changeset
253 stream_t* open_output_stream(const char* filename, char** options) {
21659
da09e69a0f01 support functions for writing to streams
nicodvb
parents: 21493
diff changeset
254 int file_format; //unused
da09e69a0f01 support functions for writing to streams
nicodvb
parents: 21493
diff changeset
255 if(!filename) {
da09e69a0f01 support functions for writing to streams
nicodvb
parents: 21493
diff changeset
256 mp_msg(MSGT_OPEN,MSGL_ERR,"open_output_stream(), NULL filename, report this bug\n");
da09e69a0f01 support functions for writing to streams
nicodvb
parents: 21493
diff changeset
257 return NULL;
da09e69a0f01 support functions for writing to streams
nicodvb
parents: 21493
diff changeset
258 }
da09e69a0f01 support functions for writing to streams
nicodvb
parents: 21493
diff changeset
259
da09e69a0f01 support functions for writing to streams
nicodvb
parents: 21493
diff changeset
260 return open_stream_full(filename,STREAM_WRITE,options,&file_format);
da09e69a0f01 support functions for writing to streams
nicodvb
parents: 21493
diff changeset
261 }
da09e69a0f01 support functions for writing to streams
nicodvb
parents: 21493
diff changeset
262
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
263 //=================== STREAMER =========================
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
264
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
265 int stream_fill_buffer(stream_t *s){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
266 int len;
30626
27b133678bbd Do not discard stream buffer on eof, instead reuse it to slightly improve
reimar
parents: 30557
diff changeset
267 if (/*s->fd == NULL ||*/ s->eof) { return 0; }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
268 switch(s->type){
692
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
269 case STREAMTYPE_STREAM:
27397
d47744b95b78 Give a CONFIG_ prefix to preprocessor directives that lacked one and
diego
parents: 27391
diff changeset
270 #ifdef CONFIG_NETWORK
24963
0a733c2c577e Fix possible null-pointer-dereference in stream_fill_buffer().
cehoyos
parents: 24257
diff changeset
271 if( s->streaming_ctrl!=NULL && s->streaming_ctrl->streaming_read ) {
29818
d133a1a83c17 Factor out triplicated break statement.
reimar
parents: 29263
diff changeset
272 len=s->streaming_ctrl->streaming_read(s->fd,s->buffer,STREAM_BUFFER_SIZE, s->streaming_ctrl);
29819
2c2733d12823 The code for the non-networking case is the same whether networking
reimar
parents: 29818
diff changeset
273 } else
2c2733d12823 The code for the non-networking case is the same whether networking
reimar
parents: 29818
diff changeset
274 #endif
29883
306e614b92cb Use fill_buffer if available also for STREAMTYPE_STREAM
reimar
parents: 29881
diff changeset
275 if (s->fill_buffer)
306e614b92cb Use fill_buffer if available also for STREAMTYPE_STREAM
reimar
parents: 29881
diff changeset
276 len = s->fill_buffer(s, s->buffer, STREAM_BUFFER_SIZE);
306e614b92cb Use fill_buffer if available also for STREAMTYPE_STREAM
reimar
parents: 29881
diff changeset
277 else
29818
d133a1a83c17 Factor out triplicated break statement.
reimar
parents: 29263
diff changeset
278 len=read(s->fd,s->buffer,STREAM_BUFFER_SIZE);
d133a1a83c17 Factor out triplicated break statement.
reimar
parents: 29263
diff changeset
279 break;
5133
9841a86d66f9 Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents: 4893
diff changeset
280 case STREAMTYPE_DS:
9841a86d66f9 Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents: 4893
diff changeset
281 len = demux_read_data((demux_stream_t*)s->priv,s->buffer,STREAM_BUFFER_SIZE);
9841a86d66f9 Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents: 4893
diff changeset
282 break;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28402
diff changeset
283
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28402
diff changeset
284
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28402
diff changeset
285 default:
9794
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
286 len= s->fill_buffer ? s->fill_buffer(s,s->buffer,STREAM_BUFFER_SIZE) : 0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
287 }
30626
27b133678bbd Do not discard stream buffer on eof, instead reuse it to slightly improve
reimar
parents: 30557
diff changeset
288 if(len<=0){ s->eof=1; return 0; }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
289 s->buf_pos=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
290 s->buf_len=len;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
291 s->pos+=len;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
292 // printf("[%d]",len);fflush(stdout);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
293 return len;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
294 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
295
21659
da09e69a0f01 support functions for writing to streams
nicodvb
parents: 21493
diff changeset
296 int stream_write_buffer(stream_t *s, unsigned char *buf, int len) {
da09e69a0f01 support functions for writing to streams
nicodvb
parents: 21493
diff changeset
297 int rd;
da09e69a0f01 support functions for writing to streams
nicodvb
parents: 21493
diff changeset
298 if(!s->write_buffer)
da09e69a0f01 support functions for writing to streams
nicodvb
parents: 21493
diff changeset
299 return -1;
da09e69a0f01 support functions for writing to streams
nicodvb
parents: 21493
diff changeset
300 rd = s->write_buffer(s, buf, len);
da09e69a0f01 support functions for writing to streams
nicodvb
parents: 21493
diff changeset
301 if(rd < 0)
da09e69a0f01 support functions for writing to streams
nicodvb
parents: 21493
diff changeset
302 return -1;
da09e69a0f01 support functions for writing to streams
nicodvb
parents: 21493
diff changeset
303 s->pos += rd;
da09e69a0f01 support functions for writing to streams
nicodvb
parents: 21493
diff changeset
304 return rd;
da09e69a0f01 support functions for writing to streams
nicodvb
parents: 21493
diff changeset
305 }
da09e69a0f01 support functions for writing to streams
nicodvb
parents: 21493
diff changeset
306
1428
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1177
diff changeset
307 int stream_seek_long(stream_t *s,off_t pos){
6814
6863033786d1 warning fixes
atmos4
parents: 6810
diff changeset
308 off_t newpos=0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
309
17932
3fe3b2b3a6ce Convert all if(verbose>X) to mp_msg_test calls.
diego
parents: 17878
diff changeset
310 // 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
311
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
312 s->buf_pos=s->buf_len=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
313
21659
da09e69a0f01 support functions for writing to streams
nicodvb
parents: 21493
diff changeset
314 if(s->mode == STREAM_WRITE) {
da09e69a0f01 support functions for writing to streams
nicodvb
parents: 21493
diff changeset
315 if(!s->seek || !s->seek(s,pos))
da09e69a0f01 support functions for writing to streams
nicodvb
parents: 21493
diff changeset
316 return 0;
da09e69a0f01 support functions for writing to streams
nicodvb
parents: 21493
diff changeset
317 return 1;
da09e69a0f01 support functions for writing to streams
nicodvb
parents: 21493
diff changeset
318 }
da09e69a0f01 support functions for writing to streams
nicodvb
parents: 21493
diff changeset
319
22362
e244d570ba44 cleaned stream_seek() : simplified the alignment to STREAM_BUFFER_SIZE or s->sector_size
nicodvb
parents: 21659
diff changeset
320 if(s->sector_size)
e244d570ba44 cleaned stream_seek() : simplified the alignment to STREAM_BUFFER_SIZE or s->sector_size
nicodvb
parents: 21659
diff changeset
321 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
322 else
e244d570ba44 cleaned stream_seek() : simplified the alignment to STREAM_BUFFER_SIZE or s->sector_size
nicodvb
parents: 21659
diff changeset
323 newpos = pos&(~((off_t)STREAM_BUFFER_SIZE-1));
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
324
17932
3fe3b2b3a6ce Convert all if(verbose>X) to mp_msg_test calls.
diego
parents: 17878
diff changeset
325 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
326 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
327 (int64_t)s->pos,(int64_t)newpos,(int64_t)pos,s->buf_len);
2050
18f4dd5d568f -Wall warnings fixed
arpi
parents: 1999
diff changeset
328 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
329 pos-=newpos;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
330
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
331 if(newpos==0 || newpos!=s->pos){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
332 switch(s->type){
692
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
333 case STREAMTYPE_STREAM:
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
334 //s->pos=newpos; // real seek
3044
606bb6943ae9 Added a network read function call and a seek network function call.
bertrand
parents: 2790
diff changeset
335 // Some streaming protocol allow to seek backward and forward
606bb6943ae9 Added a network read function call and a seek network function call.
bertrand
parents: 2790
diff changeset
336 // A function call that return -1 can tell that the protocol
606bb6943ae9 Added a network read function call and a seek network function call.
bertrand
parents: 2790
diff changeset
337 // doesn't support seeking.
27397
d47744b95b78 Give a CONFIG_ prefix to preprocessor directives that lacked one and
diego
parents: 27391
diff changeset
338 #ifdef CONFIG_NETWORK
11965
3d75bcc28231 enable seeking in http streams
attila
parents: 10735
diff changeset
339 if(s->seek) { // new stream seek is much cleaner than streaming_ctrl one
3d75bcc28231 enable seeking in http streams
attila
parents: 10735
diff changeset
340 if(!s->seek(s,newpos)) {
3d75bcc28231 enable seeking in http streams
attila
parents: 10735
diff changeset
341 mp_msg(MSGT_STREAM,MSGL_ERR, "Seek failed\n");
12018
2c2fb4457982 Seek in HTTP streams and stdin seek fixes
rtognimp
parents: 11965
diff changeset
342 return 0;
11965
3d75bcc28231 enable seeking in http streams
attila
parents: 10735
diff changeset
343 }
3d75bcc28231 enable seeking in http streams
attila
parents: 10735
diff changeset
344 break;
3d75bcc28231 enable seeking in http streams
attila
parents: 10735
diff changeset
345 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28402
diff changeset
346
8929
c5ca1ae42555 check if seeking supported, otherwise fallback to null reading
arpi
parents: 8812
diff changeset
347 if( s->streaming_ctrl!=NULL && s->streaming_ctrl->streaming_seek ) {
3044
606bb6943ae9 Added a network read function call and a seek network function call.
bertrand
parents: 2790
diff changeset
348 if( s->streaming_ctrl->streaming_seek( s->fd, pos, s->streaming_ctrl )<0 ) {
606bb6943ae9 Added a network read function call and a seek network function call.
bertrand
parents: 2790
diff changeset
349 mp_msg(MSGT_STREAM,MSGL_INFO,"Stream not seekable!\n");
606bb6943ae9 Added a network read function call and a seek network function call.
bertrand
parents: 2790
diff changeset
350 return 1;
606bb6943ae9 Added a network read function call and a seek network function call.
bertrand
parents: 2790
diff changeset
351 }
29884
9112683a9a02 Enable the read-based forward seek fallback also when CONFIG_NETWORK is
reimar
parents: 29883
diff changeset
352 break;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28402
diff changeset
353 }
29884
9112683a9a02 Enable the read-based forward seek fallback also when CONFIG_NETWORK is
reimar
parents: 29883
diff changeset
354 #endif
692
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
355 if(newpos<s->pos){
1973
5216f108cb4f all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents: 1642
diff changeset
356 mp_msg(MSGT_STREAM,MSGL_INFO,"Cannot seek backward in linear streams!\n");
692
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
357 return 1;
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
358 }
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
359 while(s->pos<newpos){
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
360 if(stream_fill_buffer(s)<=0) break; // EOF
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
361 }
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
362 break;
7408
0c6948b8100f stream layer cleanup part 2
arpi
parents: 7407
diff changeset
363 default:
9794
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
364 // This should at the beginning as soon as all streams are converted
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
365 if(!s->seek)
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
366 return 0;
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
367 // Now seek
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
368 if(!s->seek(s,newpos)) {
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
369 mp_msg(MSGT_STREAM,MSGL_ERR, "Seek failed\n");
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
370 return 0;
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
371 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
372 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
373 // putchar('.');fflush(stdout);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
374 //} else {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
375 // putchar('%');fflush(stdout);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
376 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
377
17878
ab0a3e3d32ed Fix a potential seek failure, fill_buffer doesn't have to
albeu
parents: 17712
diff changeset
378 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
379 if(pos<=s->buf_len){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
380 s->buf_pos=pos; // byte position in sector
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
381 return 1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
382 }
17878
ab0a3e3d32ed Fix a potential seek failure, fill_buffer doesn't have to
albeu
parents: 17712
diff changeset
383 pos -= s->buf_len;
ab0a3e3d32ed Fix a potential seek failure, fill_buffer doesn't have to
albeu
parents: 17712
diff changeset
384 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28402
diff changeset
385
1999
0c45328c9f8b fixed seek to EOF pos
arpi
parents: 1973
diff changeset
386 // 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
387
16750
0a31740dd5e6 Use PRI?64 defines as format strings for 64 bit variables.
reimar
parents: 16572
diff changeset
388 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
389 return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
390 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
391
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
392
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
393 void stream_reset(stream_t *s){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
394 if(s->eof){
30626
27b133678bbd Do not discard stream buffer on eof, instead reuse it to slightly improve
reimar
parents: 30557
diff changeset
395 s->pos=0;
27b133678bbd Do not discard stream buffer on eof, instead reuse it to slightly improve
reimar
parents: 30557
diff changeset
396 s->buf_pos=s->buf_len=0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
397 s->eof=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
398 }
9853
765cca786fec Add netstream
albeu
parents: 9826
diff changeset
399 if(s->control) s->control(s,STREAM_CTRL_RESET,NULL);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
400 //stream_seek(s,0);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
401 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
402
17712
a320248c2450 stream_control() returns int, not void
nicodvb
parents: 17696
diff changeset
403 int stream_control(stream_t *s, int cmd, void *arg){
24257
d261f5109660 cosmetics: typo fix UNSUPORTED --> UNSUPPORTED
diego
parents: 22362
diff changeset
404 if(!s->control) return STREAM_UNSUPPORTED;
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27178
diff changeset
405 #ifdef CONFIG_STREAM_CACHE
26833
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
406 if (s->cache_pid)
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
407 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
408 #endif
17696
66d7afee9a46 added new stream_control() and new command: STREAM_CTRL_GET_TIME_LENGTH
nicodvb
parents: 17191
diff changeset
409 return s->control(s, cmd, arg);
66d7afee9a46 added new stream_control() and new command: STREAM_CTRL_GET_TIME_LENGTH
nicodvb
parents: 17191
diff changeset
410 }
66d7afee9a46 added new stream_control() and new command: STREAM_CTRL_GET_TIME_LENGTH
nicodvb
parents: 17191
diff changeset
411
2144
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
412 stream_t* new_memory_stream(unsigned char* data,int len){
18558
4928dd61f136 Fix potential integer overflows in memory allocation.
rtogni
parents: 18176
diff changeset
413 stream_t *s;
4928dd61f136 Fix potential integer overflows in memory allocation.
rtogni
parents: 18176
diff changeset
414
4928dd61f136 Fix potential integer overflows in memory allocation.
rtogni
parents: 18176
diff changeset
415 if(len < 0)
4928dd61f136 Fix potential integer overflows in memory allocation.
rtogni
parents: 18176
diff changeset
416 return NULL;
29887
195deae202cb Merge malloc+memset -> calloc
reimar
parents: 29884
diff changeset
417 s=calloc(1, sizeof(stream_t)+len);
2144
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
418 s->fd=-1;
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
419 s->type=STREAMTYPE_MEMORY;
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
420 s->buf_pos=0; s->buf_len=len;
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
421 s->start_pos=0; s->end_pos=len;
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
422 stream_reset(s);
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
423 s->pos=len;
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
424 memcpy(s->buffer,data,len);
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
425 return s;
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
426 }
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
427
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
428 stream_t* new_stream(int fd,int type){
29887
195deae202cb Merge malloc+memset -> calloc
reimar
parents: 29884
diff changeset
429 stream_t *s=calloc(1, sizeof(stream_t));
3291
2122a13b5a29 fixed startup crash
iive
parents: 3261
diff changeset
430 if(s==NULL) return NULL;
10281
54bcbf28698a Networking support under MinGW.
diego
parents: 10242
diff changeset
431
28402
c884d17bd005 Convert HAVE_WINSOCK2_H into a 0/1 definition.
diego
parents: 27473
diff changeset
432 #if HAVE_WINSOCK2_H
10281
54bcbf28698a Networking support under MinGW.
diego
parents: 10242
diff changeset
433 {
54bcbf28698a Networking support under MinGW.
diego
parents: 10242
diff changeset
434 WSADATA wsdata;
54bcbf28698a Networking support under MinGW.
diego
parents: 10242
diff changeset
435 int temp = WSAStartup(0x0202, &wsdata); // there might be a better place for this (-> later)
54bcbf28698a Networking support under MinGW.
diego
parents: 10242
diff changeset
436 mp_msg(MSGT_STREAM,MSGL_V,"WINSOCK2 init: %i\n", temp);
54bcbf28698a Networking support under MinGW.
diego
parents: 10242
diff changeset
437 }
54bcbf28698a Networking support under MinGW.
diego
parents: 10242
diff changeset
438 #endif
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28402
diff changeset
439
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
440 s->fd=fd;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
441 s->type=type;
180
afa2c05cfe43 terrible fatal bug fixed
arpi_esp
parents: 1
diff changeset
442 s->buf_pos=s->buf_len=0;
598
c7117e17e20b OSD seekbar fixed for mpeg/VCD
arpi_esp
parents: 578
diff changeset
443 s->start_pos=s->end_pos=0;
1642
78fa0713b823 free'ing priv struct
arpi
parents: 1595
diff changeset
444 s->priv=NULL;
7407
8780415baa87 stream layer cleanup - part 1
arpi
parents: 7406
diff changeset
445 s->url=NULL;
2322
e22ec6fce385 cache2 support
arpi
parents: 2310
diff changeset
446 s->cache_pid=0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
447 stream_reset(s);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
448 return s;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
449 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
450
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
451 void free_stream(stream_t *s){
6138
523014df7d32 big cosmetics patch, cleanup of messages printed by mplayer and libs.
arpi
parents: 5982
diff changeset
452 // printf("\n*** free_stream() called ***\n");
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27178
diff changeset
453 #ifdef CONFIG_STREAM_CACHE
9915
eabe876ab5e2 Fix cache uninit
albeu
parents: 9901
diff changeset
454 cache_uninit(s);
9798
02449faf87dd MINGW32 port
faust3
parents: 9794
diff changeset
455 #endif
15520
2c5186ed83b9 ported smb:// to the new stream api
nicodvb
parents: 15518
diff changeset
456 if(s->close) s->close(s);
15421
ae5e1b9e3c92 fix segfaults caused by socket and file descriptor mismatches on windows
faust3
parents: 14836
diff changeset
457 if(s->fd>0){
ae5e1b9e3c92 fix segfaults caused by socket and file descriptor mismatches on windows
faust3
parents: 14836
diff changeset
458 /* on unix we define closesocket to close
ae5e1b9e3c92 fix segfaults caused by socket and file descriptor mismatches on windows
faust3
parents: 14836
diff changeset
459 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
460 network socket and file */
ae5e1b9e3c92 fix segfaults caused by socket and file descriptor mismatches on windows
faust3
parents: 14836
diff changeset
461 if(s->url && strstr(s->url,"://"))
ae5e1b9e3c92 fix segfaults caused by socket and file descriptor mismatches on windows
faust3
parents: 14836
diff changeset
462 closesocket(s->fd);
ae5e1b9e3c92 fix segfaults caused by socket and file descriptor mismatches on windows
faust3
parents: 14836
diff changeset
463 else close(s->fd);
ae5e1b9e3c92 fix segfaults caused by socket and file descriptor mismatches on windows
faust3
parents: 14836
diff changeset
464 }
28402
c884d17bd005 Convert HAVE_WINSOCK2_H into a 0/1 definition.
diego
parents: 27473
diff changeset
465 #if HAVE_WINSOCK2_H
10281
54bcbf28698a Networking support under MinGW.
diego
parents: 10242
diff changeset
466 mp_msg(MSGT_STREAM,MSGL_V,"WINSOCK2 uninit\n");
54bcbf28698a Networking support under MinGW.
diego
parents: 10242
diff changeset
467 WSACleanup(); // there might be a better place for this (-> later)
54bcbf28698a Networking support under MinGW.
diego
parents: 10242
diff changeset
468 #endif
9794
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
469 // 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
470 // streams should destroy their priv on close
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
471 //if(s->priv) free(s->priv);
f67d87b2d3c7 Stream modularization, the first step.
albeu
parents: 9787
diff changeset
472 if(s->url) free(s->url);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
473 free(s);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
474 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
475
5133
9841a86d66f9 Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents: 4893
diff changeset
476 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
477 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
478 s->priv = ds;
9841a86d66f9 Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents: 4893
diff changeset
479 return s;
9841a86d66f9 Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents: 4893
diff changeset
480 }
26326
5bfc1d8bece9 Remove the need for code using stream to export an mp_input_check_interrupt()
albeu
parents: 26007
diff changeset
481
5bfc1d8bece9 Remove the need for code using stream to export an mp_input_check_interrupt()
albeu
parents: 26007
diff changeset
482 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
483 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
484 }
5bfc1d8bece9 Remove the need for code using stream to export an mp_input_check_interrupt()
albeu
parents: 26007
diff changeset
485
5bfc1d8bece9 Remove the need for code using stream to export an mp_input_check_interrupt()
albeu
parents: 26007
diff changeset
486 int stream_check_interrupt(int time) {
5bfc1d8bece9 Remove the need for code using stream to export an mp_input_check_interrupt()
albeu
parents: 26007
diff changeset
487 if(!stream_check_interrupt_cb) return 0;
5bfc1d8bece9 Remove the need for code using stream to export an mp_input_check_interrupt()
albeu
parents: 26007
diff changeset
488 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
489 }
30754
dff9ee89b7c1 Move stream_read_line implementation from stream.h to stream.c,
reimar
parents: 30697
diff changeset
490
dff9ee89b7c1 Move stream_read_line implementation from stream.h to stream.c,
reimar
parents: 30697
diff changeset
491 unsigned char* stream_read_line(stream_t *s,unsigned char* mem, int max) {
dff9ee89b7c1 Move stream_read_line implementation from stream.h to stream.c,
reimar
parents: 30697
diff changeset
492 int len;
dff9ee89b7c1 Move stream_read_line implementation from stream.h to stream.c,
reimar
parents: 30697
diff changeset
493 unsigned char* end,*ptr = mem;
dff9ee89b7c1 Move stream_read_line implementation from stream.h to stream.c,
reimar
parents: 30697
diff changeset
494 if (max < 1) return NULL;
dff9ee89b7c1 Move stream_read_line implementation from stream.h to stream.c,
reimar
parents: 30697
diff changeset
495 max--; // reserve one for 0-termination
dff9ee89b7c1 Move stream_read_line implementation from stream.h to stream.c,
reimar
parents: 30697
diff changeset
496 do {
dff9ee89b7c1 Move stream_read_line implementation from stream.h to stream.c,
reimar
parents: 30697
diff changeset
497 len = s->buf_len-s->buf_pos;
dff9ee89b7c1 Move stream_read_line implementation from stream.h to stream.c,
reimar
parents: 30697
diff changeset
498 // try to fill the buffer
dff9ee89b7c1 Move stream_read_line implementation from stream.h to stream.c,
reimar
parents: 30697
diff changeset
499 if(len <= 0 &&
dff9ee89b7c1 Move stream_read_line implementation from stream.h to stream.c,
reimar
parents: 30697
diff changeset
500 (!cache_stream_fill_buffer(s) ||
dff9ee89b7c1 Move stream_read_line implementation from stream.h to stream.c,
reimar
parents: 30697
diff changeset
501 (len = s->buf_len-s->buf_pos) <= 0)) break;
dff9ee89b7c1 Move stream_read_line implementation from stream.h to stream.c,
reimar
parents: 30697
diff changeset
502 end = (unsigned char*) memchr((void*)(s->buffer+s->buf_pos),'\n',len);
dff9ee89b7c1 Move stream_read_line implementation from stream.h to stream.c,
reimar
parents: 30697
diff changeset
503 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
504 if(len > 0 && max > 0) {
dff9ee89b7c1 Move stream_read_line implementation from stream.h to stream.c,
reimar
parents: 30697
diff changeset
505 int l = len > max ? max : len;
dff9ee89b7c1 Move stream_read_line implementation from stream.h to stream.c,
reimar
parents: 30697
diff changeset
506 memcpy(ptr,s->buffer+s->buf_pos,l);
dff9ee89b7c1 Move stream_read_line implementation from stream.h to stream.c,
reimar
parents: 30697
diff changeset
507 max -= l;
dff9ee89b7c1 Move stream_read_line implementation from stream.h to stream.c,
reimar
parents: 30697
diff changeset
508 ptr += l;
dff9ee89b7c1 Move stream_read_line implementation from stream.h to stream.c,
reimar
parents: 30697
diff changeset
509 }
dff9ee89b7c1 Move stream_read_line implementation from stream.h to stream.c,
reimar
parents: 30697
diff changeset
510 s->buf_pos += len;
dff9ee89b7c1 Move stream_read_line implementation from stream.h to stream.c,
reimar
parents: 30697
diff changeset
511 } while(!end);
dff9ee89b7c1 Move stream_read_line implementation from stream.h to stream.c,
reimar
parents: 30697
diff changeset
512 if(s->eof && ptr == mem) return NULL;
dff9ee89b7c1 Move stream_read_line implementation from stream.h to stream.c,
reimar
parents: 30697
diff changeset
513 ptr[0] = 0;
dff9ee89b7c1 Move stream_read_line implementation from stream.h to stream.c,
reimar
parents: 30697
diff changeset
514 return mem;
dff9ee89b7c1 Move stream_read_line implementation from stream.h to stream.c,
reimar
parents: 30697
diff changeset
515 }