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