Mercurial > mplayer.hg
annotate libmpdemux/network.c @ 8653:5af3d90a8f6b
NetWM fs. switching cleanup
patch by Filip Kalinski <filon@pld.org.pl>
author | arpi |
---|---|
date | Mon, 30 Dec 2002 00:47:43 +0000 |
parents | 16af93c01dbf |
children | 50ffffd0bc18 |
rev | line source |
---|---|
903 | 1 /* |
2 * Network layer for MPlayer | |
3 * by Bertrand BAUDET <bertrand_baudet@yahoo.com> | |
4 * (C) 2001, MPlayer team. | |
5 */ | |
6 | |
1028 | 7 //#define DUMP2FILE |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
8 |
1430 | 9 #include <stdio.h> |
10 #include <stdlib.h> | |
11 #include <string.h> | |
833 | 12 #include <unistd.h> |
1430 | 13 |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
14 #include <errno.h> |
903 | 15 #include <ctype.h> |
833 | 16 |
2555
66837325b929
config.h cleanup, few things added to steram/demuxer headers
arpi
parents:
2489
diff
changeset
|
17 #include "config.h" |
66837325b929
config.h cleanup, few things added to steram/demuxer headers
arpi
parents:
2489
diff
changeset
|
18 |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
19 #include "stream.h" |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
20 #include "demuxer.h" |
4289
973c6912c586
Set the cache value if the network layer was able to compute it.
bertrand
parents:
4251
diff
changeset
|
21 #include "../cfgparser.h" |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
22 |
841 | 23 #include "network.h" |
903 | 24 #include "http.h" |
25 #include "url.h" | |
26 #include "asf.h" | |
6910
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6642
diff
changeset
|
27 #ifndef STREAMING_LIVE_DOT_COM |
3686
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
28 #include "rtp.h" |
6910
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6642
diff
changeset
|
29 #endif |
8570 | 30 #include "pnm.h" |
841 | 31 |
6466 | 32 #include "../version.h" |
33 | |
4121 | 34 extern int verbose; |
7867 | 35 extern int stream_cache_size; |
4121 | 36 |
7862
013c255225d8
mpdemux.c|h moved to libinput, mpdemux_check_interrupt() -> mp_input_check_interrupt()
arpi
parents:
7513
diff
changeset
|
37 extern int mp_input_check_interrupt(int time); |
013c255225d8
mpdemux.c|h moved to libinput, mpdemux_check_interrupt() -> mp_input_check_interrupt()
arpi
parents:
7513
diff
changeset
|
38 |
7953 | 39 int asf_streaming_start( stream_t *stream ); |
40 int rtsp_streaming_start( stream_t *stream ); | |
41 | |
6642
e47d54a2cfff
Retreive the bandwidth option from the command line.
bertrand
parents:
6570
diff
changeset
|
42 /* Variables for the command line option -user, -passwd & -bandwidth */ |
7867 | 43 char *network_username=NULL; |
44 char *network_password=NULL; | |
45 int network_bandwidth=0; | |
6558
b379b061ce50
Read username/password from the -user -pass command line options.
bertrand
parents:
6555
diff
changeset
|
46 |
b379b061ce50
Read username/password from the -user -pass command line options.
bertrand
parents:
6555
diff
changeset
|
47 |
3042 | 48 static struct { |
49 char *mime_type; | |
50 int demuxer_type; | |
51 } mime_type_table[] = { | |
52 // MP3 streaming, some MP3 streaming server answer with audio/mpeg | |
4729
f51bd827ed1c
fixed MP3 ICY detection, return detected file format for open_stream
alex
parents:
4652
diff
changeset
|
53 { "audio/mpeg", DEMUXER_TYPE_AUDIO }, |
3042 | 54 // MPEG streaming |
55 { "video/mpeg", DEMUXER_TYPE_MPEG_PS }, | |
6032 | 56 { "video/x-mpeg", DEMUXER_TYPE_MPEG_PS }, |
57 { "video/x-mpeg2", DEMUXER_TYPE_MPEG_PS }, | |
3042 | 58 // AVI ??? => video/x-msvideo |
59 { "video/x-msvideo", DEMUXER_TYPE_AVI }, | |
60 // MOV => video/quicktime | |
61 { "video/quicktime", DEMUXER_TYPE_MOV }, | |
62 // ASF | |
63 { "audio/x-ms-wax", DEMUXER_TYPE_ASF }, | |
64 { "audio/x-ms-wma", DEMUXER_TYPE_ASF }, | |
65 { "video/x-ms-asf", DEMUXER_TYPE_ASF }, | |
66 { "video/x-ms-afs", DEMUXER_TYPE_ASF }, | |
67 { "video/x-ms-wvx", DEMUXER_TYPE_ASF }, | |
68 { "video/x-ms-wmv", DEMUXER_TYPE_ASF }, | |
69 { "video/x-ms-wma", DEMUXER_TYPE_ASF }, | |
4783 | 70 // Playlists |
7393 | 71 { "video/x-ms-wmx", DEMUXER_TYPE_PLAYLIST }, |
4783 | 72 { "audio/x-scpls", DEMUXER_TYPE_PLAYLIST }, |
73 { "audio/x-mpegurl", DEMUXER_TYPE_PLAYLIST }, | |
6032 | 74 { "audio/x-pls", DEMUXER_TYPE_PLAYLIST }, |
75 // Real Media | |
8114
ba66375adb6f
Added OGG streaming support, patch from Balatoni Denes <pnis@coder.hu>
bertrand
parents:
8027
diff
changeset
|
76 { "audio/x-pn-realaudio", DEMUXER_TYPE_REAL }, |
ba66375adb6f
Added OGG streaming support, patch from Balatoni Denes <pnis@coder.hu>
bertrand
parents:
8027
diff
changeset
|
77 // OGG Streaming |
ba66375adb6f
Added OGG streaming support, patch from Balatoni Denes <pnis@coder.hu>
bertrand
parents:
8027
diff
changeset
|
78 { "application/x-ogg", DEMUXER_TYPE_OGG } |
ba66375adb6f
Added OGG streaming support, patch from Balatoni Denes <pnis@coder.hu>
bertrand
parents:
8027
diff
changeset
|
79 |
3042 | 80 }; |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
81 |
3042 | 82 static struct { |
83 char *extension; | |
84 int demuxer_type; | |
85 } extensions_table[] = { | |
86 { "mpeg", DEMUXER_TYPE_MPEG_PS }, | |
87 { "mpg", DEMUXER_TYPE_MPEG_PS }, | |
3072 | 88 { "mpe", DEMUXER_TYPE_MPEG_ES }, |
3042 | 89 { "avi", DEMUXER_TYPE_AVI }, |
90 { "mov", DEMUXER_TYPE_MOV }, | |
3072 | 91 { "qt", DEMUXER_TYPE_MOV }, |
3042 | 92 { "asx", DEMUXER_TYPE_ASF }, |
93 { "asf", DEMUXER_TYPE_ASF }, | |
94 { "wmv", DEMUXER_TYPE_ASF }, | |
95 { "wma", DEMUXER_TYPE_ASF }, | |
3072 | 96 { "viv", DEMUXER_TYPE_VIVO }, |
4236 | 97 { "rm", DEMUXER_TYPE_REAL }, |
6032 | 98 { "ra", DEMUXER_TYPE_REAL }, |
4236 | 99 { "y4m", DEMUXER_TYPE_Y4M }, |
4729
f51bd827ed1c
fixed MP3 ICY detection, return detected file format for open_stream
alex
parents:
4652
diff
changeset
|
100 { "mp3", DEMUXER_TYPE_AUDIO }, |
8114
ba66375adb6f
Added OGG streaming support, patch from Balatoni Denes <pnis@coder.hu>
bertrand
parents:
8027
diff
changeset
|
101 { "ogg", DEMUXER_TYPE_OGG }, |
4729
f51bd827ed1c
fixed MP3 ICY detection, return detected file format for open_stream
alex
parents:
4652
diff
changeset
|
102 { "wav", DEMUXER_TYPE_AUDIO }, |
4783 | 103 { "pls", DEMUXER_TYPE_PLAYLIST }, |
104 { "m3u", DEMUXER_TYPE_PLAYLIST } | |
3042 | 105 }; |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
106 |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
107 streaming_ctrl_t * |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
108 streaming_ctrl_new( ) { |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
109 streaming_ctrl_t *streaming_ctrl; |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
110 streaming_ctrl = (streaming_ctrl_t*)malloc(sizeof(streaming_ctrl_t)); |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
111 if( streaming_ctrl==NULL ) { |
5915 | 112 mp_msg(MSGT_NETWORK,MSGL_FATAL,"Failed to allocate memory\n"); |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
113 return NULL; |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
114 } |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
115 memset( streaming_ctrl, 0, sizeof(streaming_ctrl_t) ); |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
116 return streaming_ctrl; |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
117 } |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
118 |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
119 void |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
120 streaming_ctrl_free( streaming_ctrl_t *streaming_ctrl ) { |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
121 if( streaming_ctrl==NULL ) return; |
4251
05affdf4bdcd
Moved network related code from open.c to network.c
bertrand
parents:
4236
diff
changeset
|
122 if( streaming_ctrl->url ) url_free( streaming_ctrl->url ); |
05affdf4bdcd
Moved network related code from open.c to network.c
bertrand
parents:
4236
diff
changeset
|
123 if( streaming_ctrl->buffer ) free( streaming_ctrl->buffer ); |
05affdf4bdcd
Moved network related code from open.c to network.c
bertrand
parents:
4236
diff
changeset
|
124 if( streaming_ctrl->data ) free( streaming_ctrl->data ); |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
125 free( streaming_ctrl ); |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
126 } |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
127 |
6910
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6642
diff
changeset
|
128 #ifndef STREAMING_LIVE_DOT_COM |
3686
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
129 int |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
130 read_rtp_from_server(int fd, char *buffer, int length) { |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
131 struct rtpheader rh; |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
132 char *data; |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
133 int len; |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
134 static int got_first = 0; |
4553
bab3aac84143
ehh. i forgot to commit this patch: fix RTP streaming. patch by Dave Chapman <dave@dchapman.com>
arpi
parents:
4302
diff
changeset
|
135 static unsigned short sequence; |
3686
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
136 |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
137 if( buffer==NULL || length<0 ) return -1; |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
138 |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
139 getrtp2(fd, &rh, &data, &len); |
4553
bab3aac84143
ehh. i forgot to commit this patch: fix RTP streaming. patch by Dave Chapman <dave@dchapman.com>
arpi
parents:
4302
diff
changeset
|
140 if( got_first && rh.b.sequence != (unsigned short)(sequence+1) ) |
5915 | 141 mp_msg(MSGT_NETWORK,MSGL_ERR,"RTP packet sequence error! Expected: %d, received: %d\n", |
3686
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
142 sequence+1, rh.b.sequence); |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
143 got_first = 1; |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
144 sequence = rh.b.sequence; |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
145 memcpy(buffer, data, len); |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
146 return(len); |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
147 } |
6910
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6642
diff
changeset
|
148 #endif |
3686
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
149 |
903 | 150 // Connect to a server using a TCP connection |
7251
cc83ad6af513
Return -2 for fatal error while connecting to a server.
bertrand
parents:
7007
diff
changeset
|
151 // return -2 for fatal error, like unable to resolve name, connection timeout... |
cc83ad6af513
Return -2 for fatal error while connecting to a server.
bertrand
parents:
7007
diff
changeset
|
152 // return -1 is unable to connect to a particular port |
833 | 153 int |
154 connect2Server(char *host, int port) { | |
155 int socket_server_fd; | |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
156 int err, err_len; |
4825
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4817
diff
changeset
|
157 int ret,count = 0; |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
158 fd_set set; |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
159 struct timeval tv; |
833 | 160 struct sockaddr_in server_address; |
7953 | 161 struct hostent *hp=NULL; |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
162 |
833 | 163 socket_server_fd = socket(AF_INET, SOCK_STREAM, 0); |
164 if( socket_server_fd==-1 ) { | |
6454 | 165 mp_msg(MSGT_NETWORK,MSGL_ERR,"Failed to create socket\n"); |
7251
cc83ad6af513
Return -2 for fatal error while connecting to a server.
bertrand
parents:
7007
diff
changeset
|
166 return -2; |
833 | 167 } |
168 | |
169 if( isalpha(host[0]) ) { | |
7513 | 170 mp_msg(MSGT_NETWORK,MSGL_STATUS,"Resolving %s ...\n", host ); |
3042 | 171 hp=(struct hostent*)gethostbyname( host ); |
841 | 172 if( hp==NULL ) { |
5915 | 173 mp_msg(MSGT_NETWORK,MSGL_ERR,"Counldn't resolve name: %s\n", host); |
7251
cc83ad6af513
Return -2 for fatal error while connecting to a server.
bertrand
parents:
7007
diff
changeset
|
174 return -2; |
833 | 175 } |
841 | 176 memcpy( (void*)&server_address.sin_addr.s_addr, (void*)hp->h_addr, hp->h_length ); |
833 | 177 } else { |
178 inet_pton(AF_INET, host, &server_address.sin_addr); | |
179 } | |
180 server_address.sin_family=AF_INET; | |
181 server_address.sin_port=htons(port); | |
3042 | 182 |
183 // Turn the socket as non blocking so we can timeout on the connection | |
7953 | 184 if( isalpha(host[0]) && hp!=NULL ) { |
7513 | 185 mp_msg(MSGT_NETWORK,MSGL_STATUS,"Connecting to server %s[%d.%d.%d.%d]:%d ...\n", host, (hp->h_addr_list[0][0])&0xff, (hp->h_addr_list[0][1])&0xff, (hp->h_addr_list[0][2])&0xff, (hp->h_addr_list[0][3])&0xff, port ); |
186 } else { | |
187 mp_msg(MSGT_NETWORK,MSGL_STATUS,"Connecting to server %s:%d ...\n", host, port ); | |
188 } | |
3042 | 189 fcntl( socket_server_fd, F_SETFL, fcntl(socket_server_fd, F_GETFL) | O_NONBLOCK ); |
833 | 190 if( connect( socket_server_fd, (struct sockaddr*)&server_address, sizeof(server_address) )==-1 ) { |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
191 if( errno!=EINPROGRESS ) { |
6454 | 192 mp_msg(MSGT_NETWORK,MSGL_ERR,"Failed to connect to server\n"); |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
193 close(socket_server_fd); |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
194 return -1; |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
195 } |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
196 } |
6477 | 197 tv.tv_sec = 0; |
198 tv.tv_usec = 500000; | |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
199 FD_ZERO( &set ); |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
200 FD_SET( socket_server_fd, &set ); |
3042 | 201 // When the connection will be made, we will have a writable fd |
4825
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4817
diff
changeset
|
202 while((ret = select(socket_server_fd+1, NULL, &set, NULL, &tv)) == 0) { |
6454 | 203 if( ret<0 ) mp_msg(MSGT_NETWORK,MSGL_ERR,"select failed\n"); |
4825
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4817
diff
changeset
|
204 else if(ret > 0) break; |
7862
013c255225d8
mpdemux.c|h moved to libinput, mpdemux_check_interrupt() -> mp_input_check_interrupt()
arpi
parents:
7513
diff
changeset
|
205 else if(count > 30 || mp_input_check_interrupt(500)) { |
6477 | 206 if(count > 30) |
5915 | 207 mp_msg(MSGT_NETWORK,MSGL_ERR,"Connection timeout\n"); |
4825
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4817
diff
changeset
|
208 else |
5915 | 209 mp_msg(MSGT_NETWORK,MSGL_V,"Connection interuppted by user\n"); |
7251
cc83ad6af513
Return -2 for fatal error while connecting to a server.
bertrand
parents:
7007
diff
changeset
|
210 return -2; |
4825
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4817
diff
changeset
|
211 } |
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4817
diff
changeset
|
212 count++; |
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4817
diff
changeset
|
213 FD_ZERO( &set ); |
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4817
diff
changeset
|
214 FD_SET( socket_server_fd, &set ); |
6477 | 215 tv.tv_sec = 0; |
216 tv.tv_usec = 500000; | |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
217 } |
3042 | 218 |
219 // Turn back the socket as blocking | |
220 fcntl( socket_server_fd, F_SETFL, fcntl(socket_server_fd, F_GETFL) & ~O_NONBLOCK ); | |
3494
fb9de639ed30
Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents:
3453
diff
changeset
|
221 // Check if there were any error |
fb9de639ed30
Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents:
3453
diff
changeset
|
222 err_len = sizeof(int); |
fb9de639ed30
Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents:
3453
diff
changeset
|
223 ret = getsockopt(socket_server_fd,SOL_SOCKET,SO_ERROR,&err,&err_len); |
fb9de639ed30
Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents:
3453
diff
changeset
|
224 if(ret < 0) { |
5915 | 225 mp_msg(MSGT_NETWORK,MSGL_ERR,"getsockopt failed : %s\n",strerror(errno)); |
7251
cc83ad6af513
Return -2 for fatal error while connecting to a server.
bertrand
parents:
7007
diff
changeset
|
226 return -2; |
3494
fb9de639ed30
Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents:
3453
diff
changeset
|
227 } |
fb9de639ed30
Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents:
3453
diff
changeset
|
228 if(err > 0) { |
5915 | 229 mp_msg(MSGT_NETWORK,MSGL_ERR,"Connect error : %s\n",strerror(err)); |
3494
fb9de639ed30
Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents:
3453
diff
changeset
|
230 return -1; |
fb9de639ed30
Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents:
3453
diff
changeset
|
231 } |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
232 return socket_server_fd; |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
233 } |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
234 |
4146
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
235 URL_t* |
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
236 check4proxies( URL_t *url ) { |
4652 | 237 URL_t *url_out = NULL; |
4251
05affdf4bdcd
Moved network related code from open.c to network.c
bertrand
parents:
4236
diff
changeset
|
238 if( url==NULL ) return NULL; |
4652 | 239 url_out = url_new( url->url ); |
4146
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
240 if( !strcasecmp(url->protocol, "http_proxy") ) { |
5915 | 241 mp_msg(MSGT_NETWORK,MSGL_V,"Using HTTP proxy: http://%s:%d\n", url->hostname, url->port ); |
4652 | 242 return url_out; |
4146
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
243 } |
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
244 // Check if the http_proxy environment variable is set. |
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
245 if( !strcasecmp(url->protocol, "http") ) { |
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
246 char *proxy; |
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
247 proxy = getenv("http_proxy"); |
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
248 if( proxy!=NULL ) { |
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
249 // We got a proxy, build the URL to use it |
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
250 int len; |
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
251 char *new_url; |
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
252 URL_t *tmp_url; |
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
253 URL_t *proxy_url = url_new( proxy ); |
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
254 |
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
255 if( proxy_url==NULL ) { |
5915 | 256 mp_msg(MSGT_NETWORK,MSGL_WARN,"Invalid proxy setting...Trying without proxy.\n"); |
4652 | 257 return url_out; |
4146
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
258 } |
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
259 |
5915 | 260 mp_msg(MSGT_NETWORK,MSGL_V,"Using HTTP proxy: %s\n", proxy_url->url ); |
4146
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
261 len = strlen( proxy_url->hostname ) + strlen( url->url ) + 20; // 20 = http_proxy:// + port |
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
262 new_url = malloc( len+1 ); |
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
263 if( new_url==NULL ) { |
5915 | 264 mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed\n"); |
4652 | 265 return url_out; |
4146
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
266 } |
5915 | 267 sprintf(new_url, "http_proxy://%s:%d/%s", proxy_url->hostname, proxy_url->port, url->url ); |
4146
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
268 tmp_url = url_new( new_url ); |
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
269 if( tmp_url==NULL ) { |
4652 | 270 return url_out; |
4146
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
271 } |
4652 | 272 url_free( url_out ); |
273 url_out = tmp_url; | |
4146
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
274 free( new_url ); |
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
275 url_free( proxy_url ); |
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
276 } |
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
277 } |
4652 | 278 return url_out; |
4146
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
279 } |
925046ea34ec
Added support for the environment variable http_proxy.
bertrand
parents:
4145
diff
changeset
|
280 |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
281 int |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
282 http_send_request( URL_t *url ) { |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
283 HTTP_header_t *http_hdr; |
4121 | 284 URL_t *server_url; |
3585 | 285 char str[80]; |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
286 int fd; |
4121 | 287 int ret; |
288 int proxy = 0; // Boolean | |
289 | |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
290 http_hdr = http_new_header(); |
4121 | 291 |
4145 | 292 if( !strcasecmp(url->protocol, "http_proxy") ) { |
4121 | 293 proxy = 1; |
294 server_url = url_new( (url->file)+1 ); | |
295 http_set_uri( http_hdr, server_url->url ); | |
296 } else { | |
297 server_url = url; | |
298 http_set_uri( http_hdr, server_url->file ); | |
299 } | |
300 snprintf(str, 80, "Host: %s", server_url->hostname ); | |
3585 | 301 http_set_field( http_hdr, str); |
6466 | 302 http_set_field( http_hdr, "User-Agent: MPlayer/"VERSION); |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
303 http_set_field( http_hdr, "Connection: closed"); |
6515 | 304 http_add_basic_authentication( http_hdr, url->username, url->password ); |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
305 if( http_build_request( http_hdr )==NULL ) { |
841 | 306 return -1; |
833 | 307 } |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
308 |
4121 | 309 if( proxy ) { |
310 if( url->port==0 ) url->port = 8080; // Default port for the proxy server | |
311 fd = connect2Server( url->hostname, url->port ); | |
312 url_free( server_url ); | |
313 } else { | |
314 if( server_url->port==0 ) server_url->port = 80; // Default port for the web server | |
315 fd = connect2Server( server_url->hostname, server_url->port ); | |
316 } | |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
317 if( fd<0 ) { |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
318 return -1; |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
319 } |
5915 | 320 mp_msg(MSGT_NETWORK,MSGL_DBG2,"Request: [%s]\n", http_hdr->buffer ); |
4121 | 321 |
322 ret = write( fd, http_hdr->buffer, http_hdr->buffer_size ); | |
7953 | 323 if( ret!=(int)http_hdr->buffer_size ) { |
5915 | 324 mp_msg(MSGT_NETWORK,MSGL_ERR,"Error while sending HTTP request: didn't sent all the request\n"); |
4121 | 325 return -1; |
326 } | |
327 | |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
328 http_free( http_hdr ); |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
329 |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
330 return fd; |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
331 } |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
332 |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
333 HTTP_header_t * |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
334 http_read_response( int fd ) { |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
335 HTTP_header_t *http_hdr; |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
336 char response[BUFFER_SIZE]; |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
337 int i; |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
338 |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
339 http_hdr = http_new_header(); |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
340 if( http_hdr==NULL ) { |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
341 return NULL; |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
342 } |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
343 |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
344 do { |
3042 | 345 i = read( fd, response, BUFFER_SIZE ); |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
346 if( i<0 ) { |
5915 | 347 mp_msg(MSGT_NETWORK,MSGL_ERR,"Read failed\n"); |
3365 | 348 http_free( http_hdr ); |
349 return NULL; | |
350 } | |
351 if( i==0 ) { | |
5915 | 352 mp_msg(MSGT_NETWORK,MSGL_ERR,"http_read_response read 0 -ie- EOF\n"); |
3365 | 353 http_free( http_hdr ); |
354 return NULL; | |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
355 } |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
356 http_response_append( http_hdr, response, i ); |
2489
0ecc1b4f7cf8
Added ASF http server streaming (Not mms streaming).
bertrand
parents:
2310
diff
changeset
|
357 } while( !http_is_header_entire( http_hdr ) ); |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
358 http_response_parse( http_hdr ); |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
359 return http_hdr; |
833 | 360 } |
361 | |
6555 | 362 int |
363 http_authenticate(HTTP_header_t *http_hdr, URL_t *url, int *auth_retry) { | |
364 char *aut; | |
7953 | 365 |
6558
b379b061ce50
Read username/password from the -user -pass command line options.
bertrand
parents:
6555
diff
changeset
|
366 if( *auth_retry==1 ) { |
6555 | 367 mp_msg(MSGT_NETWORK,MSGL_ERR,"Authentication failed\n"); |
6570
52ecfeddf864
Changed the -pass option to -passwd to avoid clash with mencoder option.
bertrand
parents:
6558
diff
changeset
|
368 mp_msg(MSGT_NETWORK,MSGL_ERR,"Please use the option -user and -passwd to provide your username/password for a list of URLs,\n"); |
6558
b379b061ce50
Read username/password from the -user -pass command line options.
bertrand
parents:
6555
diff
changeset
|
369 mp_msg(MSGT_NETWORK,MSGL_ERR,"or form an URL like: http://username:password@hostname/file\n"); |
6555 | 370 return -1; |
371 } | |
372 if( *auth_retry>0 ) { | |
373 if( url->username ) { | |
374 free( url->username ); | |
375 url->username = NULL; | |
376 } | |
377 if( url->password ) { | |
378 free( url->password ); | |
379 url->password = NULL; | |
380 } | |
381 } | |
6558
b379b061ce50
Read username/password from the -user -pass command line options.
bertrand
parents:
6555
diff
changeset
|
382 |
6555 | 383 aut = http_get_field(http_hdr, "WWW-Authenticate"); |
384 if( aut!=NULL ) { | |
385 char *aut_space; | |
386 aut_space = strstr(aut, "realm="); | |
387 if( aut_space!=NULL ) aut_space += 6; | |
6558
b379b061ce50
Read username/password from the -user -pass command line options.
bertrand
parents:
6555
diff
changeset
|
388 mp_msg(MSGT_NETWORK,MSGL_INFO,"Authentication required for %s\n", aut_space); |
6555 | 389 } else { |
6558
b379b061ce50
Read username/password from the -user -pass command line options.
bertrand
parents:
6555
diff
changeset
|
390 mp_msg(MSGT_NETWORK,MSGL_INFO,"Authentication required\n"); |
6555 | 391 } |
7867 | 392 if( network_username ) { |
393 url->username = strdup(network_username); | |
6555 | 394 if( url->username==NULL ) { |
395 mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed\n"); | |
396 return -1; | |
397 } | |
398 } else { | |
6558
b379b061ce50
Read username/password from the -user -pass command line options.
bertrand
parents:
6555
diff
changeset
|
399 mp_msg(MSGT_NETWORK,MSGL_ERR,"Unable to read the username\n"); |
6570
52ecfeddf864
Changed the -pass option to -passwd to avoid clash with mencoder option.
bertrand
parents:
6558
diff
changeset
|
400 mp_msg(MSGT_NETWORK,MSGL_ERR,"Please use the option -user and -passwd to provide your username/password for a list of URLs,\n"); |
6558
b379b061ce50
Read username/password from the -user -pass command line options.
bertrand
parents:
6555
diff
changeset
|
401 mp_msg(MSGT_NETWORK,MSGL_ERR,"or form an URL like: http://username:password@hostname/file\n"); |
6555 | 402 return -1; |
403 } | |
7867 | 404 if( network_password ) { |
405 url->password = strdup(network_password); | |
6558
b379b061ce50
Read username/password from the -user -pass command line options.
bertrand
parents:
6555
diff
changeset
|
406 if( url->password==NULL ) { |
b379b061ce50
Read username/password from the -user -pass command line options.
bertrand
parents:
6555
diff
changeset
|
407 mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed\n"); |
b379b061ce50
Read username/password from the -user -pass command line options.
bertrand
parents:
6555
diff
changeset
|
408 return -1; |
b379b061ce50
Read username/password from the -user -pass command line options.
bertrand
parents:
6555
diff
changeset
|
409 } |
b379b061ce50
Read username/password from the -user -pass command line options.
bertrand
parents:
6555
diff
changeset
|
410 } else { |
b379b061ce50
Read username/password from the -user -pass command line options.
bertrand
parents:
6555
diff
changeset
|
411 mp_msg(MSGT_NETWORK,MSGL_INFO,"No password provided, trying blank password\n"); |
b379b061ce50
Read username/password from the -user -pass command line options.
bertrand
parents:
6555
diff
changeset
|
412 } |
6555 | 413 (*auth_retry)++; |
414 return 0; | |
415 } | |
416 | |
903 | 417 // By using the protocol, the extension of the file or the content-type |
418 // we might be able to guess the streaming type. | |
419 int | |
4046
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
420 autodetectProtocol(streaming_ctrl_t *streaming_ctrl, int *fd_out, int *file_format) { |
903 | 421 HTTP_header_t *http_hdr; |
4652 | 422 unsigned int i; |
903 | 423 int fd=-1; |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
424 int redirect; |
6516
351790e49eff
Improved the authentication interaction. Still need to replace scanf.
bertrand
parents:
6515
diff
changeset
|
425 int auth_retry=0; |
903 | 426 char *extension; |
427 char *content_type; | |
428 char *next_url; | |
429 | |
4046
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
430 URL_t *url = streaming_ctrl->url; |
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
431 *file_format = DEMUXER_TYPE_UNKNOWN; |
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
432 |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
433 do { |
4046
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
434 *fd_out = -1; |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
435 next_url = NULL; |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
436 extension = NULL; |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
437 content_type = NULL; |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
438 redirect = 0; |
903 | 439 |
4046
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
440 if( url==NULL ) { |
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
441 return -1; |
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
442 } |
903 | 443 |
8570 | 444 // Checking for PNM:// |
445 if( !strcasecmp(url->protocol, "pnm") ) { | |
446 *file_format = DEMUXER_TYPE_REAL; | |
447 return 0; | |
448 } | |
449 | |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
450 // Get the extension of the file if present |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
451 if( url->file!=NULL ) { |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
452 for( i=strlen(url->file) ; i>0 ; i-- ) { |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
453 if( url->file[i]=='.' ) { |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
454 extension=(url->file)+i+1; |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
455 break; |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
456 } |
903 | 457 } |
458 } | |
3042 | 459 extension=NULL; |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
460 if( extension!=NULL ) { |
5915 | 461 mp_msg(MSGT_NETWORK,MSGL_DBG2,"Extension: %s\n", extension ); |
3042 | 462 // Look for the extension in the extensions table |
463 for( i=0 ; i<(sizeof(extensions_table)/sizeof(extensions_table[0])) ; i++ ) { | |
464 if( !strcasecmp(extension, extensions_table[i].extension) ) { | |
4046
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
465 *file_format = extensions_table[i].demuxer_type; |
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
466 return 0; |
3042 | 467 } |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
468 } |
903 | 469 } |
470 | |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
471 // Checking for RTSP |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
472 if( !strcasecmp(url->protocol, "rtsp") ) { |
6910
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6642
diff
changeset
|
473 #ifdef STREAMING_LIVE_DOT_COM |
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6642
diff
changeset
|
474 *file_format = DEMUXER_TYPE_RTP; |
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6642
diff
changeset
|
475 return 0; |
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6642
diff
changeset
|
476 #else |
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6642
diff
changeset
|
477 mp_msg(MSGT_NETWORK,MSGL_ERR,"RTSP protocol support requires the \"LIVE.COM Streaming Media\" libraries!\n"); |
4046
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
478 return -1; |
6910
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6642
diff
changeset
|
479 #endif |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
480 } |
903 | 481 |
6910
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6642
diff
changeset
|
482 #ifndef STREAMING_LIVE_DOT_COM |
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6642
diff
changeset
|
483 // Old, hacked RTP support, which works for MPEG Program Streams |
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6642
diff
changeset
|
484 // RTP streams only: |
3686
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
485 // Checking for RTP |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
486 if( !strcasecmp(url->protocol, "rtp") ) { |
4046
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
487 if( url->port==0 ) { |
5915 | 488 mp_msg(MSGT_NETWORK,MSGL_ERR,"You must enter a port number for RTP streams!\n"); |
4046
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
489 return -1; |
3686
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
490 } |
4553
bab3aac84143
ehh. i forgot to commit this patch: fix RTP streaming. patch by Dave Chapman <dave@dchapman.com>
arpi
parents:
4302
diff
changeset
|
491 return 0; |
3686
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
492 } |
6910
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6642
diff
changeset
|
493 #endif |
3686
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
494 |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
495 // Checking for ASF |
3453
10577da4a7b1
Added a data field in the streaming_ctrl_t struct, to store any
bertrand
parents:
3424
diff
changeset
|
496 if( !strncasecmp(url->protocol, "mms", 3) ) { |
4046
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
497 *file_format = DEMUXER_TYPE_ASF; |
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
498 return 0; |
903 | 499 } |
500 | |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
501 // HTTP based protocol |
4145 | 502 if( !strcasecmp(url->protocol, "http") || !strcasecmp(url->protocol, "http_proxy") ) { |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
503 fd = http_send_request( url ); |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
504 if( fd<0 ) { |
4046
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
505 return -1; |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
506 } |
903 | 507 |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
508 http_hdr = http_read_response( fd ); |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
509 if( http_hdr==NULL ) { |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
510 close( fd ); |
3042 | 511 http_free( http_hdr ); |
4046
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
512 return -1; |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
513 } |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
514 |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
515 *fd_out=fd; |
8027 | 516 if( verbose>0 ) { |
4121 | 517 http_debug_hdr( http_hdr ); |
518 } | |
519 | |
4046
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
520 streaming_ctrl->data = (void*)http_hdr; |
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
521 |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
522 // Check if the response is an ICY status_code reason_phrase |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
523 if( !strcasecmp(http_hdr->protocol, "ICY") ) { |
5868
ad8124c9d462
Add some info prints to ICY code and handle return codes ICY specific, also avoid printing
atmos4
parents:
5867
diff
changeset
|
524 switch( http_hdr->status_code ) { |
ad8124c9d462
Add some info prints to ICY code and handle return codes ICY specific, also avoid printing
atmos4
parents:
5867
diff
changeset
|
525 case 200: { // OK |
ad8124c9d462
Add some info prints to ICY code and handle return codes ICY specific, also avoid printing
atmos4
parents:
5867
diff
changeset
|
526 char *field_data = NULL; |
ad8124c9d462
Add some info prints to ICY code and handle return codes ICY specific, also avoid printing
atmos4
parents:
5867
diff
changeset
|
527 // note: I skip icy-notice1 and 2, as they contain html <BR> |
ad8124c9d462
Add some info prints to ICY code and handle return codes ICY specific, also avoid printing
atmos4
parents:
5867
diff
changeset
|
528 // and are IMHO useless info ::atmos |
ad8124c9d462
Add some info prints to ICY code and handle return codes ICY specific, also avoid printing
atmos4
parents:
5867
diff
changeset
|
529 if( (field_data = http_get_field(http_hdr, "icy-name")) != NULL ) |
5915 | 530 mp_msg(MSGT_NETWORK,MSGL_INFO,"Name : %s\n", field_data); field_data = NULL; |
5868
ad8124c9d462
Add some info prints to ICY code and handle return codes ICY specific, also avoid printing
atmos4
parents:
5867
diff
changeset
|
531 if( (field_data = http_get_field(http_hdr, "icy-genre")) != NULL ) |
5915 | 532 mp_msg(MSGT_NETWORK,MSGL_INFO,"Genre : %s\n", field_data); field_data = NULL; |
5868
ad8124c9d462
Add some info prints to ICY code and handle return codes ICY specific, also avoid printing
atmos4
parents:
5867
diff
changeset
|
533 if( (field_data = http_get_field(http_hdr, "icy-url")) != NULL ) |
5915 | 534 mp_msg(MSGT_NETWORK,MSGL_INFO,"Website: %s\n", field_data); field_data = NULL; |
5868
ad8124c9d462
Add some info prints to ICY code and handle return codes ICY specific, also avoid printing
atmos4
parents:
5867
diff
changeset
|
535 // XXX: does this really mean public server? ::atmos |
ad8124c9d462
Add some info prints to ICY code and handle return codes ICY specific, also avoid printing
atmos4
parents:
5867
diff
changeset
|
536 if( (field_data = http_get_field(http_hdr, "icy-pub")) != NULL ) |
5915 | 537 mp_msg(MSGT_NETWORK,MSGL_INFO,"Public : %s\n", atoi(field_data)?"yes":"no"); field_data = NULL; |
5868
ad8124c9d462
Add some info prints to ICY code and handle return codes ICY specific, also avoid printing
atmos4
parents:
5867
diff
changeset
|
538 if( (field_data = http_get_field(http_hdr, "icy-br")) != NULL ) |
5915 | 539 mp_msg(MSGT_NETWORK,MSGL_INFO,"Bitrate: %skbit/s\n", field_data); field_data = NULL; |
5868
ad8124c9d462
Add some info prints to ICY code and handle return codes ICY specific, also avoid printing
atmos4
parents:
5867
diff
changeset
|
540 // Ok, we have detected an mp3 stream |
ad8124c9d462
Add some info prints to ICY code and handle return codes ICY specific, also avoid printing
atmos4
parents:
5867
diff
changeset
|
541 *file_format = DEMUXER_TYPE_AUDIO; |
ad8124c9d462
Add some info prints to ICY code and handle return codes ICY specific, also avoid printing
atmos4
parents:
5867
diff
changeset
|
542 return 0; |
ad8124c9d462
Add some info prints to ICY code and handle return codes ICY specific, also avoid printing
atmos4
parents:
5867
diff
changeset
|
543 } |
5916 | 544 case 400: // Server Full |
545 mp_msg(MSGT_NETWORK,MSGL_ERR,"Error: ICY-Server is full, skipping!\n"); | |
546 return -1; | |
5892 | 547 case 401: // Service Unavailable |
5915 | 548 mp_msg(MSGT_NETWORK,MSGL_ERR,"Error: ICY-Server return service unavailable, skipping!\n"); |
5892 | 549 return -1; |
5868
ad8124c9d462
Add some info prints to ICY code and handle return codes ICY specific, also avoid printing
atmos4
parents:
5867
diff
changeset
|
550 case 404: // Resource Not Found |
5915 | 551 mp_msg(MSGT_NETWORK,MSGL_ERR,"Error: ICY-Server couldn't find requested stream, skipping!\n"); |
5868
ad8124c9d462
Add some info prints to ICY code and handle return codes ICY specific, also avoid printing
atmos4
parents:
5867
diff
changeset
|
552 return -1; |
ad8124c9d462
Add some info prints to ICY code and handle return codes ICY specific, also avoid printing
atmos4
parents:
5867
diff
changeset
|
553 default: |
5915 | 554 mp_msg(MSGT_NETWORK,MSGL_ERR,"Error: unhandled ICY-Errorcode, contact MPlayer developers!\n"); |
5868
ad8124c9d462
Add some info prints to ICY code and handle return codes ICY specific, also avoid printing
atmos4
parents:
5867
diff
changeset
|
555 return -1; |
ad8124c9d462
Add some info prints to ICY code and handle return codes ICY specific, also avoid printing
atmos4
parents:
5867
diff
changeset
|
556 } |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
557 } |
5868
ad8124c9d462
Add some info prints to ICY code and handle return codes ICY specific, also avoid printing
atmos4
parents:
5867
diff
changeset
|
558 |
ad8124c9d462
Add some info prints to ICY code and handle return codes ICY specific, also avoid printing
atmos4
parents:
5867
diff
changeset
|
559 // Assume standard http if not ICY |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
560 switch( http_hdr->status_code ) { |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
561 case 200: // OK |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
562 // Look if we can use the Content-Type |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
563 content_type = http_get_field( http_hdr, "Content-Type" ); |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
564 if( content_type!=NULL ) { |
5868
ad8124c9d462
Add some info prints to ICY code and handle return codes ICY specific, also avoid printing
atmos4
parents:
5867
diff
changeset
|
565 char *content_length = NULL; |
5915 | 566 mp_msg(MSGT_NETWORK,MSGL_V,"Content-Type: [%s]\n", content_type ); |
5868
ad8124c9d462
Add some info prints to ICY code and handle return codes ICY specific, also avoid printing
atmos4
parents:
5867
diff
changeset
|
567 if( (content_length = http_get_field(http_hdr, "Content-Length")) != NULL) |
5915 | 568 mp_msg(MSGT_NETWORK,MSGL_V,"Content-Length: [%s]\n", http_get_field(http_hdr, "Content-Length")); |
3042 | 569 // Check in the mime type table for a demuxer type |
570 for( i=0 ; i<(sizeof(mime_type_table)/sizeof(mime_type_table[0])) ; i++ ) { | |
571 if( !strcasecmp( content_type, mime_type_table[i].mime_type ) ) { | |
4046
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
572 *file_format = mime_type_table[i].demuxer_type; |
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
573 return 0; |
3042 | 574 } |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
575 } |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
576 } |
4817
1e46f40dcd0e
Handle HTTP OK response that doesn't contain a mime-type.
bertrand
parents:
4802
diff
changeset
|
577 // Not found in the mime type table, don't fail, |
1e46f40dcd0e
Handle HTTP OK response that doesn't contain a mime-type.
bertrand
parents:
4802
diff
changeset
|
578 // we should try raw HTTP |
1e46f40dcd0e
Handle HTTP OK response that doesn't contain a mime-type.
bertrand
parents:
4802
diff
changeset
|
579 return 0; |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
580 // Redirect |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
581 case 301: // Permanently |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
582 case 302: // Temporarily |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
583 // TODO: RFC 2616, recommand to detect infinite redirection loops |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
584 next_url = http_get_field( http_hdr, "Location" ); |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
585 if( next_url!=NULL ) { |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
586 close( fd ); |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
587 url_free( url ); |
4802 | 588 streaming_ctrl->url = url = url_new( next_url ); |
4046
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
589 http_free( http_hdr ); |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
590 redirect = 1; |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
591 } |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
592 break; |
6558
b379b061ce50
Read username/password from the -user -pass command line options.
bertrand
parents:
6555
diff
changeset
|
593 case 401: // Authentication required |
6555 | 594 if( http_authenticate(http_hdr, url, &auth_retry)<0 ) return -1; |
6515 | 595 redirect = 1; |
596 break; | |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
597 default: |
5915 | 598 mp_msg(MSGT_NETWORK,MSGL_ERR,"Server returned %d: %s\n", http_hdr->status_code, http_hdr->reason_phrase ); |
4046
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
599 return -1; |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
600 } |
3453
10577da4a7b1
Added a data field in the streaming_ctrl_t struct, to store any
bertrand
parents:
3424
diff
changeset
|
601 } else { |
5915 | 602 mp_msg(MSGT_NETWORK,MSGL_ERR,"Unknown protocol '%s'\n", url->protocol ); |
4046
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
603 return -1; |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
604 } |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
605 } while( redirect ); |
903 | 606 |
4046
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
607 return -1; |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
608 } |
903 | 609 |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
610 int |
3042 | 611 streaming_bufferize( streaming_ctrl_t *streaming_ctrl, char *buffer, int size) { |
4251
05affdf4bdcd
Moved network related code from open.c to network.c
bertrand
parents:
4236
diff
changeset
|
612 //printf("streaming_bufferize\n"); |
3042 | 613 streaming_ctrl->buffer = (char*)malloc(size); |
614 if( streaming_ctrl->buffer==NULL ) { | |
5915 | 615 mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed\n"); |
3042 | 616 return -1; |
617 } | |
618 memcpy( streaming_ctrl->buffer, buffer, size ); | |
619 streaming_ctrl->buffer_size = size; | |
3599 | 620 return size; |
3042 | 621 } |
622 | |
623 int | |
624 nop_streaming_read( int fd, char *buffer, int size, streaming_ctrl_t *stream_ctrl ) { | |
625 int len=0; | |
626 //printf("nop_streaming_read\n"); | |
627 if( stream_ctrl->buffer_size!=0 ) { | |
628 int buffer_len = stream_ctrl->buffer_size-stream_ctrl->buffer_pos; | |
4251
05affdf4bdcd
Moved network related code from open.c to network.c
bertrand
parents:
4236
diff
changeset
|
629 //printf("%d bytes in buffer\n", stream_ctrl->buffer_size); |
3042 | 630 len = (size<buffer_len)?size:buffer_len; |
631 memcpy( buffer, (stream_ctrl->buffer)+(stream_ctrl->buffer_pos), len ); | |
632 stream_ctrl->buffer_pos += len; | |
4251
05affdf4bdcd
Moved network related code from open.c to network.c
bertrand
parents:
4236
diff
changeset
|
633 //printf("buffer_pos = %d\n", stream_ctrl->buffer_pos ); |
3042 | 634 if( stream_ctrl->buffer_pos>=stream_ctrl->buffer_size ) { |
635 free( stream_ctrl->buffer ); | |
636 stream_ctrl->buffer = NULL; | |
637 stream_ctrl->buffer_size = 0; | |
638 stream_ctrl->buffer_pos = 0; | |
4251
05affdf4bdcd
Moved network related code from open.c to network.c
bertrand
parents:
4236
diff
changeset
|
639 //printf("buffer cleaned\n"); |
3042 | 640 } |
4251
05affdf4bdcd
Moved network related code from open.c to network.c
bertrand
parents:
4236
diff
changeset
|
641 //printf("read %d bytes from buffer\n", len ); |
3042 | 642 } |
643 | |
644 if( len<size ) { | |
3365 | 645 int ret; |
646 ret = read( fd, buffer+len, size-len ); | |
3494
fb9de639ed30
Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents:
3453
diff
changeset
|
647 if( ret<0 ) { |
5915 | 648 mp_msg(MSGT_NETWORK,MSGL_ERR,"nop_streaming_read error : %s\n",strerror(errno)); |
3365 | 649 } |
650 len += ret; | |
3042 | 651 //printf("read %d bytes from network\n", len ); |
652 } | |
653 | |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
654 return len; |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
655 } |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
656 |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
657 int |
3042 | 658 nop_streaming_seek( int fd, off_t pos, streaming_ctrl_t *stream_ctrl ) { |
659 return -1; | |
7953 | 660 // To shut up gcc warning |
661 fd++; | |
662 pos++; | |
663 stream_ctrl=NULL; | |
3042 | 664 } |
665 | |
666 int | |
667 nop_streaming_start( stream_t *stream ) { | |
4046
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
668 HTTP_header_t *http_hdr = NULL; |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
669 int fd; |
3042 | 670 if( stream==NULL ) return -1; |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
671 |
3042 | 672 fd = stream->fd; |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
673 if( fd<0 ) { |
3042 | 674 fd = http_send_request( stream->streaming_ctrl->url ); |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
675 if( fd<0 ) return -1; |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
676 http_hdr = http_read_response( fd ); |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
677 if( http_hdr==NULL ) return -1; |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
678 |
903 | 679 switch( http_hdr->status_code ) { |
680 case 200: // OK | |
5915 | 681 mp_msg(MSGT_NETWORK,MSGL_V,"Content-Type: [%s]\n", http_get_field(http_hdr, "Content-Type") ); |
682 mp_msg(MSGT_NETWORK,MSGL_V,"Content-Length: [%s]\n", http_get_field(http_hdr, "Content-Length") ); | |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
683 if( http_hdr->body_size>0 ) { |
3042 | 684 if( streaming_bufferize( stream->streaming_ctrl, http_hdr->body, http_hdr->body_size )<0 ) { |
685 http_free( http_hdr ); | |
686 return -1; | |
687 } | |
903 | 688 } |
689 break; | |
690 default: | |
5915 | 691 mp_msg(MSGT_NETWORK,MSGL_ERR,"Server return %d: %s\n", http_hdr->status_code, http_hdr->reason_phrase ); |
903 | 692 close( fd ); |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
693 fd = -1; |
903 | 694 } |
3042 | 695 stream->fd = fd; |
4046
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
696 } else { |
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
697 http_hdr = (HTTP_header_t*)stream->streaming_ctrl->data; |
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
698 if( http_hdr->body_size>0 ) { |
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
699 if( streaming_bufferize( stream->streaming_ctrl, http_hdr->body, http_hdr->body_size )<0 ) { |
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
700 http_free( http_hdr ); |
4251
05affdf4bdcd
Moved network related code from open.c to network.c
bertrand
parents:
4236
diff
changeset
|
701 stream->streaming_ctrl->data = NULL; |
4046
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
702 return -1; |
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
703 } |
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
704 } |
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
705 } |
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
706 |
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
707 if( http_hdr ) { |
3732 | 708 http_free( http_hdr ); |
4046
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
709 stream->streaming_ctrl->data = NULL; |
903 | 710 } |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
711 |
3042 | 712 stream->streaming_ctrl->streaming_read = nop_streaming_read; |
713 stream->streaming_ctrl->streaming_seek = nop_streaming_seek; | |
4730
330462dd5569
Changed the default prefill cache value for raw network input stream.
bertrand
parents:
4729
diff
changeset
|
714 stream->streaming_ctrl->prebuffer_size = 8192; // KBytes |
3042 | 715 stream->streaming_ctrl->buffering = 1; |
716 stream->streaming_ctrl->status = streaming_playing_e; | |
4072
eac2948c00d4
Applied RTP patch from Brian Kuschak <bkuschak@yahoo.com>
bertrand
parents:
4046
diff
changeset
|
717 return 0; |
903 | 718 } |
719 | |
8570 | 720 int |
721 pnm_streaming_read( int fd, char *buffer, int size, streaming_ctrl_t *stream_ctrl ) { | |
722 return pnm_read(stream_ctrl->data, buffer, size); | |
723 } | |
724 | |
725 | |
726 int | |
727 pnm_streaming_start( stream_t *stream ) { | |
728 int fd; | |
729 pnm_t *pnm; | |
730 if( stream==NULL ) return -1; | |
731 | |
732 fd = connect2Server( stream->streaming_ctrl->url->hostname, | |
733 stream->streaming_ctrl->url->port ? stream->streaming_ctrl->url->port : 7070 ); | |
734 printf("PNM:// fd=%d\n",fd); | |
735 if(fd<0) return -1; | |
736 | |
737 pnm = pnm_connect(fd,stream->streaming_ctrl->url->file); | |
738 if(!pnm) return -1; | |
739 | |
740 stream->fd=fd; | |
741 stream->streaming_ctrl->data=pnm; | |
742 | |
743 stream->streaming_ctrl->streaming_read = pnm_streaming_read; | |
744 // stream->streaming_ctrl->streaming_seek = nop_streaming_seek; | |
745 stream->streaming_ctrl->prebuffer_size = 128; // KBytes | |
746 stream->streaming_ctrl->buffering = 1; | |
747 stream->streaming_ctrl->status = streaming_playing_e; | |
748 return 0; | |
749 } | |
750 | |
751 | |
6910
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6642
diff
changeset
|
752 #ifndef STREAMING_LIVE_DOT_COM |
3686
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
753 // Start listening on a UDP port. If multicast, join the group. |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
754 int |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
755 rtp_open_socket( URL_t *url ) { |
4072
eac2948c00d4
Applied RTP patch from Brian Kuschak <bkuschak@yahoo.com>
bertrand
parents:
4046
diff
changeset
|
756 int socket_server_fd, rxsockbufsz; |
3686
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
757 int err, err_len; |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
758 fd_set set; |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
759 struct sockaddr_in server_address; |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
760 struct ip_mreq mcast; |
4553
bab3aac84143
ehh. i forgot to commit this patch: fix RTP streaming. patch by Dave Chapman <dave@dchapman.com>
arpi
parents:
4302
diff
changeset
|
761 struct timeval tv; |
3686
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
762 |
5915 | 763 mp_msg(MSGT_NETWORK,MSGL_V,"Listening for traffic on %s:%d ...\n", url->hostname, url->port ); |
3686
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
764 |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
765 socket_server_fd = socket(AF_INET, SOCK_DGRAM, 0); |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
766 // fcntl( socket_server_fd, F_SETFL, fcntl(socket_server_fd, F_GETFL) | O_NONBLOCK ); |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
767 if( socket_server_fd==-1 ) { |
6454 | 768 mp_msg(MSGT_NETWORK,MSGL_ERR,"Failed to create socket\n"); |
3686
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
769 return -1; |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
770 } |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
771 |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
772 if( isalpha(url->hostname[0]) ) { |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
773 struct hostent *hp =(struct hostent*)gethostbyname( url->hostname ); |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
774 if( hp==NULL ) { |
5915 | 775 mp_msg(MSGT_NETWORK,MSGL_ERR,"Counldn't resolve name: %s\n", url->hostname); |
3686
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
776 return -1; |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
777 } |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
778 memcpy( (void*)&server_address.sin_addr.s_addr, (void*)hp->h_addr, hp->h_length ); |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
779 } else { |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
780 inet_pton(AF_INET, url->hostname, &server_address.sin_addr); |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
781 } |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
782 server_address.sin_family=AF_INET; |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
783 server_address.sin_port=htons(url->port); |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
784 |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
785 if( bind( socket_server_fd, (struct sockaddr*)&server_address, sizeof(server_address) )==-1 ) { |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
786 if( errno!=EINPROGRESS ) { |
6454 | 787 mp_msg(MSGT_NETWORK,MSGL_ERR,"Failed to connect to server\n"); |
3686
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
788 close(socket_server_fd); |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
789 return -1; |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
790 } |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
791 } |
4072
eac2948c00d4
Applied RTP patch from Brian Kuschak <bkuschak@yahoo.com>
bertrand
parents:
4046
diff
changeset
|
792 |
eac2948c00d4
Applied RTP patch from Brian Kuschak <bkuschak@yahoo.com>
bertrand
parents:
4046
diff
changeset
|
793 // Increase the socket rx buffer size to maximum -- this is UDP |
eac2948c00d4
Applied RTP patch from Brian Kuschak <bkuschak@yahoo.com>
bertrand
parents:
4046
diff
changeset
|
794 rxsockbufsz = 240 * 1024; |
eac2948c00d4
Applied RTP patch from Brian Kuschak <bkuschak@yahoo.com>
bertrand
parents:
4046
diff
changeset
|
795 if( setsockopt( socket_server_fd, SOL_SOCKET, SO_RCVBUF, &rxsockbufsz, sizeof(rxsockbufsz))) { |
6454 | 796 mp_msg(MSGT_NETWORK,MSGL_ERR,"Couldn't set receive socket buffer size\n"); |
4072
eac2948c00d4
Applied RTP patch from Brian Kuschak <bkuschak@yahoo.com>
bertrand
parents:
4046
diff
changeset
|
797 } |
eac2948c00d4
Applied RTP patch from Brian Kuschak <bkuschak@yahoo.com>
bertrand
parents:
4046
diff
changeset
|
798 |
3686
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
799 if((ntohl(server_address.sin_addr.s_addr) >> 28) == 0xe) { |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
800 mcast.imr_multiaddr.s_addr = server_address.sin_addr.s_addr; |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
801 //mcast.imr_interface.s_addr = inet_addr("10.1.1.2"); |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
802 mcast.imr_interface.s_addr = 0; |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
803 if( setsockopt( socket_server_fd, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mcast, sizeof(mcast))) { |
6454 | 804 mp_msg(MSGT_NETWORK,MSGL_ERR,"IP_ADD_MEMBERSHIP failed (do you have multicasting enabled in your kernel?)\n"); |
3686
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
805 return -1; |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
806 } |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
807 } |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
808 |
4553
bab3aac84143
ehh. i forgot to commit this patch: fix RTP streaming. patch by Dave Chapman <dave@dchapman.com>
arpi
parents:
4302
diff
changeset
|
809 tv.tv_sec = 0; |
bab3aac84143
ehh. i forgot to commit this patch: fix RTP streaming. patch by Dave Chapman <dave@dchapman.com>
arpi
parents:
4302
diff
changeset
|
810 tv.tv_usec = (1 * 1000000); // 1 second timeout |
3686
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
811 FD_ZERO( &set ); |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
812 FD_SET( socket_server_fd, &set ); |
4553
bab3aac84143
ehh. i forgot to commit this patch: fix RTP streaming. patch by Dave Chapman <dave@dchapman.com>
arpi
parents:
4302
diff
changeset
|
813 if( select(socket_server_fd+1, &set, NULL, NULL, &tv)>0 ) { |
bab3aac84143
ehh. i forgot to commit this patch: fix RTP streaming. patch by Dave Chapman <dave@dchapman.com>
arpi
parents:
4302
diff
changeset
|
814 //if( select(socket_server_fd+1, &set, NULL, NULL, NULL)>0 ) { |
3686
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
815 err_len = sizeof( err ); |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
816 getsockopt( socket_server_fd, SOL_SOCKET, SO_ERROR, &err, &err_len ); |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
817 if( err ) { |
5915 | 818 mp_msg(MSGT_NETWORK,MSGL_ERR,"Timeout! No data from host %s\n", url->hostname ); |
819 mp_msg(MSGT_NETWORK,MSGL_DBG2,"Socket error: %d\n", err ); | |
3686
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
820 close(socket_server_fd); |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
821 return -1; |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
822 } |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
823 } |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
824 return socket_server_fd; |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
825 } |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
826 |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
827 int |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
828 rtp_streaming_read( int fd, char *buffer, int size, streaming_ctrl_t *streaming_ctrl ) { |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
829 return read_rtp_from_server( fd, buffer, size ); |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
830 } |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
831 |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
832 int |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
833 rtp_streaming_start( stream_t *stream ) { |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
834 streaming_ctrl_t *streaming_ctrl; |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
835 int fd; |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
836 |
3732 | 837 if( stream==NULL ) return -1; |
3686
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
838 streaming_ctrl = stream->streaming_ctrl; |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
839 fd = stream->fd; |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
840 |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
841 if( fd<0 ) { |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
842 fd = rtp_open_socket( (streaming_ctrl->url) ); |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
843 if( fd<0 ) return -1; |
4072
eac2948c00d4
Applied RTP patch from Brian Kuschak <bkuschak@yahoo.com>
bertrand
parents:
4046
diff
changeset
|
844 stream->fd = fd; |
3686
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
845 } |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
846 |
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
847 streaming_ctrl->streaming_read = rtp_streaming_read; |
4072
eac2948c00d4
Applied RTP patch from Brian Kuschak <bkuschak@yahoo.com>
bertrand
parents:
4046
diff
changeset
|
848 streaming_ctrl->streaming_seek = nop_streaming_seek; |
4289
973c6912c586
Set the cache value if the network layer was able to compute it.
bertrand
parents:
4251
diff
changeset
|
849 streaming_ctrl->prebuffer_size = 4096; // KBytes |
973c6912c586
Set the cache value if the network layer was able to compute it.
bertrand
parents:
4251
diff
changeset
|
850 streaming_ctrl->buffering = 0; |
3686
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
851 streaming_ctrl->status = streaming_playing_e; |
4072
eac2948c00d4
Applied RTP patch from Brian Kuschak <bkuschak@yahoo.com>
bertrand
parents:
4046
diff
changeset
|
852 return 0; |
3686
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
853 } |
6910
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6642
diff
changeset
|
854 #endif |
3686
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
855 |
903 | 856 int |
4729
f51bd827ed1c
fixed MP3 ICY detection, return detected file format for open_stream
alex
parents:
4652
diff
changeset
|
857 streaming_start(stream_t *stream, int *demuxer_type, URL_t *url) { |
7953 | 858 int ret; |
3042 | 859 if( stream==NULL ) return -1; |
4251
05affdf4bdcd
Moved network related code from open.c to network.c
bertrand
parents:
4236
diff
changeset
|
860 |
05affdf4bdcd
Moved network related code from open.c to network.c
bertrand
parents:
4236
diff
changeset
|
861 stream->streaming_ctrl = streaming_ctrl_new(); |
05affdf4bdcd
Moved network related code from open.c to network.c
bertrand
parents:
4236
diff
changeset
|
862 if( stream->streaming_ctrl==NULL ) { |
05affdf4bdcd
Moved network related code from open.c to network.c
bertrand
parents:
4236
diff
changeset
|
863 return -1; |
05affdf4bdcd
Moved network related code from open.c to network.c
bertrand
parents:
4236
diff
changeset
|
864 } |
4652 | 865 stream->streaming_ctrl->url = check4proxies( url ); |
4729
f51bd827ed1c
fixed MP3 ICY detection, return detected file format for open_stream
alex
parents:
4652
diff
changeset
|
866 ret = autodetectProtocol( stream->streaming_ctrl, &stream->fd, demuxer_type ); |
4251
05affdf4bdcd
Moved network related code from open.c to network.c
bertrand
parents:
4236
diff
changeset
|
867 if( ret<0 ) { |
05affdf4bdcd
Moved network related code from open.c to network.c
bertrand
parents:
4236
diff
changeset
|
868 return -1; |
05affdf4bdcd
Moved network related code from open.c to network.c
bertrand
parents:
4236
diff
changeset
|
869 } |
05affdf4bdcd
Moved network related code from open.c to network.c
bertrand
parents:
4236
diff
changeset
|
870 ret = -1; |
3042 | 871 |
6642
e47d54a2cfff
Retreive the bandwidth option from the command line.
bertrand
parents:
6570
diff
changeset
|
872 // Get the bandwidth available |
7867 | 873 stream->streaming_ctrl->bandwidth = network_bandwidth; |
6642
e47d54a2cfff
Retreive the bandwidth option from the command line.
bertrand
parents:
6570
diff
changeset
|
874 |
6910
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6642
diff
changeset
|
875 #ifndef STREAMING_LIVE_DOT_COM |
3686
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
876 // For RTP streams, we usually don't know the stream type until we open it. |
4121 | 877 if( !strcasecmp( stream->streaming_ctrl->url->protocol, "rtp")) { |
4046
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
878 if(stream->fd >= 0) { |
4041
879a668ee540
various small streaming fixes by Alban Bedel <albeu@free.fr>
arpi
parents:
3732
diff
changeset
|
879 if(close(stream->fd) < 0) |
5915 | 880 mp_msg(MSGT_NETWORK,MSGL_ERR,"streaming_start : Closing socket %d failed %s\n",stream->fd,strerror(errno)); |
4041
879a668ee540
various small streaming fixes by Alban Bedel <albeu@free.fr>
arpi
parents:
3732
diff
changeset
|
881 } |
879a668ee540
various small streaming fixes by Alban Bedel <albeu@free.fr>
arpi
parents:
3732
diff
changeset
|
882 stream->fd = -1; |
4072
eac2948c00d4
Applied RTP patch from Brian Kuschak <bkuschak@yahoo.com>
bertrand
parents:
4046
diff
changeset
|
883 ret = rtp_streaming_start( stream ); |
4046
f732854e3d16
Kept the HTTP connection open after autodetect, so
bertrand
parents:
4041
diff
changeset
|
884 } else |
6910
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6642
diff
changeset
|
885 #endif |
8570 | 886 |
887 if( !strcasecmp( stream->streaming_ctrl->url->protocol, "pnm")) { | |
888 stream->fd = -1; | |
889 ret = pnm_streaming_start( stream ); | |
890 } else | |
891 | |
3686
bed6226ffb46
RTP support patch by Brian Kuschak <bkuschak@yahoo.com>
arpi
parents:
3604
diff
changeset
|
892 // For connection-oriented streams, we can usually determine the streaming type. |
4729
f51bd827ed1c
fixed MP3 ICY detection, return detected file format for open_stream
alex
parents:
4652
diff
changeset
|
893 switch( *demuxer_type ) { |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
894 case DEMUXER_TYPE_ASF: |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
895 // Send the appropriate HTTP request |
3042 | 896 // Need to filter the network stream. |
897 // ASF raw stream is encapsulated. | |
898 ret = asf_streaming_start( stream ); | |
3604
6bd312199a75
If the demuxer type is unknown it will start an http streaming.
bertrand
parents:
3599
diff
changeset
|
899 if( ret<0 ) { |
5915 | 900 mp_msg(MSGT_NETWORK,MSGL_ERR,"asf_streaming_start failed\n"); |
3604
6bd312199a75
If the demuxer type is unknown it will start an http streaming.
bertrand
parents:
3599
diff
changeset
|
901 } |
903 | 902 break; |
6910
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6642
diff
changeset
|
903 #ifdef STREAMING_LIVE_DOT_COM |
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6642
diff
changeset
|
904 case DEMUXER_TYPE_RTP: |
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6642
diff
changeset
|
905 // RTSP/RTP streaming is handled separately: |
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6642
diff
changeset
|
906 ret = rtsp_streaming_start( stream ); |
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6642
diff
changeset
|
907 if( ret<0 ) { |
7007 | 908 mp_msg(MSGT_NETWORK,MSGL_ERR,"rtsp_streaming_start failed\n"); |
6910
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6642
diff
changeset
|
909 } |
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6642
diff
changeset
|
910 break; |
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6642
diff
changeset
|
911 #endif |
4729
f51bd827ed1c
fixed MP3 ICY detection, return detected file format for open_stream
alex
parents:
4652
diff
changeset
|
912 case DEMUXER_TYPE_MPEG_ES: |
f51bd827ed1c
fixed MP3 ICY detection, return detected file format for open_stream
alex
parents:
4652
diff
changeset
|
913 case DEMUXER_TYPE_MPEG_PS: |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
914 case DEMUXER_TYPE_AVI: |
3042 | 915 case DEMUXER_TYPE_MOV: |
4729
f51bd827ed1c
fixed MP3 ICY detection, return detected file format for open_stream
alex
parents:
4652
diff
changeset
|
916 case DEMUXER_TYPE_VIVO: |
f51bd827ed1c
fixed MP3 ICY detection, return detected file format for open_stream
alex
parents:
4652
diff
changeset
|
917 case DEMUXER_TYPE_FLI: |
f51bd827ed1c
fixed MP3 ICY detection, return detected file format for open_stream
alex
parents:
4652
diff
changeset
|
918 case DEMUXER_TYPE_REAL: |
f51bd827ed1c
fixed MP3 ICY detection, return detected file format for open_stream
alex
parents:
4652
diff
changeset
|
919 case DEMUXER_TYPE_Y4M: |
f51bd827ed1c
fixed MP3 ICY detection, return detected file format for open_stream
alex
parents:
4652
diff
changeset
|
920 case DEMUXER_TYPE_FILM: |
f51bd827ed1c
fixed MP3 ICY detection, return detected file format for open_stream
alex
parents:
4652
diff
changeset
|
921 case DEMUXER_TYPE_ROQ: |
f51bd827ed1c
fixed MP3 ICY detection, return detected file format for open_stream
alex
parents:
4652
diff
changeset
|
922 case DEMUXER_TYPE_AUDIO: |
8114
ba66375adb6f
Added OGG streaming support, patch from Balatoni Denes <pnis@coder.hu>
bertrand
parents:
8027
diff
changeset
|
923 case DEMUXER_TYPE_OGG: |
4783 | 924 case DEMUXER_TYPE_PLAYLIST: |
3604
6bd312199a75
If the demuxer type is unknown it will start an http streaming.
bertrand
parents:
3599
diff
changeset
|
925 case DEMUXER_TYPE_UNKNOWN: |
3042 | 926 // Generic start, doesn't need to filter |
927 // the network stream, it's a raw stream | |
928 ret = nop_streaming_start( stream ); | |
3604
6bd312199a75
If the demuxer type is unknown it will start an http streaming.
bertrand
parents:
3599
diff
changeset
|
929 if( ret<0 ) { |
5915 | 930 mp_msg(MSGT_NETWORK,MSGL_ERR,"nop_streaming_start failed\n"); |
3604
6bd312199a75
If the demuxer type is unknown it will start an http streaming.
bertrand
parents:
3599
diff
changeset
|
931 } |
4783 | 932 if((*demuxer_type) == DEMUXER_TYPE_PLAYLIST) |
933 stream->type = STREAMTYPE_PLAYLIST; | |
903 | 934 break; |
935 default: | |
5915 | 936 mp_msg(MSGT_NETWORK,MSGL_ERR,"Unable to detect the streaming type\n"); |
3042 | 937 ret = -1; |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
938 } |
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
939 |
3042 | 940 if( ret<0 ) { |
4251
05affdf4bdcd
Moved network related code from open.c to network.c
bertrand
parents:
4236
diff
changeset
|
941 streaming_ctrl_free( stream->streaming_ctrl ); |
05affdf4bdcd
Moved network related code from open.c to network.c
bertrand
parents:
4236
diff
changeset
|
942 stream->streaming_ctrl = NULL; |
4652 | 943 } else if( stream->streaming_ctrl->buffering ) { |
7881
aba9301ed3c4
allow cache to be disabled (-nocache should override cachesize autodetection
arpi
parents:
7867
diff
changeset
|
944 if(stream_cache_size<0) { |
6555 | 945 // cache option not set, will use our computed value. |
4302
9f12fd5f47d0
Modified the cache option value setting/reading, so we can report
bertrand
parents:
4293
diff
changeset
|
946 // buffer in KBytes, *5 because the prefill is 20% of the buffer. |
7867 | 947 stream_cache_size = (stream->streaming_ctrl->prebuffer_size/1024)*5; |
948 if( stream_cache_size<16 ) stream_cache_size = 16; // 16KBytes min buffer | |
4302
9f12fd5f47d0
Modified the cache option value setting/reading, so we can report
bertrand
parents:
4293
diff
changeset
|
949 } |
7867 | 950 mp_msg(MSGT_NETWORK,MSGL_INFO,"Cache size set to %d KBytes\n", stream_cache_size); |
4289
973c6912c586
Set the cache value if the network layer was able to compute it.
bertrand
parents:
4251
diff
changeset
|
951 } |
6032 | 952 |
3042 | 953 return ret; |
903 | 954 } |
955 | |
956 int | |
3042 | 957 streaming_stop( stream_t *stream ) { |
958 stream->streaming_ctrl->status = streaming_stopped_e; | |
999
92833c9472e8
Continue implementation of the network streaming part.
bertrand
parents:
903
diff
changeset
|
959 return 0; |
903 | 960 } |