annotate stream/network.c @ 35686:e56df184e118

Don't set "normal size" check mark in menu by default. The "Normal size" item in the menu is currently marked by default if the video is neither double nor half size, and even if the video window size isn't the exact video size. To avoid confusion, only set the check mark, if window and video are the same size, and mark nothing if not. Based on a patch by Hans-Dieter Kosch, hdkosch kabelbw de.
author ib
date Fri, 18 Jan 2013 17:09:03 +0000
parents 01b3dd463acb
children b5abdfe9bc61
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
903
7f6641b1b0df Added autodetection of potential stream type.
bertrand
parents: 841
diff changeset
1 /*
7f6641b1b0df Added autodetection of potential stream type.
bertrand
parents: 841
diff changeset
2 * Network layer for MPlayer
30426
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29263
diff changeset
3 *
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29263
diff changeset
4 * Copyright (C) 2001 Bertrand Baudet <bertrand_baudet@yahoo.com>
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29263
diff changeset
5 *
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29263
diff changeset
6 * This file is part of MPlayer.
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29263
diff changeset
7 *
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29263
diff changeset
8 * MPlayer is free software; you can redistribute it and/or modify
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29263
diff changeset
9 * it under the terms of the GNU General Public License as published by
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29263
diff changeset
10 * the Free Software Foundation; either version 2 of the License, or
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29263
diff changeset
11 * (at your option) any later version.
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29263
diff changeset
12 *
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29263
diff changeset
13 * MPlayer is distributed in the hope that it will be useful,
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29263
diff changeset
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29263
diff changeset
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29263
diff changeset
16 * GNU General Public License for more details.
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29263
diff changeset
17 *
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29263
diff changeset
18 * You should have received a copy of the GNU General Public License along
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29263
diff changeset
19 * with MPlayer; if not, write to the Free Software Foundation, Inc.,
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29263
diff changeset
20 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
903
7f6641b1b0df Added autodetection of potential stream type.
bertrand
parents: 841
diff changeset
21 */
7f6641b1b0df Added autodetection of potential stream type.
bertrand
parents: 841
diff changeset
22
1430
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1028
diff changeset
23 #include <stdio.h>
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1028
diff changeset
24 #include <stdlib.h>
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1028
diff changeset
25 #include <string.h>
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
26 #include <unistd.h>
1430
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1028
diff changeset
27
999
92833c9472e8 Continue implementation of the network streaming part.
bertrand
parents: 903
diff changeset
28 #include <errno.h>
903
7f6641b1b0df Added autodetection of potential stream type.
bertrand
parents: 841
diff changeset
29 #include <ctype.h>
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
30
2555
66837325b929 config.h cleanup, few things added to steram/demuxer headers
arpi
parents: 2489
diff changeset
31 #include "config.h"
66837325b929 config.h cleanup, few things added to steram/demuxer headers
arpi
parents: 2489
diff changeset
32
17153
c0b147bdf49d Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents: 17012
diff changeset
33 #include "mp_msg.h"
c0b147bdf49d Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents: 17012
diff changeset
34 #include "help_mp.h"
27472
c0b233cd30ca Revert moving closesocket definition and network headers to network.h.
diego
parents: 27464
diff changeset
35
28402
c884d17bd005 Convert HAVE_WINSOCK2_H into a 0/1 definition.
diego
parents: 27848
diff changeset
36 #if HAVE_WINSOCK2_H
27472
c0b233cd30ca Revert moving closesocket definition and network headers to network.h.
diego
parents: 27464
diff changeset
37 #include <winsock2.h>
c0b233cd30ca Revert moving closesocket definition and network headers to network.h.
diego
parents: 27464
diff changeset
38 #include <ws2tcpip.h>
c0b233cd30ca Revert moving closesocket definition and network headers to network.h.
diego
parents: 27464
diff changeset
39 #endif
c0b233cd30ca Revert moving closesocket definition and network headers to network.h.
diego
parents: 27464
diff changeset
40
999
92833c9472e8 Continue implementation of the network streaming part.
bertrand
parents: 903
diff changeset
41 #include "stream.h"
19312
ab8d6b6deb63 proper inclusion of demuxer.h (including libmpdemux in Makefile only was to make previous split easier)
ben
parents: 19271
diff changeset
42 #include "libmpdemux/demuxer.h"
17012
6ff3379a0862 Unify include path handling, -I.. is in CFLAGS.
diego
parents: 16750
diff changeset
43 #include "m_config.h"
31511
13ca93203358 Factorize MPlayer/MEncoder version string handling.
diego
parents: 31500
diff changeset
44 #include "mpcommon.h"
841
c906b7600fc6 Included "netdb.h" file needed.
bertrand
parents: 833
diff changeset
45 #include "network.h"
19335
2a9d669e5ff6 isolated tcp socket code from network.c to a dedicated file
ben
parents: 19331
diff changeset
46 #include "tcp.h"
903
7f6641b1b0df Added autodetection of potential stream type.
bertrand
parents: 841
diff changeset
47 #include "http.h"
11583
2af52902e7dc Send HTTP Cookies (reading from mozilla/netscape files) support by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>. Disabled by default.
alex
parents: 11505
diff changeset
48 #include "cookies.h"
903
7f6641b1b0df Added autodetection of potential stream type.
bertrand
parents: 841
diff changeset
49 #include "url.h"
841
c906b7600fc6 Included "netdb.h" file needed.
bertrand
parents: 833
diff changeset
50
11583
2af52902e7dc Send HTTP Cookies (reading from mozilla/netscape files) support by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>. Disabled by default.
alex
parents: 11505
diff changeset
51 /* Variables for the command line option -user, -passwd, -bandwidth,
2af52902e7dc Send HTTP Cookies (reading from mozilla/netscape files) support by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>. Disabled by default.
alex
parents: 11505
diff changeset
52 -user-agent and -nocookies */
2af52902e7dc Send HTTP Cookies (reading from mozilla/netscape files) support by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>. Disabled by default.
alex
parents: 11505
diff changeset
53
7867
3dc0b71630ff cleanup config option handling in libmpdemux.
arpi
parents: 7862
diff changeset
54 char *network_username=NULL;
3dc0b71630ff cleanup config option handling in libmpdemux.
arpi
parents: 7862
diff changeset
55 char *network_password=NULL;
3dc0b71630ff cleanup config option handling in libmpdemux.
arpi
parents: 7862
diff changeset
56 int network_bandwidth=0;
11583
2af52902e7dc Send HTTP Cookies (reading from mozilla/netscape files) support by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>. Disabled by default.
alex
parents: 11505
diff changeset
57 int network_cookies_enabled = 0;
11228
f25d54466044 User settable http user-agent. Patch by Per Wigren
alex
parents: 11227
diff changeset
58 char *network_useragent=NULL;
31222
d739cbeb0e38 Add a referrer option to set the HTTP Referer field.
reimar
parents: 30909
diff changeset
59 char *network_referrer=NULL;
32995
80e4a267f6b8 Allow setting custom http header.
cehoyos
parents: 32884
diff changeset
60 char **network_http_header_fields=NULL;
6558
b379b061ce50 Read username/password from the -user -pass command line options.
bertrand
parents: 6555
diff changeset
61
9691
ed72c158215d Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents: 8939
diff changeset
62 /* IPv6 options */
ed72c158215d Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents: 8939
diff changeset
63 int network_ipv4_only_proxy = 0;
ed72c158215d Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents: 8939
diff changeset
64
6558
b379b061ce50 Read username/password from the -user -pass command line options.
bertrand
parents: 6555
diff changeset
65
25246
c8d5c8f0b9ef mime_type_table is const as well
reimar
parents: 23675
diff changeset
66 const mime_struct_t mime_type_table[] = {
32142
4614728cab25 build system: Merge all FFmpeg library checks into a single FFmpeg check.
diego
parents: 32051
diff changeset
67 #ifdef CONFIG_FFMPEG
30475
9f36eccc490a Prefer libavformat over our own mov demuxer also for video/quicktime
reimar
parents: 30426
diff changeset
68 // Flash Video
9f36eccc490a Prefer libavformat over our own mov demuxer also for video/quicktime
reimar
parents: 30426
diff changeset
69 { "video/x-flv", DEMUXER_TYPE_LAVF_PREFERRED},
30621
300fd6ee0f8b Fix mov reference files: for video/quicktime mime do not force a demuxer
reimar
parents: 30557
diff changeset
70 // do not force any demuxer in this case!
300fd6ee0f8b Fix mov reference files: for video/quicktime mime do not force a demuxer
reimar
parents: 30557
diff changeset
71 // we want the lavf demuxer to be tried first (happens automatically anyway),
300fd6ee0f8b Fix mov reference files: for video/quicktime mime do not force a demuxer
reimar
parents: 30557
diff changeset
72 // but for mov reference files to work we must also try
300fd6ee0f8b Fix mov reference files: for video/quicktime mime do not force a demuxer
reimar
parents: 30557
diff changeset
73 // the native demuxer if lavf fails.
300fd6ee0f8b Fix mov reference files: for video/quicktime mime do not force a demuxer
reimar
parents: 30557
diff changeset
74 { "video/quicktime", 0 },
30475
9f36eccc490a Prefer libavformat over our own mov demuxer also for video/quicktime
reimar
parents: 30426
diff changeset
75 #endif
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
76 // 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
77 { "audio/mpeg", DEMUXER_TYPE_AUDIO },
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
78 // MPEG streaming
14002
009337ffcfc4 forced autodetection of file format when content-type is video-x-mpeg to give mpeg-ts a chance
nicodvb
parents: 12894
diff changeset
79 { "video/mpeg", DEMUXER_TYPE_UNKNOWN },
009337ffcfc4 forced autodetection of file format when content-type is video-x-mpeg to give mpeg-ts a chance
nicodvb
parents: 12894
diff changeset
80 { "video/x-mpeg", DEMUXER_TYPE_UNKNOWN },
009337ffcfc4 forced autodetection of file format when content-type is video-x-mpeg to give mpeg-ts a chance
nicodvb
parents: 12894
diff changeset
81 { "video/x-mpeg2", DEMUXER_TYPE_UNKNOWN },
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
82 // AVI ??? => video/x-msvideo
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
83 { "video/x-msvideo", DEMUXER_TYPE_AVI },
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
84 // MOV => video/quicktime
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
85 { "video/quicktime", DEMUXER_TYPE_MOV },
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
86 // ASF
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
87 { "audio/x-ms-wax", DEMUXER_TYPE_ASF },
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
88 { "audio/x-ms-wma", DEMUXER_TYPE_ASF },
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
89 { "video/x-ms-asf", DEMUXER_TYPE_ASF },
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
90 { "video/x-ms-afs", DEMUXER_TYPE_ASF },
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
91 { "video/x-ms-wmv", DEMUXER_TYPE_ASF },
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
92 { "video/x-ms-wma", DEMUXER_TYPE_ASF },
17235
fbac61e449d5 Add "application/x-mms-framed" for ASF
rtognimp
parents: 17153
diff changeset
93 { "application/x-mms-framed", DEMUXER_TYPE_ASF },
17657
f5f4200785fc More complete ASF MIME detection, closing bug# 248,
gpoirier
parents: 17566
diff changeset
94 { "application/vnd.ms.wms-hdr.asfv1", DEMUXER_TYPE_ASF },
19841
e7f56cc4505e Change demuxer for "application/octet-stream" http streams from
eugeni
parents: 19335
diff changeset
95 { "application/octet-stream", DEMUXER_TYPE_UNKNOWN },
4783
17f29765ea77 Support for retriving mp3 playlist from the network
albeu
parents: 4730
diff changeset
96 // Playlists
7393
52b29760fe95 Added a new ASX playlist mime-type
bertrand
parents: 7251
diff changeset
97 { "video/x-ms-wmx", DEMUXER_TYPE_PLAYLIST },
23675
c056ed2819e8 wvx files (mimetype video/x-ms-wvx) are asx playlists. Fix bugzilla #750
rtogni
parents: 22142
diff changeset
98 { "video/x-ms-wvx", DEMUXER_TYPE_PLAYLIST },
4783
17f29765ea77 Support for retriving mp3 playlist from the network
albeu
parents: 4730
diff changeset
99 { "audio/x-scpls", DEMUXER_TYPE_PLAYLIST },
17f29765ea77 Support for retriving mp3 playlist from the network
albeu
parents: 4730
diff changeset
100 { "audio/x-mpegurl", DEMUXER_TYPE_PLAYLIST },
6032
4577bda5806a added some new types
alex
parents: 5916
diff changeset
101 { "audio/x-pls", DEMUXER_TYPE_PLAYLIST },
4577bda5806a added some new types
alex
parents: 5916
diff changeset
102 // Real Media
15209
b9c199dd123f Do not force real demuxer on x-pn-realaudio mimetype
rtognimp
parents: 14720
diff changeset
103 // { "audio/x-pn-realaudio", DEMUXER_TYPE_REAL },
8114
ba66375adb6f Added OGG streaming support, patch from Balatoni Denes <pnis@coder.hu>
bertrand
parents: 8027
diff changeset
104 // OGG Streaming
34846
06df8a8bed10 Add MIME type application/ogg for OGG streaming.
ib
parents: 33719
diff changeset
105 { "application/ogg", DEMUXER_TYPE_OGG },
12175
da8e39bfe121 nsv (Nullsoft streaming video) demuxer
rtognimp
parents: 12018
diff changeset
106 { "application/x-ogg", DEMUXER_TYPE_OGG },
35508
525bcc0a8e16 Recognize audio/ogg as an OGG mimetype.
cehoyos
parents: 35301
diff changeset
107 { "audio/ogg", DEMUXER_TYPE_OGG },
35509
01b3dd463acb Add video/ogg as an Ogg mimetype.
upsuper
parents: 35508
diff changeset
108 { "video/ogg", DEMUXER_TYPE_OGG },
12175
da8e39bfe121 nsv (Nullsoft streaming video) demuxer
rtognimp
parents: 12018
diff changeset
109 // NullSoft Streaming Video
12477
1550ef7117c4 Add detection of nsa streamed by aol ultravox server
rtognimp
parents: 12390
diff changeset
110 { "video/nsv", DEMUXER_TYPE_NSV},
15585
281d155fb37f ported all network streams to the new API
nicodvb
parents: 15209
diff changeset
111 { "misc/ultravox", DEMUXER_TYPE_NSV},
281d155fb37f ported all network streams to the new API
nicodvb
parents: 15209
diff changeset
112 { NULL, DEMUXER_TYPE_UNKNOWN},
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
113 };
999
92833c9472e8 Continue implementation of the network streaming part.
bertrand
parents: 903
diff changeset
114
92833c9472e8 Continue implementation of the network streaming part.
bertrand
parents: 903
diff changeset
115
92833c9472e8 Continue implementation of the network streaming part.
bertrand
parents: 903
diff changeset
116 streaming_ctrl_t *
17566
f580a7755ac5 Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents: 17235
diff changeset
117 streaming_ctrl_new(void) {
32560
1dd48bfb04a2 Use calloc instead of malloc+memset.
cboesch
parents: 32559
diff changeset
118 streaming_ctrl_t *streaming_ctrl = calloc(1, sizeof(*streaming_ctrl));
999
92833c9472e8 Continue implementation of the network streaming part.
bertrand
parents: 903
diff changeset
119 if( streaming_ctrl==NULL ) {
17153
c0b147bdf49d Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents: 17012
diff changeset
120 mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MemAllocFailed);
999
92833c9472e8 Continue implementation of the network streaming part.
bertrand
parents: 903
diff changeset
121 return NULL;
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 return streaming_ctrl;
92833c9472e8 Continue implementation of the network streaming part.
bertrand
parents: 903
diff changeset
124 }
92833c9472e8 Continue implementation of the network streaming part.
bertrand
parents: 903
diff changeset
125
92833c9472e8 Continue implementation of the network streaming part.
bertrand
parents: 903
diff changeset
126 void
92833c9472e8 Continue implementation of the network streaming part.
bertrand
parents: 903
diff changeset
127 streaming_ctrl_free( streaming_ctrl_t *streaming_ctrl ) {
92833c9472e8 Continue implementation of the network streaming part.
bertrand
parents: 903
diff changeset
128 if( streaming_ctrl==NULL ) return;
4251
05affdf4bdcd Moved network related code from open.c to network.c
bertrand
parents: 4236
diff changeset
129 if( streaming_ctrl->url ) url_free( streaming_ctrl->url );
32511
b39155e98ac3 Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents: 32422
diff changeset
130 free(streaming_ctrl->buffer);
b39155e98ac3 Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents: 32422
diff changeset
131 free(streaming_ctrl->data);
b39155e98ac3 Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents: 32422
diff changeset
132 free(streaming_ctrl);
999
92833c9472e8 Continue implementation of the network streaming part.
bertrand
parents: 903
diff changeset
133 }
92833c9472e8 Continue implementation of the network streaming part.
bertrand
parents: 903
diff changeset
134
4146
925046ea34ec Added support for the environment variable http_proxy.
bertrand
parents: 4145
diff changeset
135 URL_t*
35296
4dc2b1261d29 check4proxies does not modify input URL, so mark it const.
reimar
parents: 34846
diff changeset
136 check4proxies( const URL_t *url ) {
4652
17cf55182029 Cleaned up the way proxies checking was done.
bertrand
parents: 4553
diff changeset
137 URL_t *url_out = NULL;
4251
05affdf4bdcd Moved network related code from open.c to network.c
bertrand
parents: 4236
diff changeset
138 if( url==NULL ) return NULL;
4652
17cf55182029 Cleaned up the way proxies checking was done.
bertrand
parents: 4553
diff changeset
139 url_out = url_new( url->url );
4146
925046ea34ec Added support for the environment variable http_proxy.
bertrand
parents: 4145
diff changeset
140 if( !strcasecmp(url->protocol, "http_proxy") ) {
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5892
diff changeset
141 mp_msg(MSGT_NETWORK,MSGL_V,"Using HTTP proxy: http://%s:%d\n", url->hostname, url->port );
4652
17cf55182029 Cleaned up the way proxies checking was done.
bertrand
parents: 4553
diff changeset
142 return url_out;
4146
925046ea34ec Added support for the environment variable http_proxy.
bertrand
parents: 4145
diff changeset
143 }
925046ea34ec Added support for the environment variable http_proxy.
bertrand
parents: 4145
diff changeset
144 // Check if the http_proxy environment variable is set.
925046ea34ec Added support for the environment variable http_proxy.
bertrand
parents: 4145
diff changeset
145 if( !strcasecmp(url->protocol, "http") ) {
925046ea34ec Added support for the environment variable http_proxy.
bertrand
parents: 4145
diff changeset
146 char *proxy;
925046ea34ec Added support for the environment variable http_proxy.
bertrand
parents: 4145
diff changeset
147 proxy = getenv("http_proxy");
925046ea34ec Added support for the environment variable http_proxy.
bertrand
parents: 4145
diff changeset
148 if( proxy!=NULL ) {
925046ea34ec Added support for the environment variable http_proxy.
bertrand
parents: 4145
diff changeset
149 // We got a proxy, build the URL to use it
925046ea34ec Added support for the environment variable http_proxy.
bertrand
parents: 4145
diff changeset
150 char *new_url;
925046ea34ec Added support for the environment variable http_proxy.
bertrand
parents: 4145
diff changeset
151 URL_t *tmp_url;
925046ea34ec Added support for the environment variable http_proxy.
bertrand
parents: 4145
diff changeset
152 URL_t *proxy_url = url_new( proxy );
925046ea34ec Added support for the environment variable http_proxy.
bertrand
parents: 4145
diff changeset
153
925046ea34ec Added support for the environment variable http_proxy.
bertrand
parents: 4145
diff changeset
154 if( proxy_url==NULL ) {
17153
c0b147bdf49d Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents: 17012
diff changeset
155 mp_msg(MSGT_NETWORK,MSGL_WARN,
c0b147bdf49d Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents: 17012
diff changeset
156 MSGTR_MPDEMUX_NW_InvalidProxySettingTryingWithout);
4652
17cf55182029 Cleaned up the way proxies checking was done.
bertrand
parents: 4553
diff changeset
157 return url_out;
4146
925046ea34ec Added support for the environment variable http_proxy.
bertrand
parents: 4145
diff changeset
158 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28402
diff changeset
159
9691
ed72c158215d Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents: 8939
diff changeset
160 #ifdef HAVE_AF_INET6
ed72c158215d Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents: 8939
diff changeset
161 if (network_ipv4_only_proxy && (gethostbyname(url->hostname)==NULL)) {
ed72c158215d Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents: 8939
diff changeset
162 mp_msg(MSGT_NETWORK,MSGL_WARN,
17153
c0b147bdf49d Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents: 17012
diff changeset
163 MSGTR_MPDEMUX_NW_CantResolvTryingWithoutProxy);
16419
0d860b6d64e6 memleak fixes when using an http proxy
reimar
parents: 16417
diff changeset
164 url_free(proxy_url);
9691
ed72c158215d Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents: 8939
diff changeset
165 return url_out;
ed72c158215d Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents: 8939
diff changeset
166 }
ed72c158215d Added IPv6 support, patch by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>
bertrand
parents: 8939
diff changeset
167 #endif
4146
925046ea34ec Added support for the environment variable http_proxy.
bertrand
parents: 4145
diff changeset
168
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5892
diff changeset
169 mp_msg(MSGT_NETWORK,MSGL_V,"Using HTTP proxy: %s\n", proxy_url->url );
32884
0d95f044c589 Use mp_asprintf in make_noauth_url and make_http_proxy_url.
cboesch
parents: 32586
diff changeset
170 new_url = get_http_proxy_url(proxy_url, url->url);
4146
925046ea34ec Added support for the environment variable http_proxy.
bertrand
parents: 4145
diff changeset
171 if( new_url==NULL ) {
17153
c0b147bdf49d Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents: 17012
diff changeset
172 mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MemAllocFailed);
16419
0d860b6d64e6 memleak fixes when using an http proxy
reimar
parents: 16417
diff changeset
173 url_free(proxy_url);
4652
17cf55182029 Cleaned up the way proxies checking was done.
bertrand
parents: 4553
diff changeset
174 return url_out;
4146
925046ea34ec Added support for the environment variable http_proxy.
bertrand
parents: 4145
diff changeset
175 }
925046ea34ec Added support for the environment variable http_proxy.
bertrand
parents: 4145
diff changeset
176 tmp_url = url_new( new_url );
925046ea34ec Added support for the environment variable http_proxy.
bertrand
parents: 4145
diff changeset
177 if( tmp_url==NULL ) {
16419
0d860b6d64e6 memleak fixes when using an http proxy
reimar
parents: 16417
diff changeset
178 free( new_url );
0d860b6d64e6 memleak fixes when using an http proxy
reimar
parents: 16417
diff changeset
179 url_free( proxy_url );
4652
17cf55182029 Cleaned up the way proxies checking was done.
bertrand
parents: 4553
diff changeset
180 return url_out;
4146
925046ea34ec Added support for the environment variable http_proxy.
bertrand
parents: 4145
diff changeset
181 }
4652
17cf55182029 Cleaned up the way proxies checking was done.
bertrand
parents: 4553
diff changeset
182 url_free( url_out );
17cf55182029 Cleaned up the way proxies checking was done.
bertrand
parents: 4553
diff changeset
183 url_out = tmp_url;
4146
925046ea34ec Added support for the environment variable http_proxy.
bertrand
parents: 4145
diff changeset
184 free( new_url );
925046ea34ec Added support for the environment variable http_proxy.
bertrand
parents: 4145
diff changeset
185 url_free( proxy_url );
925046ea34ec Added support for the environment variable http_proxy.
bertrand
parents: 4145
diff changeset
186 }
925046ea34ec Added support for the environment variable http_proxy.
bertrand
parents: 4145
diff changeset
187 }
4652
17cf55182029 Cleaned up the way proxies checking was done.
bertrand
parents: 4553
diff changeset
188 return url_out;
4146
925046ea34ec Added support for the environment variable http_proxy.
bertrand
parents: 4145
diff changeset
189 }
925046ea34ec Added support for the environment variable http_proxy.
bertrand
parents: 4145
diff changeset
190
35301
8f6d3f8ffa61 Add url_new_with_proxy function to reduce code duplication and memleaks.
reimar
parents: 35296
diff changeset
191 URL_t *url_new_with_proxy(const char *urlstr)
8f6d3f8ffa61 Add url_new_with_proxy function to reduce code duplication and memleaks.
reimar
parents: 35296
diff changeset
192 {
8f6d3f8ffa61 Add url_new_with_proxy function to reduce code duplication and memleaks.
reimar
parents: 35296
diff changeset
193 URL_t *url = url_new(urlstr);
8f6d3f8ffa61 Add url_new_with_proxy function to reduce code duplication and memleaks.
reimar
parents: 35296
diff changeset
194 URL_t *url_with_proxy = check4proxies(url);
8f6d3f8ffa61 Add url_new_with_proxy function to reduce code duplication and memleaks.
reimar
parents: 35296
diff changeset
195 url_free(url);
8f6d3f8ffa61 Add url_new_with_proxy function to reduce code duplication and memleaks.
reimar
parents: 35296
diff changeset
196 return url_with_proxy;
8f6d3f8ffa61 Add url_new_with_proxy function to reduce code duplication and memleaks.
reimar
parents: 35296
diff changeset
197 }
8f6d3f8ffa61 Add url_new_with_proxy function to reduce code duplication and memleaks.
reimar
parents: 35296
diff changeset
198
999
92833c9472e8 Continue implementation of the network streaming part.
bertrand
parents: 903
diff changeset
199 int
11965
3d75bcc28231 enable seeking in http streams
attila
parents: 11583
diff changeset
200 http_send_request( URL_t *url, off_t pos ) {
999
92833c9472e8 Continue implementation of the network streaming part.
bertrand
parents: 903
diff changeset
201 HTTP_header_t *http_hdr;
4121
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4072
diff changeset
202 URL_t *server_url;
11228
f25d54466044 User settable http user-agent. Patch by Per Wigren
alex
parents: 11227
diff changeset
203 char str[256];
21535
94ac700b2898 Close fd on error.
reimar
parents: 19841
diff changeset
204 int fd = -1;
4121
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4072
diff changeset
205 int ret;
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4072
diff changeset
206 int proxy = 0; // Boolean
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4072
diff changeset
207
999
92833c9472e8 Continue implementation of the network streaming part.
bertrand
parents: 903
diff changeset
208 http_hdr = http_new_header();
4121
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4072
diff changeset
209
4145
c66fddd8867c Changed the proxy protocol to http_proxy.
bertrand
parents: 4121
diff changeset
210 if( !strcasecmp(url->protocol, "http_proxy") ) {
4121
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4072
diff changeset
211 proxy = 1;
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4072
diff changeset
212 server_url = url_new( (url->file)+1 );
32422
01115062cb22 Fix possible crash for invalid http_proxy URLs like just
reimar
parents: 32142
diff changeset
213 if (!server_url) {
01115062cb22 Fix possible crash for invalid http_proxy URLs like just
reimar
parents: 32142
diff changeset
214 mp_msg(MSGT_NETWORK, MSGL_ERR, "Invalid URL '%s' to proxify\n", url->file+1);
01115062cb22 Fix possible crash for invalid http_proxy URLs like just
reimar
parents: 32142
diff changeset
215 goto err_out;
01115062cb22 Fix possible crash for invalid http_proxy URLs like just
reimar
parents: 32142
diff changeset
216 }
32553
c44141d4e443 Do not keep authentication in URL on connection through a proxy
cboesch
parents: 32547
diff changeset
217 http_set_uri( http_hdr, server_url->noauth_url );
4121
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4072
diff changeset
218 } else {
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4072
diff changeset
219 server_url = url;
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4072
diff changeset
220 http_set_uri( http_hdr, server_url->file );
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4072
diff changeset
221 }
12638
2ebd553876c8 RFC compliance patch by Eric Lammerts <eric@lammerts.org>
alex
parents: 12610
diff changeset
222 if (server_url->port && server_url->port != 80)
32516
d12d304b4dbd Replace hardcoded str size with sizeof
cboesch
parents: 32511
diff changeset
223 snprintf(str, sizeof(str), "Host: %s:%d", server_url->hostname, server_url->port );
12638
2ebd553876c8 RFC compliance patch by Eric Lammerts <eric@lammerts.org>
alex
parents: 12610
diff changeset
224 else
32516
d12d304b4dbd Replace hardcoded str size with sizeof
cboesch
parents: 32511
diff changeset
225 snprintf(str, sizeof(str), "Host: %s", server_url->hostname );
3585
cb985ea11ed5 Added the Host field in the HTTP request.
bertrand
parents: 3494
diff changeset
226 http_set_field( http_hdr, str);
11228
f25d54466044 User settable http user-agent. Patch by Per Wigren
alex
parents: 11227
diff changeset
227 if (network_useragent)
32516
d12d304b4dbd Replace hardcoded str size with sizeof
cboesch
parents: 32511
diff changeset
228 snprintf(str, sizeof(str), "User-Agent: %s", network_useragent);
11228
f25d54466044 User settable http user-agent. Patch by Per Wigren
alex
parents: 11227
diff changeset
229 else
32516
d12d304b4dbd Replace hardcoded str size with sizeof
cboesch
parents: 32511
diff changeset
230 snprintf(str, sizeof(str), "User-Agent: %s", mplayer_version);
31511
13ca93203358 Factorize MPlayer/MEncoder version string handling.
diego
parents: 31500
diff changeset
231 http_set_field(http_hdr, str);
11965
3d75bcc28231 enable seeking in http streams
attila
parents: 11583
diff changeset
232
31222
d739cbeb0e38 Add a referrer option to set the HTTP Referer field.
reimar
parents: 30909
diff changeset
233 if (network_referrer) {
d739cbeb0e38 Add a referrer option to set the HTTP Referer field.
reimar
parents: 30909
diff changeset
234 char *referrer = NULL;
d739cbeb0e38 Add a referrer option to set the HTTP Referer field.
reimar
parents: 30909
diff changeset
235 size_t len = strlen(network_referrer) + 10;
d739cbeb0e38 Add a referrer option to set the HTTP Referer field.
reimar
parents: 30909
diff changeset
236
d739cbeb0e38 Add a referrer option to set the HTTP Referer field.
reimar
parents: 30909
diff changeset
237 // Check len to ensure we don't do something really bad in case of an overflow
d739cbeb0e38 Add a referrer option to set the HTTP Referer field.
reimar
parents: 30909
diff changeset
238 if (len > 10)
d739cbeb0e38 Add a referrer option to set the HTTP Referer field.
reimar
parents: 30909
diff changeset
239 referrer = malloc(len);
d739cbeb0e38 Add a referrer option to set the HTTP Referer field.
reimar
parents: 30909
diff changeset
240
d739cbeb0e38 Add a referrer option to set the HTTP Referer field.
reimar
parents: 30909
diff changeset
241 if (referrer == NULL) {
d739cbeb0e38 Add a referrer option to set the HTTP Referer field.
reimar
parents: 30909
diff changeset
242 mp_msg(MSGT_NETWORK, MSGL_FATAL, MSGTR_MemAllocFailed);
d739cbeb0e38 Add a referrer option to set the HTTP Referer field.
reimar
parents: 30909
diff changeset
243 } else {
d739cbeb0e38 Add a referrer option to set the HTTP Referer field.
reimar
parents: 30909
diff changeset
244 snprintf(referrer, len, "Referer: %s", network_referrer);
d739cbeb0e38 Add a referrer option to set the HTTP Referer field.
reimar
parents: 30909
diff changeset
245 http_set_field(http_hdr, referrer);
d739cbeb0e38 Add a referrer option to set the HTTP Referer field.
reimar
parents: 30909
diff changeset
246 free(referrer);
d739cbeb0e38 Add a referrer option to set the HTTP Referer field.
reimar
parents: 30909
diff changeset
247 }
d739cbeb0e38 Add a referrer option to set the HTTP Referer field.
reimar
parents: 30909
diff changeset
248 }
d739cbeb0e38 Add a referrer option to set the HTTP Referer field.
reimar
parents: 30909
diff changeset
249
27847
28deb37052cd Add a noicyx:// protocol to allow easier testing for misconfigured servers.
reimar
parents: 27473
diff changeset
250 if( strcasecmp(url->protocol, "noicyx") )
27848
c7b5d862b6d8 Forgotten reindent
reimar
parents: 27847
diff changeset
251 http_set_field(http_hdr, "Icy-MetaData: 1");
16013
4ee24ec6ac16 SHOUTcast and ultravox support
reimar
parents: 15954
diff changeset
252
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28402
diff changeset
253 if(pos>0) {
11965
3d75bcc28231 enable seeking in http streams
attila
parents: 11583
diff changeset
254 // Extend http_send_request with possibility to do partial content retrieval
32516
d12d304b4dbd Replace hardcoded str size with sizeof
cboesch
parents: 32511
diff changeset
255 snprintf(str, sizeof(str), "Range: bytes=%"PRId64"-", (int64_t)pos);
11965
3d75bcc28231 enable seeking in http streams
attila
parents: 11583
diff changeset
256 http_set_field(http_hdr, str);
3d75bcc28231 enable seeking in http streams
attila
parents: 11583
diff changeset
257 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28402
diff changeset
258
11583
2af52902e7dc Send HTTP Cookies (reading from mozilla/netscape files) support by Dave Lambley <mplayer-dev-eng@dlambley.freeserve.co.uk>. Disabled by default.
alex
parents: 11505
diff changeset
259 if (network_cookies_enabled) cookies_set( http_hdr, server_url->hostname, server_url->url );
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28402
diff changeset
260
32995
80e4a267f6b8 Allow setting custom http header.
cehoyos
parents: 32884
diff changeset
261 if (network_http_header_fields) {
80e4a267f6b8 Allow setting custom http header.
cehoyos
parents: 32884
diff changeset
262 int i=0;
80e4a267f6b8 Allow setting custom http header.
cehoyos
parents: 32884
diff changeset
263 while (network_http_header_fields[i])
80e4a267f6b8 Allow setting custom http header.
cehoyos
parents: 32884
diff changeset
264 http_set_field(http_hdr, network_http_header_fields[i++]);
80e4a267f6b8 Allow setting custom http header.
cehoyos
parents: 32884
diff changeset
265 }
80e4a267f6b8 Allow setting custom http header.
cehoyos
parents: 32884
diff changeset
266
12352
2e0a4b32e139 Should be Connection: close, and not closed.
bertrand
parents: 12274
diff changeset
267 http_set_field( http_hdr, "Connection: close");
32547
6a629e6fdb09 Add Proxy-Authorization header to authenticate on proxies
cboesch
parents: 32546
diff changeset
268 if (proxy)
6a629e6fdb09 Add Proxy-Authorization header to authenticate on proxies
cboesch
parents: 32546
diff changeset
269 http_add_basic_proxy_authentication(http_hdr, url->username, url->password);
32546
e21aa887e9df "Authentication" header is for the destination server URL, even through a proxy
cboesch
parents: 32516
diff changeset
270 http_add_basic_authentication(http_hdr, server_url->username, server_url->password);
999
92833c9472e8 Continue implementation of the network streaming part.
bertrand
parents: 903
diff changeset
271 if( http_build_request( http_hdr )==NULL ) {
16417
be6bbd50ec20 memleak fixes when invalid http url specified.
reimar
parents: 16013
diff changeset
272 goto err_out;
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
273 }
999
92833c9472e8 Continue implementation of the network streaming part.
bertrand
parents: 903
diff changeset
274
4121
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4072
diff changeset
275 if( proxy ) {
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4072
diff changeset
276 if( url->port==0 ) url->port = 8080; // Default port for the proxy server
10625
620cc649f519 ftp support. The change on connect2Server is needed bcs we need 2
albeu
parents: 10317
diff changeset
277 fd = connect2Server( url->hostname, url->port,1 );
4121
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4072
diff changeset
278 url_free( server_url );
17777
13b2332c5154 missing url_free when using proxy and connect fails
reimar
parents: 17657
diff changeset
279 server_url = NULL;
4121
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4072
diff changeset
280 } else {
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4072
diff changeset
281 if( server_url->port==0 ) server_url->port = 80; // Default port for the web server
10625
620cc649f519 ftp support. The change on connect2Server is needed bcs we need 2
albeu
parents: 10317
diff changeset
282 fd = connect2Server( server_url->hostname, server_url->port,1 );
4121
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4072
diff changeset
283 }
999
92833c9472e8 Continue implementation of the network streaming part.
bertrand
parents: 903
diff changeset
284 if( fd<0 ) {
16417
be6bbd50ec20 memleak fixes when invalid http url specified.
reimar
parents: 16013
diff changeset
285 goto err_out;
999
92833c9472e8 Continue implementation of the network streaming part.
bertrand
parents: 903
diff changeset
286 }
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5892
diff changeset
287 mp_msg(MSGT_NETWORK,MSGL_DBG2,"Request: [%s]\n", http_hdr->buffer );
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28402
diff changeset
288
31500
b01f807eb183 Use MSG_NOSIGNAL flag if available for send().
reimar
parents: 31222
diff changeset
289 ret = send( fd, http_hdr->buffer, http_hdr->buffer_size, DEFAULT_SEND_FLAGS );
7953
60624e692b95 GCC warning fixes
bertrand
parents: 7881
diff changeset
290 if( ret!=(int)http_hdr->buffer_size ) {
17153
c0b147bdf49d Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents: 17012
diff changeset
291 mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_NW_ErrSendingHTTPRequest);
16417
be6bbd50ec20 memleak fixes when invalid http url specified.
reimar
parents: 16013
diff changeset
292 goto err_out;
4121
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4072
diff changeset
293 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28402
diff changeset
294
999
92833c9472e8 Continue implementation of the network streaming part.
bertrand
parents: 903
diff changeset
295 http_free( http_hdr );
92833c9472e8 Continue implementation of the network streaming part.
bertrand
parents: 903
diff changeset
296
92833c9472e8 Continue implementation of the network streaming part.
bertrand
parents: 903
diff changeset
297 return fd;
16417
be6bbd50ec20 memleak fixes when invalid http url specified.
reimar
parents: 16013
diff changeset
298 err_out:
21535
94ac700b2898 Close fd on error.
reimar
parents: 19841
diff changeset
299 if (fd > 0) closesocket(fd);
16417
be6bbd50ec20 memleak fixes when invalid http url specified.
reimar
parents: 16013
diff changeset
300 http_free(http_hdr);
17777
13b2332c5154 missing url_free when using proxy and connect fails
reimar
parents: 17657
diff changeset
301 if (proxy && server_url)
13b2332c5154 missing url_free when using proxy and connect fails
reimar
parents: 17657
diff changeset
302 url_free(server_url);
16417
be6bbd50ec20 memleak fixes when invalid http url specified.
reimar
parents: 16013
diff changeset
303 return -1;
999
92833c9472e8 Continue implementation of the network streaming part.
bertrand
parents: 903
diff changeset
304 }
92833c9472e8 Continue implementation of the network streaming part.
bertrand
parents: 903
diff changeset
305
92833c9472e8 Continue implementation of the network streaming part.
bertrand
parents: 903
diff changeset
306 HTTP_header_t *
92833c9472e8 Continue implementation of the network streaming part.
bertrand
parents: 903
diff changeset
307 http_read_response( int fd ) {
92833c9472e8 Continue implementation of the network streaming part.
bertrand
parents: 903
diff changeset
308 HTTP_header_t *http_hdr;
92833c9472e8 Continue implementation of the network streaming part.
bertrand
parents: 903
diff changeset
309 char response[BUFFER_SIZE];
92833c9472e8 Continue implementation of the network streaming part.
bertrand
parents: 903
diff changeset
310 int i;
92833c9472e8 Continue implementation of the network streaming part.
bertrand
parents: 903
diff changeset
311
92833c9472e8 Continue implementation of the network streaming part.
bertrand
parents: 903
diff changeset
312 http_hdr = http_new_header();
92833c9472e8 Continue implementation of the network streaming part.
bertrand
parents: 903
diff changeset
313 if( http_hdr==NULL ) {
92833c9472e8 Continue implementation of the network streaming part.
bertrand
parents: 903
diff changeset
314 return NULL;
92833c9472e8 Continue implementation of the network streaming part.
bertrand
parents: 903
diff changeset
315 }
92833c9472e8 Continue implementation of the network streaming part.
bertrand
parents: 903
diff changeset
316
92833c9472e8 Continue implementation of the network streaming part.
bertrand
parents: 903
diff changeset
317 do {
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28402
diff changeset
318 i = recv( fd, response, BUFFER_SIZE, 0 );
999
92833c9472e8 Continue implementation of the network streaming part.
bertrand
parents: 903
diff changeset
319 if( i<0 ) {
17153
c0b147bdf49d Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents: 17012
diff changeset
320 mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_NW_ReadFailed);
3365
eb1c24557dad Checked the return values on read.
bertrand
parents: 3072
diff changeset
321 http_free( http_hdr );
eb1c24557dad Checked the return values on read.
bertrand
parents: 3072
diff changeset
322 return NULL;
eb1c24557dad Checked the return values on read.
bertrand
parents: 3072
diff changeset
323 }
eb1c24557dad Checked the return values on read.
bertrand
parents: 3072
diff changeset
324 if( i==0 ) {
17153
c0b147bdf49d Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents: 17012
diff changeset
325 mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_NW_Read0CouldBeEOF);
3365
eb1c24557dad Checked the return values on read.
bertrand
parents: 3072
diff changeset
326 http_free( http_hdr );
eb1c24557dad Checked the return values on read.
bertrand
parents: 3072
diff changeset
327 return NULL;
999
92833c9472e8 Continue implementation of the network streaming part.
bertrand
parents: 903
diff changeset
328 }
92833c9472e8 Continue implementation of the network streaming part.
bertrand
parents: 903
diff changeset
329 http_response_append( http_hdr, response, i );
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28402
diff changeset
330 } while( !http_is_header_entire( http_hdr ) );
30909
0d0f53c47bd8 Make http_read_response fail if parsing the response failed.
reimar
parents: 30723
diff changeset
331 if (http_response_parse( http_hdr ) < 0) {
0d0f53c47bd8 Make http_read_response fail if parsing the response failed.
reimar
parents: 30723
diff changeset
332 http_free( http_hdr );
0d0f53c47bd8 Make http_read_response fail if parsing the response failed.
reimar
parents: 30723
diff changeset
333 return NULL;
0d0f53c47bd8 Make http_read_response fail if parsing the response failed.
reimar
parents: 30723
diff changeset
334 }
999
92833c9472e8 Continue implementation of the network streaming part.
bertrand
parents: 903
diff changeset
335 return http_hdr;
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
336 }
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
337
6555
f54b5148885d Moved authentication code into its own function.
bertrand
parents: 6516
diff changeset
338 int
f54b5148885d Moved authentication code into its own function.
bertrand
parents: 6516
diff changeset
339 http_authenticate(HTTP_header_t *http_hdr, URL_t *url, int *auth_retry) {
f54b5148885d Moved authentication code into its own function.
bertrand
parents: 6516
diff changeset
340 char *aut;
7953
60624e692b95 GCC warning fixes
bertrand
parents: 7881
diff changeset
341
6558
b379b061ce50 Read username/password from the -user -pass command line options.
bertrand
parents: 6555
diff changeset
342 if( *auth_retry==1 ) {
17153
c0b147bdf49d Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents: 17012
diff changeset
343 mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_NW_AuthFailed);
6555
f54b5148885d Moved authentication code into its own function.
bertrand
parents: 6516
diff changeset
344 return -1;
f54b5148885d Moved authentication code into its own function.
bertrand
parents: 6516
diff changeset
345 }
f54b5148885d Moved authentication code into its own function.
bertrand
parents: 6516
diff changeset
346 if( *auth_retry>0 ) {
32511
b39155e98ac3 Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents: 32422
diff changeset
347 free(url->username);
b39155e98ac3 Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents: 32422
diff changeset
348 url->username = NULL;
b39155e98ac3 Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents: 32422
diff changeset
349 free(url->password);
b39155e98ac3 Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents: 32422
diff changeset
350 url->password = NULL;
6555
f54b5148885d Moved authentication code into its own function.
bertrand
parents: 6516
diff changeset
351 }
6558
b379b061ce50 Read username/password from the -user -pass command line options.
bertrand
parents: 6555
diff changeset
352
6555
f54b5148885d Moved authentication code into its own function.
bertrand
parents: 6516
diff changeset
353 aut = http_get_field(http_hdr, "WWW-Authenticate");
f54b5148885d Moved authentication code into its own function.
bertrand
parents: 6516
diff changeset
354 if( aut!=NULL ) {
f54b5148885d Moved authentication code into its own function.
bertrand
parents: 6516
diff changeset
355 char *aut_space;
f54b5148885d Moved authentication code into its own function.
bertrand
parents: 6516
diff changeset
356 aut_space = strstr(aut, "realm=");
f54b5148885d Moved authentication code into its own function.
bertrand
parents: 6516
diff changeset
357 if( aut_space!=NULL ) aut_space += 6;
17153
c0b147bdf49d Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents: 17012
diff changeset
358 mp_msg(MSGT_NETWORK,MSGL_INFO,MSGTR_MPDEMUX_NW_AuthRequiredFor, aut_space);
6555
f54b5148885d Moved authentication code into its own function.
bertrand
parents: 6516
diff changeset
359 } else {
17153
c0b147bdf49d Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents: 17012
diff changeset
360 mp_msg(MSGT_NETWORK,MSGL_INFO,MSGTR_MPDEMUX_NW_AuthRequired);
6555
f54b5148885d Moved authentication code into its own function.
bertrand
parents: 6516
diff changeset
361 }
7867
3dc0b71630ff cleanup config option handling in libmpdemux.
arpi
parents: 7862
diff changeset
362 if( network_username ) {
3dc0b71630ff cleanup config option handling in libmpdemux.
arpi
parents: 7862
diff changeset
363 url->username = strdup(network_username);
6555
f54b5148885d Moved authentication code into its own function.
bertrand
parents: 6516
diff changeset
364 if( url->username==NULL ) {
17153
c0b147bdf49d Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents: 17012
diff changeset
365 mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MemAllocFailed);
6555
f54b5148885d Moved authentication code into its own function.
bertrand
parents: 6516
diff changeset
366 return -1;
f54b5148885d Moved authentication code into its own function.
bertrand
parents: 6516
diff changeset
367 }
f54b5148885d Moved authentication code into its own function.
bertrand
parents: 6516
diff changeset
368 } else {
17153
c0b147bdf49d Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents: 17012
diff changeset
369 mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_NW_AuthFailed);
6555
f54b5148885d Moved authentication code into its own function.
bertrand
parents: 6516
diff changeset
370 return -1;
f54b5148885d Moved authentication code into its own function.
bertrand
parents: 6516
diff changeset
371 }
7867
3dc0b71630ff cleanup config option handling in libmpdemux.
arpi
parents: 7862
diff changeset
372 if( network_password ) {
3dc0b71630ff cleanup config option handling in libmpdemux.
arpi
parents: 7862
diff changeset
373 url->password = strdup(network_password);
6558
b379b061ce50 Read username/password from the -user -pass command line options.
bertrand
parents: 6555
diff changeset
374 if( url->password==NULL ) {
17153
c0b147bdf49d Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents: 17012
diff changeset
375 mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MemAllocFailed);
6558
b379b061ce50 Read username/password from the -user -pass command line options.
bertrand
parents: 6555
diff changeset
376 return -1;
b379b061ce50 Read username/password from the -user -pass command line options.
bertrand
parents: 6555
diff changeset
377 }
b379b061ce50 Read username/password from the -user -pass command line options.
bertrand
parents: 6555
diff changeset
378 } else {
17153
c0b147bdf49d Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents: 17012
diff changeset
379 mp_msg(MSGT_NETWORK,MSGL_INFO,MSGTR_MPDEMUX_NW_NoPasswdProvidedTryingBlank);
6558
b379b061ce50 Read username/password from the -user -pass command line options.
bertrand
parents: 6555
diff changeset
380 }
6555
f54b5148885d Moved authentication code into its own function.
bertrand
parents: 6516
diff changeset
381 (*auth_retry)++;
f54b5148885d Moved authentication code into its own function.
bertrand
parents: 6516
diff changeset
382 return 0;
f54b5148885d Moved authentication code into its own function.
bertrand
parents: 6516
diff changeset
383 }
f54b5148885d Moved authentication code into its own function.
bertrand
parents: 6516
diff changeset
384
11965
3d75bcc28231 enable seeking in http streams
attila
parents: 11583
diff changeset
385 int
3d75bcc28231 enable seeking in http streams
attila
parents: 11583
diff changeset
386 http_seek( stream_t *stream, off_t pos ) {
3d75bcc28231 enable seeking in http streams
attila
parents: 11583
diff changeset
387 HTTP_header_t *http_hdr = NULL;
3d75bcc28231 enable seeking in http streams
attila
parents: 11583
diff changeset
388 int fd;
3d75bcc28231 enable seeking in http streams
attila
parents: 11583
diff changeset
389 if( stream==NULL ) return 0;
3d75bcc28231 enable seeking in http streams
attila
parents: 11583
diff changeset
390
3d75bcc28231 enable seeking in http streams
attila
parents: 11583
diff changeset
391 if( stream->fd>0 ) closesocket(stream->fd); // need to reconnect to seek in http-stream
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28402
diff changeset
392 fd = http_send_request( stream->streaming_ctrl->url, pos );
11965
3d75bcc28231 enable seeking in http streams
attila
parents: 11583
diff changeset
393 if( fd<0 ) return 0;
3d75bcc28231 enable seeking in http streams
attila
parents: 11583
diff changeset
394
3d75bcc28231 enable seeking in http streams
attila
parents: 11583
diff changeset
395 http_hdr = http_read_response( fd );
3d75bcc28231 enable seeking in http streams
attila
parents: 11583
diff changeset
396
3d75bcc28231 enable seeking in http streams
attila
parents: 11583
diff changeset
397 if( http_hdr==NULL ) return 0;
3d75bcc28231 enable seeking in http streams
attila
parents: 11583
diff changeset
398
30628
5fd3ea86cf0d Print response headers as debugging output also for HTTP seeks.
reimar
parents: 30627
diff changeset
399 if( mp_msg_test(MSGT_NETWORK,MSGL_V) )
5fd3ea86cf0d Print response headers as debugging output also for HTTP seeks.
reimar
parents: 30627
diff changeset
400 http_debug_hdr( http_hdr );
5fd3ea86cf0d Print response headers as debugging output also for HTTP seeks.
reimar
parents: 30627
diff changeset
401
11965
3d75bcc28231 enable seeking in http streams
attila
parents: 11583
diff changeset
402 switch( http_hdr->status_code ) {
3d75bcc28231 enable seeking in http streams
attila
parents: 11583
diff changeset
403 case 200:
3d75bcc28231 enable seeking in http streams
attila
parents: 11583
diff changeset
404 case 206: // OK
3d75bcc28231 enable seeking in http streams
attila
parents: 11583
diff changeset
405 mp_msg(MSGT_NETWORK,MSGL_V,"Content-Type: [%s]\n", http_get_field(http_hdr, "Content-Type") );
3d75bcc28231 enable seeking in http streams
attila
parents: 11583
diff changeset
406 mp_msg(MSGT_NETWORK,MSGL_V,"Content-Length: [%s]\n", http_get_field(http_hdr, "Content-Length") );
3d75bcc28231 enable seeking in http streams
attila
parents: 11583
diff changeset
407 if( http_hdr->body_size>0 ) {
3d75bcc28231 enable seeking in http streams
attila
parents: 11583
diff changeset
408 if( streaming_bufferize( stream->streaming_ctrl, http_hdr->body, http_hdr->body_size )<0 ) {
3d75bcc28231 enable seeking in http streams
attila
parents: 11583
diff changeset
409 http_free( http_hdr );
3d75bcc28231 enable seeking in http streams
attila
parents: 11583
diff changeset
410 return -1;
3d75bcc28231 enable seeking in http streams
attila
parents: 11583
diff changeset
411 }
3d75bcc28231 enable seeking in http streams
attila
parents: 11583
diff changeset
412 }
3d75bcc28231 enable seeking in http streams
attila
parents: 11583
diff changeset
413 break;
3d75bcc28231 enable seeking in http streams
attila
parents: 11583
diff changeset
414 default:
17153
c0b147bdf49d Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents: 17012
diff changeset
415 mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_NW_ErrServerReturned, http_hdr->status_code, http_hdr->reason_phrase );
30627
8ae498c98fec 10l, fix a close() that should be a closesocket()
reimar
parents: 30621
diff changeset
416 closesocket( fd );
11965
3d75bcc28231 enable seeking in http streams
attila
parents: 11583
diff changeset
417 fd = -1;
3d75bcc28231 enable seeking in http streams
attila
parents: 11583
diff changeset
418 }
3d75bcc28231 enable seeking in http streams
attila
parents: 11583
diff changeset
419 stream->fd = fd;
3d75bcc28231 enable seeking in http streams
attila
parents: 11583
diff changeset
420
3d75bcc28231 enable seeking in http streams
attila
parents: 11583
diff changeset
421 if( http_hdr ) {
3d75bcc28231 enable seeking in http streams
attila
parents: 11583
diff changeset
422 http_free( http_hdr );
3d75bcc28231 enable seeking in http streams
attila
parents: 11583
diff changeset
423 stream->streaming_ctrl->data = NULL;
3d75bcc28231 enable seeking in http streams
attila
parents: 11583
diff changeset
424 }
3d75bcc28231 enable seeking in http streams
attila
parents: 11583
diff changeset
425
3d75bcc28231 enable seeking in http streams
attila
parents: 11583
diff changeset
426 stream->pos=pos;
3d75bcc28231 enable seeking in http streams
attila
parents: 11583
diff changeset
427
3d75bcc28231 enable seeking in http streams
attila
parents: 11583
diff changeset
428 return 1;
3d75bcc28231 enable seeking in http streams
attila
parents: 11583
diff changeset
429 }
3d75bcc28231 enable seeking in http streams
attila
parents: 11583
diff changeset
430
3d75bcc28231 enable seeking in http streams
attila
parents: 11583
diff changeset
431
999
92833c9472e8 Continue implementation of the network streaming part.
bertrand
parents: 903
diff changeset
432 int
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
433 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
434 //printf("streaming_bufferize\n");
19062
83c3afeab35d drops casts from void * on malloc/calloc from libmpdemux code
reynaldo
parents: 18466
diff changeset
435 streaming_ctrl->buffer = malloc(size);
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
436 if( streaming_ctrl->buffer==NULL ) {
17153
c0b147bdf49d Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents: 17012
diff changeset
437 mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MemAllocFailed);
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
438 return -1;
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
439 }
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
440 memcpy( streaming_ctrl->buffer, buffer, size );
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
441 streaming_ctrl->buffer_size = size;
3599
2141db140d84 nop_steraming fixed
arpi
parents: 3585
diff changeset
442 return size;
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
443 }
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
444
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
445 int
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
446 nop_streaming_read( int fd, char *buffer, int size, streaming_ctrl_t *stream_ctrl ) {
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
447 int len=0;
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
448 //printf("nop_streaming_read\n");
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
449 if( stream_ctrl->buffer_size!=0 ) {
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
450 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
451 //printf("%d bytes in buffer\n", stream_ctrl->buffer_size);
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
452 len = (size<buffer_len)?size:buffer_len;
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
453 memcpy( buffer, (stream_ctrl->buffer)+(stream_ctrl->buffer_pos), len );
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
454 stream_ctrl->buffer_pos += len;
4251
05affdf4bdcd Moved network related code from open.c to network.c
bertrand
parents: 4236
diff changeset
455 //printf("buffer_pos = %d\n", stream_ctrl->buffer_pos );
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
456 if( stream_ctrl->buffer_pos>=stream_ctrl->buffer_size ) {
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
457 free( stream_ctrl->buffer );
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
458 stream_ctrl->buffer = NULL;
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
459 stream_ctrl->buffer_size = 0;
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
460 stream_ctrl->buffer_pos = 0;
4251
05affdf4bdcd Moved network related code from open.c to network.c
bertrand
parents: 4236
diff changeset
461 //printf("buffer cleaned\n");
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
462 }
4251
05affdf4bdcd Moved network related code from open.c to network.c
bertrand
parents: 4236
diff changeset
463 //printf("read %d bytes from buffer\n", len );
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
464 }
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
465
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
466 if( len<size ) {
3365
eb1c24557dad Checked the return values on read.
bertrand
parents: 3072
diff changeset
467 int ret;
10206
35e306346e59 Using recv/send instead read/write for proper MinGW support (it's a 4.2BSD standard). Patch by FloDt <flodt8@yahoo.de>
alex
parents: 10199
diff changeset
468 ret = recv( fd, buffer+len, size-len, 0 );
3494
fb9de639ed30 Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3453
diff changeset
469 if( ret<0 ) {
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5892
diff changeset
470 mp_msg(MSGT_NETWORK,MSGL_ERR,"nop_streaming_read error : %s\n",strerror(errno));
33719
1a7ac6b2d447 Ensure we do not add strange values to amount of buffered bytes
reimar
parents: 33718
diff changeset
471 ret = 0;
33718
b4c4ee25269f Signal EOF vs. error also via streaming control API (not yet evaluated).
reimar
parents: 32995
diff changeset
472 } else if (ret == 0)
b4c4ee25269f Signal EOF vs. error also via streaming control API (not yet evaluated).
reimar
parents: 32995
diff changeset
473 stream_ctrl->status = streaming_stopped_e;
3365
eb1c24557dad Checked the return values on read.
bertrand
parents: 3072
diff changeset
474 len += ret;
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
475 //printf("read %d bytes from network\n", len );
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
476 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28402
diff changeset
477
999
92833c9472e8 Continue implementation of the network streaming part.
bertrand
parents: 903
diff changeset
478 return len;
92833c9472e8 Continue implementation of the network streaming part.
bertrand
parents: 903
diff changeset
479 }
92833c9472e8 Continue implementation of the network streaming part.
bertrand
parents: 903
diff changeset
480
92833c9472e8 Continue implementation of the network streaming part.
bertrand
parents: 903
diff changeset
481 int
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
482 nop_streaming_seek( int fd, off_t pos, streaming_ctrl_t *stream_ctrl ) {
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
483 return -1;
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
484 }
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
485
999
92833c9472e8 Continue implementation of the network streaming part.
bertrand
parents: 903
diff changeset
486
15954
341bfd887e36 small warning fix:
rathann
parents: 15812
diff changeset
487 void fixup_network_stream_cache(stream_t *stream) {
15585
281d155fb37f ported all network streams to the new API
nicodvb
parents: 15209
diff changeset
488 if(stream->streaming_ctrl->buffering) {
281d155fb37f ported all network streams to the new API
nicodvb
parents: 15209
diff changeset
489 if(stream_cache_size<0) {
281d155fb37f ported all network streams to the new API
nicodvb
parents: 15209
diff changeset
490 // cache option not set, will use our computed value.
281d155fb37f ported all network streams to the new API
nicodvb
parents: 15209
diff changeset
491 // buffer in KBytes, *5 because the prefill is 20% of the buffer.
281d155fb37f ported all network streams to the new API
nicodvb
parents: 15209
diff changeset
492 stream_cache_size = (stream->streaming_ctrl->prebuffer_size/1024)*5;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 15209
diff changeset
493 if( stream_cache_size<64 ) stream_cache_size = 64; // 16KBytes min buffer
281d155fb37f ported all network streams to the new API
nicodvb
parents: 15209
diff changeset
494 }
17153
c0b147bdf49d Harcoded eng strings on libmpdemux/network.c to help_mp
reynaldo
parents: 17012
diff changeset
495 mp_msg(MSGT_NETWORK,MSGL_INFO,MSGTR_MPDEMUX_NW_CacheSizeSetTo, stream_cache_size);
15585
281d155fb37f ported all network streams to the new API
nicodvb
parents: 15209
diff changeset
496 }
9922
6cb7a295ab0e Real rstp:// streaming support, ported from xine
rtognimp
parents: 9900
diff changeset
497 }
6cb7a295ab0e Real rstp:// streaming support, ported from xine
rtognimp
parents: 9900
diff changeset
498