annotate libmpdemux/asf_streaming.c @ 15311:b00b16a1ef05

Error out when invalid format is specified
author reimar
date Sun, 01 May 2005 09:02:25 +0000
parents cb261c423a06
children 281d155fb37f
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
1 #include <stdio.h>
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
2 #include <stdlib.h>
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
3 #include <string.h>
1430
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1340
diff changeset
4 #include <unistd.h>
3494
fb9de639ed30 Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3475
diff changeset
5 #include <errno.h>
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
6 #include <limits.h>
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
7
2555
66837325b929 config.h cleanup, few things added to steram/demuxer headers
arpi
parents: 2489
diff changeset
8 #include "config.h"
66837325b929 config.h cleanup, few things added to steram/demuxer headers
arpi
parents: 2489
diff changeset
9
10281
54bcbf28698a Networking support under MinGW.
diego
parents: 10206
diff changeset
10 #ifndef HAVE_WINSOCK2
54bcbf28698a Networking support under MinGW.
diego
parents: 10206
diff changeset
11 #define closesocket close
54bcbf28698a Networking support under MinGW.
diego
parents: 10206
diff changeset
12 #else
54bcbf28698a Networking support under MinGW.
diego
parents: 10206
diff changeset
13 #include <winsock2.h>
54bcbf28698a Networking support under MinGW.
diego
parents: 10206
diff changeset
14 #endif
54bcbf28698a Networking support under MinGW.
diego
parents: 10206
diff changeset
15
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
16 #include "url.h"
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
17 #include "http.h"
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
18 #include "asf.h"
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
19
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
20 #include "stream.h"
9749
58e5880f4788 Use new config headers
albeu
parents: 8823
diff changeset
21 #include "demuxer.h"
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
22
4315
0d5cba15772b 10l ...
nexus
parents: 4312
diff changeset
23 #include "network.h"
0d5cba15772b 10l ...
nexus
parents: 4312
diff changeset
24
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
25 #ifdef ARCH_X86
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
26 #define ASF_LOAD_GUID_PREFIX(guid) (*(uint32_t *)(guid))
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
27 #else
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
28 #define ASF_LOAD_GUID_PREFIX(guid) \
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
29 ((guid)[3] << 24 | (guid)[2] << 16 | (guid)[1] << 8 | (guid)[0])
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
30 #endif
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
31
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
32 extern int verbose;
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
33
7953
60624e692b95 GCC warning fixes
bertrand
parents: 7472
diff changeset
34
9749
58e5880f4788 Use new config headers
albeu
parents: 8823
diff changeset
35 int asf_http_streaming_start( stream_t *stream, int *demuxer_type );
7953
60624e692b95 GCC warning fixes
bertrand
parents: 7472
diff changeset
36 int asf_mmst_streaming_start( stream_t *stream );
60624e692b95 GCC warning fixes
bertrand
parents: 7472
diff changeset
37
60624e692b95 GCC warning fixes
bertrand
parents: 7472
diff changeset
38
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
39 // We can try several protocol for asf streaming
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
40 // * first the UDP protcol, if there is a firewall, UDP
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
41 // packets will not come back, so the mmsu will failed.
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
42 // * Then we can try TCP, but if there is a proxy for
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
43 // internet connection, the TCP connection will not get
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
44 // through
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
45 // * Then we can try HTTP.
6094
0f4dbbe57c08 Enable mmst support. MMST will be tried if the HTTP support failed.
bertrand
parents: 5915
diff changeset
46 //
12535
48ae29c2298c Use same order as WMP for mms protocols (MMSU, MMST, HTTP)
rtognimp
parents: 12396
diff changeset
47 // Note: Using WMP sequence MMSU then MMST and then HTTP.
48ae29c2298c Use same order as WMP for mms protocols (MMSU, MMST, HTTP)
rtognimp
parents: 12396
diff changeset
48
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
49 int
9749
58e5880f4788 Use new config headers
albeu
parents: 8823
diff changeset
50 asf_streaming_start( stream_t *stream, int *demuxer_type) {
12879
542d1d2200c1 reduced code complexity, and also made consistent with other parts
alex
parents: 12878
diff changeset
51 char *proto = stream->streaming_ctrl->url->protocol;
542d1d2200c1 reduced code complexity, and also made consistent with other parts
alex
parents: 12878
diff changeset
52 int fd = -1;
14525
47dc1d9c350d If asf/tcp fails, asf/http used a wrong port
rtognimp
parents: 14262
diff changeset
53 int port = stream->streaming_ctrl->url->port;
6643
01eaf5358176 Changed the way that the streams are requested.
bertrand
parents: 6094
diff changeset
54
12535
48ae29c2298c Use same order as WMP for mms protocols (MMSU, MMST, HTTP)
rtognimp
parents: 12396
diff changeset
55 // Is protocol even valid mms,mmsu,mmst,http,http_proxy?
12879
542d1d2200c1 reduced code complexity, and also made consistent with other parts
alex
parents: 12878
diff changeset
56 if (!(!strncasecmp(proto, "mmst", 4) || !strncasecmp(proto, "mmsu", 4) ||
542d1d2200c1 reduced code complexity, and also made consistent with other parts
alex
parents: 12878
diff changeset
57 !strncasecmp(proto, "http_proxy", 10) || !strncasecmp(proto, "mms", 3) ||
542d1d2200c1 reduced code complexity, and also made consistent with other parts
alex
parents: 12878
diff changeset
58 !strncasecmp(proto, "http", 4)))
542d1d2200c1 reduced code complexity, and also made consistent with other parts
alex
parents: 12878
diff changeset
59 {
542d1d2200c1 reduced code complexity, and also made consistent with other parts
alex
parents: 12878
diff changeset
60 mp_msg(MSGT_NETWORK,MSGL_ERR,"Unknown protocol: %s\n", proto );
12535
48ae29c2298c Use same order as WMP for mms protocols (MMSU, MMST, HTTP)
rtognimp
parents: 12396
diff changeset
61 return -1;
48ae29c2298c Use same order as WMP for mms protocols (MMSU, MMST, HTTP)
rtognimp
parents: 12396
diff changeset
62 }
48ae29c2298c Use same order as WMP for mms protocols (MMSU, MMST, HTTP)
rtognimp
parents: 12396
diff changeset
63
48ae29c2298c Use same order as WMP for mms protocols (MMSU, MMST, HTTP)
rtognimp
parents: 12396
diff changeset
64 // Is protocol mms or mmsu?
12879
542d1d2200c1 reduced code complexity, and also made consistent with other parts
alex
parents: 12878
diff changeset
65 if (!strncasecmp(proto, "mmsu", 4) || !strncasecmp(proto, "mms", 3))
542d1d2200c1 reduced code complexity, and also made consistent with other parts
alex
parents: 12878
diff changeset
66 {
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
67 mp_msg(MSGT_NETWORK,MSGL_V,"Trying ASF/UDP...\n");
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
68 //fd = asf_mmsu_streaming_start( stream );
12535
48ae29c2298c Use same order as WMP for mms protocols (MMSU, MMST, HTTP)
rtognimp
parents: 12396
diff changeset
69 if( fd>-1 ) return fd; //mmsu support is not implemented yet - using this code
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
70 mp_msg(MSGT_NETWORK,MSGL_V," ===> ASF/UDP failed\n");
7252
0a0527c82560 - If fatal error while trying to connect to a WM server, skip other proto.
bertrand
parents: 6677
diff changeset
71 if( fd==-2 ) return -1;
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
72 }
12535
48ae29c2298c Use same order as WMP for mms protocols (MMSU, MMST, HTTP)
rtognimp
parents: 12396
diff changeset
73
48ae29c2298c Use same order as WMP for mms protocols (MMSU, MMST, HTTP)
rtognimp
parents: 12396
diff changeset
74 //Is protocol mms or mmst?
12879
542d1d2200c1 reduced code complexity, and also made consistent with other parts
alex
parents: 12878
diff changeset
75 if (!strncasecmp(proto, "mmst", 4) || !strncasecmp(proto, "mms", 3))
542d1d2200c1 reduced code complexity, and also made consistent with other parts
alex
parents: 12878
diff changeset
76 {
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
77 mp_msg(MSGT_NETWORK,MSGL_V,"Trying ASF/TCP...\n");
6094
0f4dbbe57c08 Enable mmst support. MMST will be tried if the HTTP support failed.
bertrand
parents: 5915
diff changeset
78 fd = asf_mmst_streaming_start( stream );
14525
47dc1d9c350d If asf/tcp fails, asf/http used a wrong port
rtognimp
parents: 14262
diff changeset
79 stream->streaming_ctrl->url->port = port;
8823
557d34fe438a 10l bug...
bertrand
parents: 8718
diff changeset
80 if( fd>-1 ) return fd;
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
81 mp_msg(MSGT_NETWORK,MSGL_V," ===> ASF/TCP failed\n");
7252
0a0527c82560 - If fatal error while trying to connect to a WM server, skip other proto.
bertrand
parents: 6677
diff changeset
82 if( fd==-2 ) return -1;
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
83 }
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
84
12535
48ae29c2298c Use same order as WMP for mms protocols (MMSU, MMST, HTTP)
rtognimp
parents: 12396
diff changeset
85 //Is protocol http, http_proxy, or mms?
12879
542d1d2200c1 reduced code complexity, and also made consistent with other parts
alex
parents: 12878
diff changeset
86 if (!strncasecmp(proto, "http_proxy", 10) || !strncasecmp(proto, "http", 4) ||
542d1d2200c1 reduced code complexity, and also made consistent with other parts
alex
parents: 12878
diff changeset
87 !strncasecmp(proto, "mms", 3))
542d1d2200c1 reduced code complexity, and also made consistent with other parts
alex
parents: 12878
diff changeset
88 {
12535
48ae29c2298c Use same order as WMP for mms protocols (MMSU, MMST, HTTP)
rtognimp
parents: 12396
diff changeset
89 mp_msg(MSGT_NETWORK,MSGL_V,"Trying ASF/HTTP...\n");
48ae29c2298c Use same order as WMP for mms protocols (MMSU, MMST, HTTP)
rtognimp
parents: 12396
diff changeset
90 fd = asf_http_streaming_start( stream, demuxer_type );
14525
47dc1d9c350d If asf/tcp fails, asf/http used a wrong port
rtognimp
parents: 14262
diff changeset
91 stream->streaming_ctrl->url->port = port;
12535
48ae29c2298c Use same order as WMP for mms protocols (MMSU, MMST, HTTP)
rtognimp
parents: 12396
diff changeset
92 if( fd>-1 ) return fd;
48ae29c2298c Use same order as WMP for mms protocols (MMSU, MMST, HTTP)
rtognimp
parents: 12396
diff changeset
93 mp_msg(MSGT_NETWORK,MSGL_V," ===> ASF/HTTP failed\n");
48ae29c2298c Use same order as WMP for mms protocols (MMSU, MMST, HTTP)
rtognimp
parents: 12396
diff changeset
94 if( fd==-2 ) return -1;
48ae29c2298c Use same order as WMP for mms protocols (MMSU, MMST, HTTP)
rtognimp
parents: 12396
diff changeset
95 }
48ae29c2298c Use same order as WMP for mms protocols (MMSU, MMST, HTTP)
rtognimp
parents: 12396
diff changeset
96
48ae29c2298c Use same order as WMP for mms protocols (MMSU, MMST, HTTP)
rtognimp
parents: 12396
diff changeset
97 //everything failed
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
98 return -1;
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
99 }
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
100
4046
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
101 int
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
102 asf_streaming(ASF_stream_chunck_t *stream_chunck, int *drop_packet ) {
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
103 /*
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
104 printf("ASF stream chunck size=%d\n", stream_chunck->size);
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
105 printf("length: %d\n", length );
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
106 printf("0x%02X\n", stream_chunck->type );
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
107 */
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
108 if( drop_packet!=NULL ) *drop_packet = 0;
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
109
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
110 if( stream_chunck->size<8 ) {
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
111 mp_msg(MSGT_NETWORK,MSGL_ERR,"Ahhhh, stream_chunck size is too small: %d\n", stream_chunck->size);
4046
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
112 return -1;
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
113 }
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
114 if( stream_chunck->size!=stream_chunck->size_confirm ) {
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
115 mp_msg(MSGT_NETWORK,MSGL_ERR,"size_confirm mismatch!: %d %d\n", stream_chunck->size, stream_chunck->size_confirm);
4046
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
116 return -1;
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
117 }
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
118 /*
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
119 printf(" type: 0x%02X\n", stream_chunck->type );
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
120 printf(" size: %d (0x%02X)\n", stream_chunck->size, stream_chunck->size );
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
121 printf(" sequence_number: 0x%04X\n", stream_chunck->sequence_number );
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
122 printf(" unknown: 0x%02X\n", stream_chunck->unknown );
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
123 printf(" size_confirm: 0x%02X\n", stream_chunck->size_confirm );
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
124 */
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
125 switch(stream_chunck->type) {
5617
75a43bb3ed80 Added big endian handling for the ASF_chunk_t struct.
bertrand
parents: 4334
diff changeset
126 case ASF_STREAMING_CLEAR: // $C Clear ASF configuration
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
127 mp_msg(MSGT_NETWORK,MSGL_V,"=====> Clearing ASF stream configuration!\n");
4046
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
128 if( drop_packet!=NULL ) *drop_packet = 1;
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
129 return stream_chunck->size;
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
130 break;
5617
75a43bb3ed80 Added big endian handling for the ASF_chunk_t struct.
bertrand
parents: 4334
diff changeset
131 case ASF_STREAMING_DATA: // $D Data follows
4046
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
132 // printf("=====> Data follows\n");
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
133 break;
5617
75a43bb3ed80 Added big endian handling for the ASF_chunk_t struct.
bertrand
parents: 4334
diff changeset
134 case ASF_STREAMING_END_TRANS: // $E Transfer complete
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
135 mp_msg(MSGT_NETWORK,MSGL_V,"=====> Transfer complete\n");
4046
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
136 if( drop_packet!=NULL ) *drop_packet = 1;
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
137 return stream_chunck->size;
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
138 break;
5617
75a43bb3ed80 Added big endian handling for the ASF_chunk_t struct.
bertrand
parents: 4334
diff changeset
139 case ASF_STREAMING_HEADER: // $H ASF header chunk follows
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
140 mp_msg(MSGT_NETWORK,MSGL_V,"=====> ASF header chunk follows\n");
4046
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
141 break;
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
142 default:
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
143 mp_msg(MSGT_NETWORK,MSGL_V,"=====> Unknown stream type 0x%x\n", stream_chunck->type );
4046
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
144 }
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
145 return stream_chunck->size+4;
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
146 }
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
147
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
148 extern int find_asf_guid(char *buf, const char *guid, int cur_pos, int buf_len);
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
149 extern const char asf_file_header_guid[];
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
150 extern const char asf_stream_header_guid[];
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
151 extern const char asf_stream_group_guid[];
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
152 extern int audio_id;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
153 extern int video_id;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
154
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
155 static int max_idx(int s_count, int *s_rates, int bound) {
14639
cb261c423a06 fix for streams that do not send a bitrate
reimar
parents: 14525
diff changeset
156 int i, best = -1, rate = -1;
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
157 for (i = 0; i < s_count; i++) {
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
158 if (s_rates[i] > rate && s_rates[i] <= bound) {
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
159 rate = s_rates[i];
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
160 best = i;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
161 }
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
162 }
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
163 return best;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
164 }
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
165
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
166 static int
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
167 asf_streaming_parse_header(int fd, streaming_ctrl_t* streaming_ctrl) {
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
168 ASF_header_t asfh;
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
169 ASF_stream_chunck_t chunk;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
170 asf_http_streaming_ctrl_t* asf_ctrl = (asf_http_streaming_ctrl_t*) streaming_ctrl->data;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
171 char* buffer=NULL, *chunk_buffer=NULL;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
172 int i,r,size,pos = 0;
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
173 int start;
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
174 int buffer_size = 0;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
175 int chunk_size2read = 0;
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
176 int bw = streaming_ctrl->bandwidth;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
177 int *v_rates = NULL, *a_rates = NULL;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
178 int v_rate = 0, a_rate = 0, a_idx = -1, v_idx = -1;
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
179
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
180 if(asf_ctrl == NULL) return -1;
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
181
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
182 // The ASF header can be in several network chunks. For example if the content description
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
183 // is big, the ASF header will be split in 2 network chunk.
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
184 // So we need to retrieve all the chunk before starting to parse the header.
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
185 do {
7953
60624e692b95 GCC warning fixes
bertrand
parents: 7472
diff changeset
186 for( r=0; r < (int)sizeof(ASF_stream_chunck_t) ; ) {
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
187 i = nop_streaming_read(fd,((char*)&chunk)+r,sizeof(ASF_stream_chunck_t) - r,streaming_ctrl);
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
188 if(i <= 0) return -1;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
189 r += i;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
190 }
5617
75a43bb3ed80 Added big endian handling for the ASF_chunk_t struct.
bertrand
parents: 4334
diff changeset
191 // Endian handling of the stream chunk
75a43bb3ed80 Added big endian handling for the ASF_chunk_t struct.
bertrand
parents: 4334
diff changeset
192 le2me_ASF_stream_chunck_t(&chunk);
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
193 size = asf_streaming( &chunk, &r) - sizeof(ASF_stream_chunck_t);
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
194 if(r) mp_msg(MSGT_NETWORK,MSGL_WARN,"Warning : drop header ????\n");
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
195 if(size < 0){
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
196 mp_msg(MSGT_NETWORK,MSGL_ERR,"Error while parsing chunk header\n");
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
197 return -1;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
198 }
5617
75a43bb3ed80 Added big endian handling for the ASF_chunk_t struct.
bertrand
parents: 4334
diff changeset
199 if (chunk.type != ASF_STREAMING_HEADER) {
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
200 mp_msg(MSGT_NETWORK,MSGL_ERR,"Don't got a header as first chunk !!!!\n");
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
201 return -1;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
202 }
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
203
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
204 buffer = (char*) malloc(size+buffer_size);
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
205 if(buffer == NULL) {
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
206 mp_msg(MSGT_NETWORK,MSGL_FATAL,"Error can't allocate %d bytes buffer\n",size+buffer_size);
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
207 return -1;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
208 }
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
209 if( chunk_buffer!=NULL ) {
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
210 memcpy( buffer, chunk_buffer, buffer_size );
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
211 free( chunk_buffer );
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
212 }
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
213 chunk_buffer = buffer;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
214 buffer += buffer_size;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
215 buffer_size += size;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
216
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
217 for(r = 0; r < size;) {
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
218 i = nop_streaming_read(fd,buffer+r,size-r,streaming_ctrl);
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
219 if(i < 0) {
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
220 mp_msg(MSGT_NETWORK,MSGL_ERR,"Error while reading network stream\n");
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
221 return -1;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
222 }
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
223 r += i;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
224 }
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
225
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
226 if( chunk_size2read==0 ) {
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
227 if(size < (int)sizeof(asfh)) {
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
228 mp_msg(MSGT_NETWORK,MSGL_ERR,"Error chunk is too small\n");
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
229 return -1;
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
230 } else mp_msg(MSGT_NETWORK,MSGL_DBG2,"Got chunk\n");
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
231 memcpy(&asfh,buffer,sizeof(asfh));
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
232 le2me_ASF_header_t(&asfh);
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
233 chunk_size2read = asfh.objh.size;
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
234 mp_msg(MSGT_NETWORK,MSGL_DBG2,"Size 2 read=%d\n", chunk_size2read);
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
235 }
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
236 } while( buffer_size<chunk_size2read);
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
237 buffer = chunk_buffer;
3551
314987c0aaf4 Fixed the multiple ASF header stream chunk.
bertrand
parents: 3533
diff changeset
238 size = buffer_size;
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
239
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
240 if(asfh.cno > 256) {
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
241 mp_msg(MSGT_NETWORK,MSGL_ERR,"Error sub chunks number is invalid\n");
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
242 return -1;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
243 }
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
244
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
245 start = sizeof(asfh);
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
246
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
247 pos = find_asf_guid(buffer, asf_file_header_guid, start, size);
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
248 if (pos >= 0) {
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
249 ASF_file_header_t *fileh = (ASF_file_header_t *) &buffer[pos];
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
250 pos += sizeof(ASF_file_header_t);
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
251 if (pos > size) goto len_err_out;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
252 le2me_ASF_file_header_t(fileh);
4288
b84e9861461c Changed the asf_file_header_t struct to read all the fields properly.
bertrand
parents: 4145
diff changeset
253 /*
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
254 if(fileh.packetsize != fileh.packetsize2) {
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
255 printf("Error packetsize check don't match\n");
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
256 return -1;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
257 }
4288
b84e9861461c Changed the asf_file_header_t struct to read all the fields properly.
bertrand
parents: 4145
diff changeset
258 */
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
259 asf_ctrl->packet_size = fileh->max_packet_size;
4288
b84e9861461c Changed the asf_file_header_t struct to read all the fields properly.
bertrand
parents: 4145
diff changeset
260 // before playing.
b84e9861461c Changed the asf_file_header_t struct to read all the fields properly.
bertrand
parents: 4145
diff changeset
261 // preroll: time in ms to bufferize before playing
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
262 streaming_ctrl->prebuffer_size = (unsigned int)(((double)fileh->preroll/1000.0)*((double)fileh->max_bitrate/8.0));
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
263 }
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
264
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
265 pos = start;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
266 while ((pos = find_asf_guid(buffer, asf_stream_header_guid, pos, size)) >= 0)
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
267 {
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
268 ASF_stream_header_t *streamh = (ASF_stream_header_t *)&buffer[pos];
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
269 pos += sizeof(ASF_stream_header_t);
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
270 if (pos > size) goto len_err_out;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
271 le2me_ASF_stream_header_t(streamh);
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
272 switch(ASF_LOAD_GUID_PREFIX(streamh->type)) {
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
273 case 0xF8699E40 : // audio stream
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
274 if(asf_ctrl->audio_streams == NULL){
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
275 asf_ctrl->audio_streams = (int*)malloc(sizeof(int));
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
276 asf_ctrl->n_audio = 1;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
277 } else {
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
278 asf_ctrl->n_audio++;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
279 asf_ctrl->audio_streams = (int*)realloc(asf_ctrl->audio_streams,
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
280 asf_ctrl->n_audio*sizeof(int));
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
281 }
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
282 asf_ctrl->audio_streams[asf_ctrl->n_audio-1] = streamh->stream_no;
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
283 break;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
284 case 0xBC19EFC0 : // video stream
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
285 if(asf_ctrl->video_streams == NULL){
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
286 asf_ctrl->video_streams = (int*)malloc(sizeof(int));
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
287 asf_ctrl->n_video = 1;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
288 } else {
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
289 asf_ctrl->n_video++;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
290 asf_ctrl->video_streams = (int*)realloc(asf_ctrl->video_streams,
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
291 asf_ctrl->n_video*sizeof(int));
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
292 }
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
293 asf_ctrl->video_streams[asf_ctrl->n_video-1] = streamh->stream_no;
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
294 break;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
295 }
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
296 }
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
297
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
298 // always allocate to avoid lots of ifs later
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
299 v_rates = calloc(asf_ctrl->n_video, sizeof(int));
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
300 a_rates = calloc(asf_ctrl->n_audio, sizeof(int));
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
301
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
302 pos = find_asf_guid(buffer, asf_stream_group_guid, start, size);
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
303 if (pos >= 0) {
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
304 // stream bitrate properties object
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
305 int stream_count;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
306 char *ptr = &buffer[pos];
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
307
14262
04ed193d1e32 10l, variable declarations must be before mp_msg.
reimar
parents: 14236
diff changeset
308 mp_msg(MSGT_NETWORK, MSGL_V, "Stream bitrate properties object\n");
6643
01eaf5358176 Changed the way that the streams are requested.
bertrand
parents: 6094
diff changeset
309 stream_count = le2me_16(*(uint16_t*)ptr);
01eaf5358176 Changed the way that the streams are requested.
bertrand
parents: 6094
diff changeset
310 ptr += sizeof(uint16_t);
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
311 if (ptr > &buffer[size]) goto len_err_out;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
312 mp_msg(MSGT_NETWORK, MSGL_V, " stream count=[0x%x][%u]\n",
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
313 stream_count, stream_count );
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
314 for( i=0 ; i<stream_count ; i++ ) {
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
315 uint32_t rate;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
316 int id;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
317 int j;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
318 id = le2me_16(*(uint16_t*)ptr);
6643
01eaf5358176 Changed the way that the streams are requested.
bertrand
parents: 6094
diff changeset
319 ptr += sizeof(uint16_t);
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
320 if (ptr > &buffer[size]) goto len_err_out;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
321 memcpy(&rate, ptr, sizeof(uint32_t));// workaround unaligment bug on sparc
6643
01eaf5358176 Changed the way that the streams are requested.
bertrand
parents: 6094
diff changeset
322 ptr += sizeof(uint32_t);
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
323 if (ptr > &buffer[size]) goto len_err_out;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
324 rate = le2me_32(rate);
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
325 mp_msg(MSGT_NETWORK, MSGL_V,
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
326 " stream id=[0x%x][%u]\n", id, id);
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
327 mp_msg(MSGT_NETWORK, MSGL_V,
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
328 " max bitrate=[0x%x][%u]\n", rate, rate);
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
329 for (j = 0; j < asf_ctrl->n_video; j++) {
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
330 if (id == asf_ctrl->video_streams[j]) {
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
331 mp_msg(MSGT_NETWORK, MSGL_V, " is video stream\n");
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
332 v_rates[j] = rate;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
333 break;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
334 }
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
335 }
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
336 for (j = 0; j < asf_ctrl->n_audio; j++) {
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
337 if (id == asf_ctrl->audio_streams[j]) {
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
338 mp_msg(MSGT_NETWORK, MSGL_V, " is audio stream\n");
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
339 a_rates[j] = rate;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
340 break;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
341 }
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
342 }
6643
01eaf5358176 Changed the way that the streams are requested.
bertrand
parents: 6094
diff changeset
343 }
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
344 }
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
345 free(buffer);
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
346
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
347 // automatic stream selection based on bandwidth
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
348 if (bw == 0) bw = INT_MAX;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
349 mp_msg(MSGT_NETWORK, MSGL_V, "Max bandwidth set to %d\n", bw);
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
350
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
351 if (asf_ctrl->n_audio) {
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
352 // find lowest-bitrate audio stream
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
353 a_rate = a_rates[0];
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
354 a_idx = 0;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
355 for (i = 0; i < asf_ctrl->n_audio; i++) {
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
356 if (a_rates[i] < a_rate) {
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
357 a_rate = a_rates[i];
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
358 a_idx = i;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
359 }
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
360 }
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
361 if (max_idx(asf_ctrl->n_video, v_rates, bw - a_rate) < 0) {
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
362 // both audio and video are not possible, try video only next
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
363 a_idx = -1;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
364 a_rate = 0;
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
365 }
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
366 }
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
367 // find best video stream
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
368 v_idx = max_idx(asf_ctrl->n_video, v_rates, bw - a_rate);
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
369 if (v_idx >= 0)
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
370 v_rate = v_rates[v_idx];
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
371
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
372 // find best audio stream
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
373 a_idx = max_idx(asf_ctrl->n_audio, a_rates, bw - v_rate);
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
374
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
375 free(v_rates);
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
376 free(a_rates);
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
377
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
378 if (a_idx < 0 && v_idx < 0) {
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
379 mp_msg(MSGT_NETWORK, MSGL_FATAL, "bandwidth too small, "
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
380 "file cannot be played!\n");
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
381 return -1;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
382 }
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
383
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
384 if (audio_id > 0)
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
385 // a audio stream was forced
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
386 asf_ctrl->audio_id = audio_id;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
387 else if (a_idx >= 0)
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
388 asf_ctrl->audio_id = asf_ctrl->audio_streams[a_idx];
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
389 else if (asf_ctrl->n_audio) {
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
390 mp_msg(MSGT_NETWORK, MSGL_WARN, "bandwidth too small, "
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
391 "deselected audio stream\n");
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
392 audio_id = -2;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
393 }
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
394
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
395 if (video_id > 0)
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
396 // a video stream was forced
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
397 asf_ctrl->video_id = video_id;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
398 else if (v_idx >= 0)
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
399 asf_ctrl->video_id = asf_ctrl->video_streams[v_idx];
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
400 else if (asf_ctrl->n_video) {
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
401 mp_msg(MSGT_NETWORK, MSGL_WARN, "bandwidth too small, "
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
402 "deselected video stream\n");
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
403 video_id = -2;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
404 }
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
405
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
406 return 1;
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
407
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
408 len_err_out:
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
409 mp_msg(MSGT_NETWORK, MSGL_FATAL, "Invalid length in ASF header!\n");
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
410 if (buffer) free(buffer);
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
411 if (v_rates) free(v_rates);
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
412 if (a_rates) free(a_rates);
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
413 return -1;
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
414 }
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
415
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
416 int
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
417 asf_http_streaming_read( int fd, char *buffer, int size, streaming_ctrl_t *streaming_ctrl ) {
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
418 static ASF_stream_chunck_t chunk;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
419 int read,chunk_size = 0;
7472
c4434bdf6e51 tons of warning fixes, also some 10l bugfixes, including Dominik's PVA bug
arpi
parents: 7310
diff changeset
420 static int rest = 0, drop_chunk = 0, waiting = 0;
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
421 asf_http_streaming_ctrl_t *asf_http_ctrl = (asf_http_streaming_ctrl_t*)streaming_ctrl->data;
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
422
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
423 while(1) {
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
424 if (rest == 0 && waiting == 0) {
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
425 read = 0;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
426 while(read < (int)sizeof(ASF_stream_chunck_t)){
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
427 int r = nop_streaming_read( fd, ((char*)&chunk) + read,
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
428 sizeof(ASF_stream_chunck_t)-read,
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
429 streaming_ctrl );
4041
879a668ee540 various small streaming fixes by Alban Bedel <albeu@free.fr>
arpi
parents: 3727
diff changeset
430 if(r <= 0){
879a668ee540 various small streaming fixes by Alban Bedel <albeu@free.fr>
arpi
parents: 3727
diff changeset
431 if( r < 0)
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
432 mp_msg(MSGT_NETWORK,MSGL_ERR,"Error while reading chunk header\n");
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
433 return -1;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
434 }
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
435 read += r;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
436 }
5617
75a43bb3ed80 Added big endian handling for the ASF_chunk_t struct.
bertrand
parents: 4334
diff changeset
437
75a43bb3ed80 Added big endian handling for the ASF_chunk_t struct.
bertrand
parents: 4334
diff changeset
438 // Endian handling of the stream chunk
75a43bb3ed80 Added big endian handling for the ASF_chunk_t struct.
bertrand
parents: 4334
diff changeset
439 le2me_ASF_stream_chunck_t(&chunk);
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
440 chunk_size = asf_streaming( &chunk, &drop_chunk );
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
441 if(chunk_size < 0) {
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
442 mp_msg(MSGT_NETWORK,MSGL_ERR,"Error while parsing chunk header\n");
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
443 return -1;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
444 }
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
445 chunk_size -= sizeof(ASF_stream_chunck_t);
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
446
5617
75a43bb3ed80 Added big endian handling for the ASF_chunk_t struct.
bertrand
parents: 4334
diff changeset
447 if(chunk.type != ASF_STREAMING_HEADER && (!drop_chunk)) {
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
448 if (asf_http_ctrl->packet_size < chunk_size) {
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
449 mp_msg(MSGT_NETWORK,MSGL_ERR,"Error chunk_size > packet_size\n");
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
450 return -1;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
451 }
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
452 waiting = asf_http_ctrl->packet_size;
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
453 } else {
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
454 waiting = chunk_size;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
455 }
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
456
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
457 } else if (rest){
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
458 chunk_size = rest;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
459 rest = 0;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
460 }
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
461
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
462 read = 0;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
463 if ( waiting >= chunk_size) {
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
464 if (chunk_size > size){
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
465 rest = chunk_size - size;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
466 chunk_size = size;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
467 }
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
468 while(read < chunk_size) {
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
469 int got = nop_streaming_read( fd,buffer+read,chunk_size-read,streaming_ctrl );
4041
879a668ee540 various small streaming fixes by Alban Bedel <albeu@free.fr>
arpi
parents: 3727
diff changeset
470 if(got <= 0) {
879a668ee540 various small streaming fixes by Alban Bedel <albeu@free.fr>
arpi
parents: 3727
diff changeset
471 if(got < 0)
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
472 mp_msg(MSGT_NETWORK,MSGL_ERR,"Error while reading chunk\n");
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
473 return -1;
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
474 }
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
475 read += got;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
476 }
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
477 waiting -= read;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
478 if (drop_chunk) continue;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
479 }
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
480 if (rest == 0 && waiting > 0 && size-read > 0) {
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
481 int s = MIN(waiting,size-read);
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
482 memset(buffer+read,0,s);
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
483 waiting -= s;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
484 read += s;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
485 }
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
486 break;
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
487 }
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
488
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
489 return read;
2489
0ecc1b4f7cf8 Added ASF http server streaming (Not mms streaming).
bertrand
parents: 2310
diff changeset
490 }
0ecc1b4f7cf8 Added ASF http server streaming (Not mms streaming).
bertrand
parents: 2310
diff changeset
491
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
492 int
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
493 asf_http_streaming_seek( int fd, off_t pos, streaming_ctrl_t *streaming_ctrl ) {
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
494 return -1;
7953
60624e692b95 GCC warning fixes
bertrand
parents: 7472
diff changeset
495 // to shut up gcc warning
60624e692b95 GCC warning fixes
bertrand
parents: 7472
diff changeset
496 fd++;
60624e692b95 GCC warning fixes
bertrand
parents: 7472
diff changeset
497 pos++;
60624e692b95 GCC warning fixes
bertrand
parents: 7472
diff changeset
498 streaming_ctrl=NULL;
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
499 }
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
500
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
501 int
4312
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
502 asf_header_check( HTTP_header_t *http_hdr ) {
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
503 ASF_obj_header_t *objh;
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
504 if( http_hdr==NULL ) return -1;
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
505 if( http_hdr->body==NULL || http_hdr->body_size<sizeof(ASF_obj_header_t) ) return -1;
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
506
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
507 objh = (ASF_obj_header_t*)http_hdr->body;
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
508 if( ASF_LOAD_GUID_PREFIX(objh->guid)==0x75B22630 ) return 0;
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
509 return -1;
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
510 }
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
511
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
512 int
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
513 asf_http_streaming_type(char *content_type, char *features, HTTP_header_t *http_hdr ) {
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
514 if( content_type==NULL ) return ASF_Unknown_e;
7252
0a0527c82560 - If fatal error while trying to connect to a WM server, skip other proto.
bertrand
parents: 6677
diff changeset
515 if( !strcasecmp(content_type, "application/octet-stream") ||
0a0527c82560 - If fatal error while trying to connect to a WM server, skip other proto.
bertrand
parents: 6677
diff changeset
516 !strcasecmp(content_type, "application/vnd.ms.wms-hdr.asfv1") || // New in Corona, first request
11349
786407b1bc78 Accept video/x-ms-asf as the MIME type for ASF as well. Patch by Dominique Andre Gunia <Dominique.Gunia@schunter.etc.tu-bs.de>.
mosu
parents: 10939
diff changeset
517 !strcasecmp(content_type, "application/x-mms-framed") || // New in Corana, second request
786407b1bc78 Accept video/x-ms-asf as the MIME type for ASF as well. Patch by Dominique Andre Gunia <Dominique.Gunia@schunter.etc.tu-bs.de>.
mosu
parents: 10939
diff changeset
518 !strcasecmp(content_type, "video/x-ms-asf")) {
7252
0a0527c82560 - If fatal error while trying to connect to a WM server, skip other proto.
bertrand
parents: 6677
diff changeset
519
8718
d630a6f4c7c0 - Now mmst will use the MMS/TCP implementation first, instead of trying
bertrand
parents: 7953
diff changeset
520 if( strstr(features, "broadcast") ) {
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
521 mp_msg(MSGT_NETWORK,MSGL_V,"=====> ASF Live stream\n");
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
522 return ASF_Live_e;
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
523 } else {
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
524 mp_msg(MSGT_NETWORK,MSGL_V,"=====> ASF Prerecorded\n");
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
525 return ASF_Prerecorded_e;
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
526 }
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
527 } else {
4312
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
528 // Ok in a perfect world, web servers should be well configured
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
529 // so we could used mime type to know the stream type,
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
530 // but guess what? All of them are not well configured.
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
531 // So we have to check for an asf header :(, but it works :p
4334
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
532 if( http_hdr->body_size>sizeof(ASF_obj_header_t) ) {
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
533 if( asf_header_check( http_hdr )==0 ) {
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
534 mp_msg(MSGT_NETWORK,MSGL_V,"=====> ASF Plain text\n");
4334
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
535 return ASF_PlainText_e;
8718
d630a6f4c7c0 - Now mmst will use the MMS/TCP implementation first, instead of trying
bertrand
parents: 7953
diff changeset
536 } else if( (!strcasecmp(content_type, "text/html")) ) {
12654
433c0d389f6f correct spelling
alex
parents: 12535
diff changeset
537 mp_msg(MSGT_NETWORK,MSGL_V,"=====> HTML, MPlayer is not a browser...yet!\n");
8718
d630a6f4c7c0 - Now mmst will use the MMS/TCP implementation first, instead of trying
bertrand
parents: 7953
diff changeset
538 return ASF_Unknown_e;
4334
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
539 } else {
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
540 mp_msg(MSGT_NETWORK,MSGL_V,"=====> ASF Redirector\n");
4334
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
541 return ASF_Redirector_e;
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
542 }
4312
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
543 } else {
4334
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
544 if( (!strcasecmp(content_type, "audio/x-ms-wax")) ||
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
545 (!strcasecmp(content_type, "audio/x-ms-wma")) ||
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
546 (!strcasecmp(content_type, "video/x-ms-asf")) ||
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
547 (!strcasecmp(content_type, "video/x-ms-afs")) ||
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
548 (!strcasecmp(content_type, "video/x-ms-wvx")) ||
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
549 (!strcasecmp(content_type, "video/x-ms-wmv")) ||
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
550 (!strcasecmp(content_type, "video/x-ms-wma")) ) {
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
551 mp_msg(MSGT_NETWORK,MSGL_ERR,"=====> ASF Redirector\n");
4334
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
552 return ASF_Redirector_e;
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
553 } else if( !strcasecmp(content_type, "text/plain") ) {
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
554 mp_msg(MSGT_NETWORK,MSGL_V,"=====> ASF Plain text\n");
4334
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
555 return ASF_PlainText_e;
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
556 } else {
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
557 mp_msg(MSGT_NETWORK,MSGL_V,"=====> ASF unknown content-type: %s\n", content_type );
4334
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
558 return ASF_Unknown_e;
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
559 }
4312
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
560 }
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
561 }
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
562 return ASF_Unknown_e;
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
563 }
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
564
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
565 HTTP_header_t *
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
566 asf_http_request(streaming_ctrl_t *streaming_ctrl) {
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
567 HTTP_header_t *http_hdr;
4121
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
568 URL_t *url = NULL;
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
569 URL_t *server_url = NULL;
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
570 asf_http_streaming_ctrl_t *asf_http_ctrl;
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
571 char str[250];
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
572 char *ptr;
6643
01eaf5358176 Changed the way that the streams are requested.
bertrand
parents: 6094
diff changeset
573 int i, enable;
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
574
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
575 int offset_hi=0, offset_lo=0, length=0;
6643
01eaf5358176 Changed the way that the streams are requested.
bertrand
parents: 6094
diff changeset
576 int asf_nb_stream=0, stream_id;
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
577
4121
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
578 // Sanity check
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
579 if( streaming_ctrl==NULL ) return NULL;
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
580 url = streaming_ctrl->url;
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
581 asf_http_ctrl = (asf_http_streaming_ctrl_t*)streaming_ctrl->data;
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
582 if( url==NULL || asf_http_ctrl==NULL ) return NULL;
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
583
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
584 // Common header for all requests.
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
585 http_hdr = http_new_header();
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
586 http_set_field( http_hdr, "Accept: */*" );
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
587 http_set_field( http_hdr, "User-Agent: NSPlayer/4.1.0.3856" );
6670
70b54c2e0292 Add missing authentication for asf streaming.
atmos4
parents: 6643
diff changeset
588 http_add_basic_authentication( http_hdr, url->username, url->password );
4121
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
589
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
590 // Check if we are using a proxy
4145
c66fddd8867c Changed the proxy protocol to http_proxy.
bertrand
parents: 4121
diff changeset
591 if( !strcasecmp( url->protocol, "http_proxy" ) ) {
4121
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
592 server_url = url_new( (url->file)+1 );
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
593 if( server_url==NULL ) {
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
594 mp_msg(MSGT_NETWORK,MSGL_ERR,"Invalid proxy URL\n");
4121
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
595 http_free( http_hdr );
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
596 return NULL;
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
597 }
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
598 http_set_uri( http_hdr, server_url->url );
10939
55c9903bd51c simple fix for buffer overflow (remotely exploitable). feel free to
rfelker
parents: 10625
diff changeset
599 sprintf( str, "Host: %.220s:%d", server_url->hostname, server_url->port );
4121
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
600 url_free( server_url );
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
601 } else {
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
602 http_set_uri( http_hdr, url->file );
10939
55c9903bd51c simple fix for buffer overflow (remotely exploitable). feel free to
rfelker
parents: 10625
diff changeset
603 sprintf( str, "Host: %.220s:%d", url->hostname, url->port );
4121
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
604 }
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
605
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
606 http_set_field( http_hdr, str );
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
607 http_set_field( http_hdr, "Pragma: xClientGUID={c77e7400-738a-11d2-9add-0020af0a3278}" );
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
608 sprintf(str,
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
609 "Pragma: no-cache,rate=1.000000,stream-time=0,stream-offset=%u:%u,request-context=%d,max-duration=%u",
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
610 offset_hi, offset_lo, asf_http_ctrl->request, length );
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
611 http_set_field( http_hdr, str );
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
612
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
613 switch( asf_http_ctrl->streaming_type ) {
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
614 case ASF_Live_e:
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
615 case ASF_Prerecorded_e:
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
616 http_set_field( http_hdr, "Pragma: xPlayStrm=1" );
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
617 ptr = str;
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
618 ptr += sprintf( ptr, "Pragma: stream-switch-entry=");
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
619 if(asf_http_ctrl->n_audio > 0) {
6643
01eaf5358176 Changed the way that the streams are requested.
bertrand
parents: 6094
diff changeset
620 for( i=0; i<asf_http_ctrl->n_audio ; i++ ) {
01eaf5358176 Changed the way that the streams are requested.
bertrand
parents: 6094
diff changeset
621 stream_id = asf_http_ctrl->audio_streams[i];
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
622 if(stream_id == asf_http_ctrl->audio_id) {
6643
01eaf5358176 Changed the way that the streams are requested.
bertrand
parents: 6094
diff changeset
623 enable = 0;
01eaf5358176 Changed the way that the streams are requested.
bertrand
parents: 6094
diff changeset
624 } else {
01eaf5358176 Changed the way that the streams are requested.
bertrand
parents: 6094
diff changeset
625 enable = 2;
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
626 continue;
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
627 }
6643
01eaf5358176 Changed the way that the streams are requested.
bertrand
parents: 6094
diff changeset
628 asf_nb_stream++;
01eaf5358176 Changed the way that the streams are requested.
bertrand
parents: 6094
diff changeset
629 ptr += sprintf(ptr, "ffff:%d:%d ", stream_id, enable);
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
630 }
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
631 }
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
632 if(asf_http_ctrl->n_video > 0) {
6643
01eaf5358176 Changed the way that the streams are requested.
bertrand
parents: 6094
diff changeset
633 for( i=0; i<asf_http_ctrl->n_video ; i++ ) {
01eaf5358176 Changed the way that the streams are requested.
bertrand
parents: 6094
diff changeset
634 stream_id = asf_http_ctrl->video_streams[i];
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
635 if(stream_id == asf_http_ctrl->video_id) {
6643
01eaf5358176 Changed the way that the streams are requested.
bertrand
parents: 6094
diff changeset
636 enable = 0;
01eaf5358176 Changed the way that the streams are requested.
bertrand
parents: 6094
diff changeset
637 } else {
01eaf5358176 Changed the way that the streams are requested.
bertrand
parents: 6094
diff changeset
638 enable = 2;
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
639 continue;
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
640 }
6643
01eaf5358176 Changed the way that the streams are requested.
bertrand
parents: 6094
diff changeset
641 asf_nb_stream++;
01eaf5358176 Changed the way that the streams are requested.
bertrand
parents: 6094
diff changeset
642 ptr += sprintf(ptr, "ffff:%d:%d ", stream_id, enable);
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
643 }
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
644 }
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
645 http_set_field( http_hdr, str );
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
646 sprintf( str, "Pragma: stream-switch-count=%d", asf_nb_stream );
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
647 http_set_field( http_hdr, str );
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
648 break;
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
649 case ASF_Redirector_e:
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
650 break;
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
651 case ASF_Unknown_e:
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
652 // First request goes here.
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
653 break;
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
654 default:
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
655 mp_msg(MSGT_NETWORK,MSGL_ERR,"Unknown asf stream type\n");
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
656 }
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
657
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
658 http_set_field( http_hdr, "Connection: Close" );
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
659 http_build_request( http_hdr );
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
660
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
661 return http_hdr;
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
662 }
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
663
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
664 int
7953
60624e692b95 GCC warning fixes
bertrand
parents: 7472
diff changeset
665 asf_http_parse_response(asf_http_streaming_ctrl_t *asf_http_ctrl, HTTP_header_t *http_hdr ) {
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
666 char *content_type, *pragma;
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
667 char features[64] = "\0";
7953
60624e692b95 GCC warning fixes
bertrand
parents: 7472
diff changeset
668 size_t len;
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
669 if( http_response_parse(http_hdr)<0 ) {
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
670 mp_msg(MSGT_NETWORK,MSGL_ERR,"Failed to parse HTTP response\n");
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
671 return -1;
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
672 }
6677
0b3d4b298056 Fixed the asf http authentication.
bertrand
parents: 6670
diff changeset
673 switch( http_hdr->status_code ) {
0b3d4b298056 Fixed the asf http authentication.
bertrand
parents: 6670
diff changeset
674 case 200:
0b3d4b298056 Fixed the asf http authentication.
bertrand
parents: 6670
diff changeset
675 break;
0b3d4b298056 Fixed the asf http authentication.
bertrand
parents: 6670
diff changeset
676 case 401: // Authentication required
0b3d4b298056 Fixed the asf http authentication.
bertrand
parents: 6670
diff changeset
677 return ASF_Authenticate_e;
0b3d4b298056 Fixed the asf http authentication.
bertrand
parents: 6670
diff changeset
678 default:
0b3d4b298056 Fixed the asf http authentication.
bertrand
parents: 6670
diff changeset
679 mp_msg(MSGT_NETWORK,MSGL_ERR,"Server return %d:%s\n", http_hdr->status_code, http_hdr->reason_phrase);
0b3d4b298056 Fixed the asf http authentication.
bertrand
parents: 6670
diff changeset
680 return -1;
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
681 }
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
682
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
683 content_type = http_get_field( http_hdr, "Content-Type");
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
684 //printf("Content-Type: [%s]\n", content_type);
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
685
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
686 pragma = http_get_field( http_hdr, "Pragma");
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
687 while( pragma!=NULL ) {
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
688 char *comma_ptr=NULL;
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
689 char *end;
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
690 //printf("Pragma: [%s]\n", pragma );
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
691 // The pragma line can get severals attributes
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
692 // separeted with a comma ','.
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
693 do {
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
694 if( !strncasecmp( pragma, "features=", 9) ) {
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
695 pragma += 9;
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
696 end = strstr( pragma, "," );
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
697 if( end==NULL ) {
7953
60624e692b95 GCC warning fixes
bertrand
parents: 7472
diff changeset
698 size_t s = strlen(pragma);
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
699 if(s > sizeof(features)) {
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
700 mp_msg(MSGT_NETWORK,MSGL_WARN,"ASF HTTP PARSE WARNING : Pragma %s cuted from %d bytes to %d\n",pragma,s,sizeof(features));
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
701 len = sizeof(features);
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
702 } else {
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
703 len = s;
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
704 }
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
705 } else {
7953
60624e692b95 GCC warning fixes
bertrand
parents: 7472
diff changeset
706 len = MIN((unsigned int)(end-pragma),sizeof(features));
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
707 }
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
708 strncpy( features, pragma, len );
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
709 features[len]='\0';
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
710 break;
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
711 }
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
712 comma_ptr = strstr( pragma, "," );
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
713 if( comma_ptr!=NULL ) {
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
714 pragma = comma_ptr+1;
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
715 if( pragma[0]==' ' ) pragma++;
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
716 }
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
717 } while( comma_ptr!=NULL );
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
718 pragma = http_get_next_field( http_hdr );
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
719 }
7953
60624e692b95 GCC warning fixes
bertrand
parents: 7472
diff changeset
720 asf_http_ctrl->streaming_type = asf_http_streaming_type( content_type, features, http_hdr );
60624e692b95 GCC warning fixes
bertrand
parents: 7472
diff changeset
721 return 0;
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
722 }
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
723
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
724 int
9749
58e5880f4788 Use new config headers
albeu
parents: 8823
diff changeset
725 asf_http_streaming_start( stream_t *stream, int *demuxer_type ) {
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
726 HTTP_header_t *http_hdr=NULL;
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
727 URL_t *url = stream->streaming_ctrl->url;
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
728 asf_http_streaming_ctrl_t *asf_http_ctrl;
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
729 char buffer[BUFFER_SIZE];
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
730 int i, ret;
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
731 int fd = stream->fd;
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
732 int done;
6677
0b3d4b298056 Fixed the asf http authentication.
bertrand
parents: 6670
diff changeset
733 int auth_retry = 0;
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
734
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
735 asf_http_ctrl = (asf_http_streaming_ctrl_t*)malloc(sizeof(asf_http_streaming_ctrl_t));
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
736 if( asf_http_ctrl==NULL ) {
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
737 mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed\n");
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
738 return -1;
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
739 }
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
740 asf_http_ctrl->streaming_type = ASF_Unknown_e;
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
741 asf_http_ctrl->request = 1;
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
742 asf_http_ctrl->audio_streams = asf_http_ctrl->video_streams = NULL;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
743 asf_http_ctrl->n_audio = asf_http_ctrl->n_video = 0;
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
744 stream->streaming_ctrl->data = (void*)asf_http_ctrl;
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
745
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
746 do {
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
747 done = 1;
10281
54bcbf28698a Networking support under MinGW.
diego
parents: 10206
diff changeset
748 if( fd>0 ) closesocket( fd );
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
749
4145
c66fddd8867c Changed the proxy protocol to http_proxy.
bertrand
parents: 4121
diff changeset
750 if( !strcasecmp( url->protocol, "http_proxy" ) ) {
4121
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
751 if( url->port==0 ) url->port = 8080;
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
752 } else {
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
753 if( url->port==0 ) url->port = 80;
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
754 }
10625
620cc649f519 ftp support. The change on connect2Server is needed bcs we need 2
albeu
parents: 10281
diff changeset
755 fd = connect2Server( url->hostname, url->port, 1);
7252
0a0527c82560 - If fatal error while trying to connect to a WM server, skip other proto.
bertrand
parents: 6677
diff changeset
756 if( fd<0 ) return fd;
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
757
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
758 http_hdr = asf_http_request( stream->streaming_ctrl );
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
759 mp_msg(MSGT_NETWORK,MSGL_DBG2,"Request [%s]\n", http_hdr->buffer );
7953
60624e692b95 GCC warning fixes
bertrand
parents: 7472
diff changeset
760 for(i=0; i < (int)http_hdr->buffer_size ; ) {
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: 9749
diff changeset
761 int r = send( fd, http_hdr->buffer+i, http_hdr->buffer_size-i, 0 );
3494
fb9de639ed30 Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3475
diff changeset
762 if(r <0) {
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
763 mp_msg(MSGT_NETWORK,MSGL_ERR,"Socket write error : %s\n",strerror(errno));
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
764 return -1;
3494
fb9de639ed30 Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3475
diff changeset
765 }
fb9de639ed30 Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3475
diff changeset
766 i += r;
fb9de639ed30 Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3475
diff changeset
767 }
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
768 http_free( http_hdr );
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
769 http_hdr = http_new_header();
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
770 do {
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: 9749
diff changeset
771 i = recv( fd, buffer, BUFFER_SIZE, 0 );
4121
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
772 //printf("read: %d\n", i );
7310
d8e2623a2ea1 Don't try to reread from the socket if the server says EOF
bertrand
parents: 7252
diff changeset
773 if( i<=0 ) {
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
774 perror("read");
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
775 http_free( http_hdr );
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
776 return -1;
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
777 }
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
778 http_response_append( http_hdr, buffer, i );
2489
0ecc1b4f7cf8 Added ASF http server streaming (Not mms streaming).
bertrand
parents: 2310
diff changeset
779 } while( !http_is_header_entire( http_hdr ) );
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
780 if( verbose>0 ) {
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
781 http_hdr->buffer[http_hdr->buffer_size]='\0';
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
782 mp_msg(MSGT_NETWORK,MSGL_DBG2,"Response [%s]\n", http_hdr->buffer );
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
783 }
7953
60624e692b95 GCC warning fixes
bertrand
parents: 7472
diff changeset
784 ret = asf_http_parse_response(asf_http_ctrl, http_hdr);
60624e692b95 GCC warning fixes
bertrand
parents: 7472
diff changeset
785 if( ret<0 ) {
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
786 mp_msg(MSGT_NETWORK,MSGL_ERR,"Failed to parse header\n");
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
787 http_free( http_hdr );
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
788 return -1;
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
789 }
7953
60624e692b95 GCC warning fixes
bertrand
parents: 7472
diff changeset
790 switch( asf_http_ctrl->streaming_type ) {
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
791 case ASF_Live_e:
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
792 case ASF_Prerecorded_e:
2489
0ecc1b4f7cf8 Added ASF http server streaming (Not mms streaming).
bertrand
parents: 2310
diff changeset
793 case ASF_PlainText_e:
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
794 if( http_hdr->body_size>0 ) {
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
795 if( streaming_bufferize( stream->streaming_ctrl, http_hdr->body, http_hdr->body_size )<0 ) {
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
796 http_free( http_hdr );
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
797 return -1;
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
798 }
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
799 }
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
800 if( asf_http_ctrl->request==1 ) {
7953
60624e692b95 GCC warning fixes
bertrand
parents: 7472
diff changeset
801 if( asf_http_ctrl->streaming_type!=ASF_PlainText_e ) {
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
802 // First request, we only got the ASF header.
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
803 ret = asf_streaming_parse_header(fd,stream->streaming_ctrl);
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
804 if(ret < 0) return -1;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
805 if(asf_http_ctrl->n_audio == 0 && asf_http_ctrl->n_video == 0) {
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
806 mp_msg(MSGT_NETWORK,MSGL_ERR,"No stream found\n");
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
807 return -1;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
808 }
4312
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
809 asf_http_ctrl->request++;
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
810 done = 0;
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
811 } else {
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
812 done = 1;
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
813 }
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
814 }
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
815 break;
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
816 case ASF_Redirector_e:
4073
5f28d9d7d346 Changed the return value of the start function. Doesn't return the fd
bertrand
parents: 4046
diff changeset
817 if( http_hdr->body_size>0 ) {
5f28d9d7d346 Changed the return value of the start function. Doesn't return the fd
bertrand
parents: 4046
diff changeset
818 if( streaming_bufferize( stream->streaming_ctrl, http_hdr->body, http_hdr->body_size )<0 ) {
5f28d9d7d346 Changed the return value of the start function. Doesn't return the fd
bertrand
parents: 4046
diff changeset
819 http_free( http_hdr );
5f28d9d7d346 Changed the return value of the start function. Doesn't return the fd
bertrand
parents: 4046
diff changeset
820 return -1;
5f28d9d7d346 Changed the return value of the start function. Doesn't return the fd
bertrand
parents: 4046
diff changeset
821 }
5f28d9d7d346 Changed the return value of the start function. Doesn't return the fd
bertrand
parents: 4046
diff changeset
822 }
9749
58e5880f4788 Use new config headers
albeu
parents: 8823
diff changeset
823 *demuxer_type = DEMUXER_TYPE_PLAYLIST;
4073
5f28d9d7d346 Changed the return value of the start function. Doesn't return the fd
bertrand
parents: 4046
diff changeset
824 done = 1;
5f28d9d7d346 Changed the return value of the start function. Doesn't return the fd
bertrand
parents: 4046
diff changeset
825 break;
6677
0b3d4b298056 Fixed the asf http authentication.
bertrand
parents: 6670
diff changeset
826 case ASF_Authenticate_e:
0b3d4b298056 Fixed the asf http authentication.
bertrand
parents: 6670
diff changeset
827 if( http_authenticate( http_hdr, url, &auth_retry)<0 ) return -1;
0b3d4b298056 Fixed the asf http authentication.
bertrand
parents: 6670
diff changeset
828 asf_http_ctrl->streaming_type = ASF_Unknown_e;
0b3d4b298056 Fixed the asf http authentication.
bertrand
parents: 6670
diff changeset
829 done = 0;
0b3d4b298056 Fixed the asf http authentication.
bertrand
parents: 6670
diff changeset
830 break;
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
831 case ASF_Unknown_e:
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
832 default:
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
833 mp_msg(MSGT_NETWORK,MSGL_ERR,"Unknown ASF streaming type\n");
10281
54bcbf28698a Networking support under MinGW.
diego
parents: 10206
diff changeset
834 closesocket(fd);
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
835 http_free( http_hdr );
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
836 return -1;
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
837 }
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
838 // Check if we got a redirect.
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
839 } while(!done);
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
840
4073
5f28d9d7d346 Changed the return value of the start function. Doesn't return the fd
bertrand
parents: 4046
diff changeset
841 stream->fd = fd;
7953
60624e692b95 GCC warning fixes
bertrand
parents: 7472
diff changeset
842 if( asf_http_ctrl->streaming_type==ASF_PlainText_e || asf_http_ctrl->streaming_type==ASF_Redirector_e ) {
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
843 stream->streaming_ctrl->streaming_read = nop_streaming_read;
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
844 stream->streaming_ctrl->streaming_seek = nop_streaming_seek;
2489
0ecc1b4f7cf8 Added ASF http server streaming (Not mms streaming).
bertrand
parents: 2310
diff changeset
845 } else {
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
846 stream->streaming_ctrl->streaming_read = asf_http_streaming_read;
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
847 stream->streaming_ctrl->streaming_seek = asf_http_streaming_seek;
4288
b84e9861461c Changed the asf_file_header_t struct to read all the fields properly.
bertrand
parents: 4145
diff changeset
848 stream->streaming_ctrl->buffering = 1;
2489
0ecc1b4f7cf8 Added ASF http server streaming (Not mms streaming).
bertrand
parents: 2310
diff changeset
849 }
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
850 stream->streaming_ctrl->status = streaming_playing_e;
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
851
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
852 http_free( http_hdr );
4073
5f28d9d7d346 Changed the return value of the start function. Doesn't return the fd
bertrand
parents: 4046
diff changeset
853 return 0;
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
854 }
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
855