annotate libmpdemux/asf_streaming.c @ 4559:5dc383bb1c82

added mga_top_reserved module parameter to skip a configurable amount of space at the top of video memory. this is needed to prevent corruption of the kernel's console font when using the "fastfont" option with matroxfb.
author rfelker
date Thu, 07 Feb 2002 02:07:29 +0000
parents 3fb147d59ca6
children 75a43bb3ed80
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>
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
6
2555
66837325b929 config.h cleanup, few things added to steram/demuxer headers
arpi
parents: 2489
diff changeset
7 #include "config.h"
66837325b929 config.h cleanup, few things added to steram/demuxer headers
arpi
parents: 2489
diff changeset
8
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
9 #include "url.h"
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
10 #include "http.h"
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
11 #include "asf.h"
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
12
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
13 #include "stream.h"
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
14
4315
0d5cba15772b 10l ...
nexus
parents: 4312
diff changeset
15 #include "network.h"
0d5cba15772b 10l ...
nexus
parents: 4312
diff changeset
16
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
17 typedef struct {
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
18 ASF_StreamType_e streaming_type;
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
19 int request;
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
20 int packet_size;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
21 int *audio_streams,n_audio,*video_streams,n_video;
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
22 } asf_http_streaming_ctrl_t;
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
23
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
24 #ifdef ARCH_X86
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
25 #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
26 #else
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
27 #define ASF_LOAD_GUID_PREFIX(guid) \
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
28 ((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
29 #endif
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
30
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
31 extern int audio_id,video_id;
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
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
34 // ASF streaming support several network protocol.
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
35 // One use UDP, not known, yet!
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
36 // Another is HTTP, this one is known.
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
37 // So for now, we use the HTTP protocol.
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
38 //
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.
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
46 int
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
47 asf_streaming_start( stream_t *stream ) {
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
48 char proto_s[10];
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
49 int fd = -1;
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
50
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
51 strncpy( proto_s, stream->streaming_ctrl->url->protocol, 10 );
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
52
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
53 if( !strncasecmp( proto_s, "mms", 3) && strncasecmp( proto_s, "mmst", 4) ) {
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
54 printf("Trying ASF/UDP...\n");
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
55 //fd = asf_mmsu_streaming_start( stream );
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
56 if( fd!=-1 ) return fd;
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
57 printf(" ===> ASF/UDP failed\n");
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
58 }
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
59 if( !strncasecmp( proto_s, "mms", 3) ) {
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
60 printf("Trying ASF/TCP...\n");
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
61 //fd = asf_mmst_streaming_start( stream );
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
62 if( fd!=-1 ) return fd;
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
63 printf(" ===> ASF/TCP failed\n");
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
64 }
4121
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
65 if( !strncasecmp( proto_s, "http", 4) ||
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
66 !strncasecmp( proto_s, "mms", 3) ||
4145
c66fddd8867c Changed the proxy protocol to http_proxy.
bertrand
parents: 4121
diff changeset
67 !strncasecmp( proto_s, "http_proxy", 10)
4121
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
68 ) {
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
69 printf("Trying ASF/HTTP...\n");
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
70 fd = asf_http_streaming_start( stream );
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
71 if( fd!=-1 ) return fd;
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
72 printf(" ===> ASF/HTTP failed\n");
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
73 }
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
74
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
75 printf("Unknown protocol: %s\n", proto_s );
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
76 return -1;
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
77 }
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
78
4046
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
79 int
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
80 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
81 /*
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
82 printf("ASF stream chunck size=%d\n", stream_chunck->size);
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
83 printf("length: %d\n", length );
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
84 printf("0x%02X\n", stream_chunck->type );
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
85 */
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
86 if( drop_packet!=NULL ) *drop_packet = 0;
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
87
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
88 if( stream_chunck->size<8 ) {
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
89 printf("Ahhhh, stream_chunck size is too small: %d\n", stream_chunck->size);
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
90 return -1;
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
91 }
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
92 if( stream_chunck->size!=stream_chunck->size_confirm ) {
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
93 printf("size_confirm mismatch!: %d %d\n", stream_chunck->size, stream_chunck->size_confirm);
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
94 return -1;
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
95 }
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
96 /*
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
97 printf(" type: 0x%02X\n", stream_chunck->type );
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
98 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
99 printf(" sequence_number: 0x%04X\n", stream_chunck->sequence_number );
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
100 printf(" unknown: 0x%02X\n", stream_chunck->unknown );
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
101 printf(" size_confirm: 0x%02X\n", stream_chunck->size_confirm );
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
102 */
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
103 switch(stream_chunck->type) {
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
104 case 0x4324: // $C Clear ASF configuration
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
105 printf("=====> Clearing ASF stream configuration!\n");
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
106 if( drop_packet!=NULL ) *drop_packet = 1;
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
107 return stream_chunck->size;
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
108 break;
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
109 case 0x4424: // $D Data follows
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
110 // printf("=====> Data follows\n");
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
111 break;
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
112 case 0x4524: // $E Transfer complete
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
113 printf("=====> Transfer complete\n");
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
114 if( drop_packet!=NULL ) *drop_packet = 1;
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
115 return stream_chunck->size;
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
116 break;
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
117 case 0x4824: // $H ASF header chunk follows
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
118 printf("=====> ASF header chunk follows\n");
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
119 break;
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
120 default:
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
121 printf("=====> Unknown stream type 0x%x\n", stream_chunck->type );
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
122 }
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
123 return stream_chunck->size+4;
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
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
126 static int
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
127 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
128 ASF_header_t asfh;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
129 ASF_obj_header_t objh;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
130 ASF_file_header_t fileh;
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
131 ASF_stream_header_t streamh;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
132 ASF_stream_chunck_t chunk;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
133 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
134 char* buffer=NULL, *chunk_buffer=NULL;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
135 int i,r,size,pos = 0;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
136 int buffer_size = 0;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
137 int chunk_size2read = 0;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
138
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
139 if(asf_ctrl == NULL) return -1;
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
140
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
141 // 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
142 // 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
143 // 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
144 do {
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
145 for( r=0; r < sizeof(ASF_stream_chunck_t) ; ) {
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
146 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
147 if(i <= 0) return -1;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
148 r += i;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
149 }
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
150 size = asf_streaming( &chunk, &r) - sizeof(ASF_stream_chunck_t);
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
151 if(r) printf("Warning : drop header ????\n");
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
152 if(size < 0){
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
153 printf("Error while parsing chunk header\n");
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
154 return -1;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
155 }
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
156 if (chunk.type != 0x4824) {
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
157 printf("Don't got a header as first chunk !!!!\n");
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
158 return -1;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
159 }
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
160
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
161 buffer = (char*) malloc(size+buffer_size);
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
162 if(buffer == NULL) {
3551
314987c0aaf4 Fixed the multiple ASF header stream chunk.
bertrand
parents: 3533
diff changeset
163 printf("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
164 return -1;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
165 }
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
166 if( chunk_buffer!=NULL ) {
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
167 memcpy( buffer, chunk_buffer, buffer_size );
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
168 free( chunk_buffer );
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
169 }
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
170 chunk_buffer = buffer;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
171 buffer += buffer_size;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
172 buffer_size += size;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
173
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
174 for(r = 0; r < size;) {
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
175 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
176 if(i < 0) {
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
177 printf("Error while reading network stream\n");
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
178 return -1;
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 r += i;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
181 }
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
182
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
183 if( chunk_size2read==0 ) {
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
184 if(size < (int)sizeof(asfh)) {
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
185 printf("Error chunk is too small\n");
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
186 return -1;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
187 } else printf("Got chunk\n");
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
188 memcpy(&asfh,buffer,sizeof(asfh));
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
189 le2me_ASF_header_t(&asfh);
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
190 chunk_size2read = asfh.objh.size;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
191 printf("Size 2 read=%d\n", chunk_size2read);
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
192 }
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
193 } while( buffer_size<chunk_size2read);
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
194 buffer = chunk_buffer;
3551
314987c0aaf4 Fixed the multiple ASF header stream chunk.
bertrand
parents: 3533
diff changeset
195 size = buffer_size;
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
196
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
197 if(asfh.cno > 256) {
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
198 printf("Error sub chunks number is invalid\n");
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
199 return -1;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
200 }
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
201
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
202 pos += sizeof(asfh);
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
203
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
204 while(size - pos >= (int)sizeof(objh)) {
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
205 memcpy(&objh,buffer+pos,sizeof(objh));
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
206 le2me_ASF_obj_header_t(&objh);
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
207
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
208 switch(ASF_LOAD_GUID_PREFIX(objh.guid)) {
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
209 case 0x8CABDCA1 : // File header
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
210 pos += sizeof(objh);
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
211 memcpy(&fileh,buffer + pos,sizeof(fileh));
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
212 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
213 /*
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
214 if(fileh.packetsize != fileh.packetsize2) {
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
215 printf("Error packetsize check don't match\n");
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
216 return -1;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
217 }
4288
b84e9861461c Changed the asf_file_header_t struct to read all the fields properly.
bertrand
parents: 4145
diff changeset
218 */
b84e9861461c Changed the asf_file_header_t struct to read all the fields properly.
bertrand
parents: 4145
diff changeset
219 asf_ctrl->packet_size = fileh.max_packet_size;
b84e9861461c Changed the asf_file_header_t struct to read all the fields properly.
bertrand
parents: 4145
diff changeset
220 // before playing.
b84e9861461c Changed the asf_file_header_t struct to read all the fields properly.
bertrand
parents: 4145
diff changeset
221 // preroll: time in ms to bufferize before playing
b84e9861461c Changed the asf_file_header_t struct to read all the fields properly.
bertrand
parents: 4145
diff changeset
222 streaming_ctrl->prebuffer_size = (unsigned int)((double)((double)fileh.preroll/1000)*((double)fileh.max_bitrate/8));
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
223 pos += sizeof(fileh);
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
224 break;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
225 case 0xB7DC0791 : // stream header
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
226 pos += sizeof(objh);
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
227 memcpy(&streamh,buffer + pos,sizeof(streamh));
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
228 le2me_ASF_stream_header_t(&streamh);
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
229 pos += sizeof(streamh) + streamh.type_size;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
230 switch(ASF_LOAD_GUID_PREFIX(streamh.type)) {
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
231 case 0xF8699E40 : // audio stream
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
232 if(asf_ctrl->audio_streams == NULL){
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
233 asf_ctrl->audio_streams = (int*)malloc(sizeof(int));
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
234 asf_ctrl->n_audio = 1;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
235 } else {
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
236 asf_ctrl->n_audio++;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
237 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
238 asf_ctrl->n_audio*sizeof(int));
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
239 }
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
240 asf_ctrl->audio_streams[asf_ctrl->n_audio-1] = streamh.stream_no;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
241 pos += streamh.stream_size;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
242 break;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
243 case 0xBC19EFC0 : // video stream
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
244 if(asf_ctrl->video_streams == NULL){
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
245 asf_ctrl->video_streams = (int*)malloc(sizeof(int));
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
246 asf_ctrl->n_video = 1;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
247 } else {
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
248 asf_ctrl->n_video++;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
249 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
250 asf_ctrl->n_video*sizeof(int));
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
251 }
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
252 asf_ctrl->video_streams[asf_ctrl->n_video-1] = streamh.stream_no;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
253 break;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
254 }
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
255 break;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
256 default :
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
257 pos += objh.size;
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
258 break;
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
259 }
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
260 }
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
261 free(buffer);
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
262 return 1;
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
263 }
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
264
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
265 int
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
266 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
267 static ASF_stream_chunck_t chunk;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
268 int read,chunk_size = 0;
4041
879a668ee540 various small streaming fixes by Alban Bedel <albeu@free.fr>
arpi
parents: 3727
diff changeset
269 static int rest = 0, drop_chunk = 0, waiting = 0,eof= 0;
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
270 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
271
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
272 while(1) {
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
273 if (rest == 0 && waiting == 0) {
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
274 read = 0;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
275 while(read < (int)sizeof(ASF_stream_chunck_t)){
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
276 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
277 sizeof(ASF_stream_chunck_t)-read,
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
278 streaming_ctrl );
4041
879a668ee540 various small streaming fixes by Alban Bedel <albeu@free.fr>
arpi
parents: 3727
diff changeset
279 if(r <= 0){
879a668ee540 various small streaming fixes by Alban Bedel <albeu@free.fr>
arpi
parents: 3727
diff changeset
280 if( r < 0)
879a668ee540 various small streaming fixes by Alban Bedel <albeu@free.fr>
arpi
parents: 3727
diff changeset
281 printf("Error while reading chunk header\n");
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
282 return -1;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
283 }
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
284 read += r;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
285 }
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
286 chunk_size = asf_streaming( &chunk, &drop_chunk );
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
287 if(chunk_size < 0) {
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
288 printf("Error while parsing chunk header\n");
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
289 return -1;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
290 }
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
291 chunk_size -= sizeof(ASF_stream_chunck_t);
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
292
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
293 if(chunk.type != 0x4824 && (!drop_chunk)) {
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
294 if (asf_http_ctrl->packet_size < chunk_size) {
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
295 printf("Error chunk_size > packet_size\n");
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
296 return -1;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
297 }
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
298 waiting = asf_http_ctrl->packet_size;
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
299 } else {
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
300 waiting = chunk_size;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
301 }
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
302
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
303 } else if (rest){
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
304 chunk_size = rest;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
305 rest = 0;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
306 }
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
307
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
308 read = 0;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
309 if ( waiting >= chunk_size) {
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
310 if (chunk_size > size){
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
311 rest = chunk_size - size;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
312 chunk_size = size;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
313 }
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
314 while(read < chunk_size) {
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
315 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
316 if(got <= 0) {
879a668ee540 various small streaming fixes by Alban Bedel <albeu@free.fr>
arpi
parents: 3727
diff changeset
317 if(got < 0)
879a668ee540 various small streaming fixes by Alban Bedel <albeu@free.fr>
arpi
parents: 3727
diff changeset
318 printf("Error while reading chunk\n");
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
319 return -1;
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
320 }
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
321 read += got;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
322 }
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
323 waiting -= read;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
324 if (drop_chunk) continue;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
325 }
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
326 if (rest == 0 && waiting > 0 && size-read > 0) {
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
327 int s = MIN(waiting,size-read);
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
328 memset(buffer+read,0,s);
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
329 waiting -= s;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
330 read += s;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
331 }
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
332 break;
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
333 }
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
334
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
335 return read;
2489
0ecc1b4f7cf8 Added ASF http server streaming (Not mms streaming).
bertrand
parents: 2310
diff changeset
336 }
0ecc1b4f7cf8 Added ASF http server streaming (Not mms streaming).
bertrand
parents: 2310
diff changeset
337
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
338 int
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
339 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
340 return -1;
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
341 }
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
342
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
343 int
4312
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
344 asf_header_check( HTTP_header_t *http_hdr ) {
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
345 ASF_obj_header_t *objh;
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
346 if( http_hdr==NULL ) return -1;
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
347 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
348
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
349 objh = (ASF_obj_header_t*)http_hdr->body;
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
350 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
351 return -1;
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
352 }
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
353
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
354 int
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
355 asf_http_streaming_type(char *content_type, char *features, HTTP_header_t *http_hdr ) {
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
356 if( content_type==NULL ) return ASF_Unknown_e;
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
357 if( !strcasecmp(content_type, "application/octet-stream") ) {
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
358 if( features==NULL ) {
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
359 printf("=====> ASF Prerecorded\n");
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
360 return ASF_Prerecorded_e;
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
361 } else if( strstr(features, "broadcast")) {
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
362 printf("=====> ASF Live stream\n");
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
363 return ASF_Live_e;
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
364 } else {
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
365 printf("=====> ASF Prerecorded\n");
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
366 return ASF_Prerecorded_e;
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
367 }
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
368 } else {
4312
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
369 // 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
370 // 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
371 // 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
372 // 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
373 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
374 if( asf_header_check( http_hdr )==0 ) {
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
375 printf("=====> ASF Plain text\n");
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
376 return ASF_PlainText_e;
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
377 } else {
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
378 printf("=====> ASF Redirector\n");
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
379 return ASF_Redirector_e;
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
380 }
4312
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
381 } else {
4334
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
382 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
383 (!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
384 (!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
385 (!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
386 (!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
387 (!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
388 (!strcasecmp(content_type, "video/x-ms-wma")) ) {
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
389 printf("=====> ASF Redirector\n");
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
390 return ASF_Redirector_e;
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
391 } else if( !strcasecmp(content_type, "text/plain") ) {
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
392 printf("=====> ASF Plain text\n");
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
393 return ASF_PlainText_e;
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
394 } else {
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
395 printf("=====> ASF unknown content-type: %s\n", content_type );
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
396 return ASF_Unknown_e;
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
397 }
4312
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
398 }
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
399 }
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
400 return ASF_Unknown_e;
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
401 }
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
402
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
403 HTTP_header_t *
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
404 asf_http_request(streaming_ctrl_t *streaming_ctrl) {
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
405 HTTP_header_t *http_hdr;
4121
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
406 URL_t *url = NULL;
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
407 URL_t *server_url = NULL;
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
408 asf_http_streaming_ctrl_t *asf_http_ctrl;
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
409 char str[250];
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
410 char *ptr;
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
411 int i,as = -1,vs = -1;
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
412
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
413 int offset_hi=0, offset_lo=0, length=0;
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
414 int asf_nb_stream=0;
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
415
4121
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
416 // Sanity check
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
417 if( streaming_ctrl==NULL ) return NULL;
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
418 url = streaming_ctrl->url;
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
419 asf_http_ctrl = (asf_http_streaming_ctrl_t*)streaming_ctrl->data;
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
420 if( url==NULL || asf_http_ctrl==NULL ) return NULL;
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
421
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
422 // Common header for all requests.
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
423 http_hdr = http_new_header();
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
424 http_set_field( http_hdr, "Accept: */*" );
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
425 http_set_field( http_hdr, "User-Agent: NSPlayer/4.1.0.3856" );
4121
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
426
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
427 // Check if we are using a proxy
4145
c66fddd8867c Changed the proxy protocol to http_proxy.
bertrand
parents: 4121
diff changeset
428 if( !strcasecmp( url->protocol, "http_proxy" ) ) {
4121
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
429 server_url = url_new( (url->file)+1 );
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
430 if( server_url==NULL ) {
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
431 printf("Invalid proxy URL\n");
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
432 http_free( http_hdr );
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
433 return NULL;
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
434 }
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
435 http_set_uri( http_hdr, server_url->url );
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
436 sprintf( str, "Host: %s:%d", server_url->hostname, server_url->port );
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
437 url_free( server_url );
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
438 } else {
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
439 http_set_uri( http_hdr, url->file );
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
440 sprintf( str, "Host: %s:%d", url->hostname, url->port );
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
441 }
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
442
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
443 http_set_field( http_hdr, str );
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
444 http_set_field( http_hdr, "Pragma: xClientGUID={c77e7400-738a-11d2-9add-0020af0a3278}" );
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
445 sprintf(str,
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
446 "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
447 offset_hi, offset_lo, asf_http_ctrl->request, length );
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
448 http_set_field( http_hdr, str );
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
449
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
450 switch( asf_http_ctrl->streaming_type ) {
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
451 case ASF_Live_e:
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
452 case ASF_Prerecorded_e:
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
453 http_set_field( http_hdr, "Pragma: xPlayStrm=1" );
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
454 ptr = str;
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
455 ptr += sprintf( ptr, "Pragma: stream-switch-entry=");
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
456 if(asf_http_ctrl->n_audio > 0) {
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
457 if(audio_id > 0) {
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
458 for( i=0; i<asf_http_ctrl->n_audio ; i++ ) {
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
459 if(asf_http_ctrl->audio_streams[i] == audio_id) {
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
460 as = audio_id;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
461 break;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
462 }
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
463 }
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
464 }
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
465 if(as < 0) {
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
466 if(audio_id > 0)
3727
deba2b4fe4b4 As nobody fixed this yet:
pl
parents: 3551
diff changeset
467 printf("Audio stream %d don't exist\n", as);
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
468 as = asf_http_ctrl->audio_streams[0];
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
469 }
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
470 ptr += sprintf(ptr, " ffff:%d:0",as);
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
471 asf_nb_stream++;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
472 }
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
473 if(asf_http_ctrl->n_video > 0) {
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
474 if(video_id > 0) {
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
475 for( i=0; i<asf_http_ctrl->n_video ; i++ ) {
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
476 if(asf_http_ctrl->video_streams[i] == video_id) {
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
477 vs = video_id;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
478 break;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
479 }
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
480 }
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
481 }
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
482 if(vs < 0) {
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
483 if(video_id > 0)
3727
deba2b4fe4b4 As nobody fixed this yet:
pl
parents: 3551
diff changeset
484 printf("Video stream %d don't exist\n",vs);
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
485 vs = asf_http_ctrl->video_streams[0];
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
486 }
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
487 ptr += sprintf( ptr, " ffff:%d:0",vs);
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
488 asf_nb_stream++;
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
489 }
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
490 http_set_field( http_hdr, str );
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
491 sprintf( str, "Pragma: stream-switch-count=%d", asf_nb_stream );
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
492 http_set_field( http_hdr, str );
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
493 break;
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
494 case ASF_Redirector_e:
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
495 break;
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
496 case ASF_Unknown_e:
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
497 // First request goes here.
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
498 break;
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
499 default:
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
500 printf("Unknown asf stream type\n");
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
501 }
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
502
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
503 http_set_field( http_hdr, "Connection: Close" );
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
504 http_build_request( http_hdr );
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
505
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
506 return http_hdr;
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
507 }
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
508
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
509 int
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
510 asf_http_parse_response( HTTP_header_t *http_hdr ) {
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
511 char *content_type, *pragma;
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
512 char features[64] = "\0";
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
513 int len;
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
514 if( http_response_parse(http_hdr)<0 ) {
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
515 printf("Failed to parse HTTP response\n");
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
516 return -1;
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
517 }
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
518 if( http_hdr->status_code!=200 ) {
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
519 printf("Server return %d:%s\n", http_hdr->status_code, http_hdr->reason_phrase);
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
520 return -1;
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
521 }
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
522
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
523 content_type = http_get_field( http_hdr, "Content-Type");
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
524 //printf("Content-Type: [%s]\n", content_type);
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
525
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
526 pragma = http_get_field( http_hdr, "Pragma");
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
527 while( pragma!=NULL ) {
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
528 char *comma_ptr=NULL;
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
529 char *end;
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
530 //printf("Pragma: [%s]\n", pragma );
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
531 // The pragma line can get severals attributes
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
532 // separeted with a comma ','.
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
533 do {
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
534 if( !strncasecmp( pragma, "features=", 9) ) {
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
535 pragma += 9;
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
536 end = strstr( pragma, "," );
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
537 if( end==NULL ) {
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
538 int s = strlen(pragma);
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
539 if(s > sizeof(features)) {
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
540 printf("ASF HTTP PARSE WARNING : Pragma %s cuted from %d bytes to %d\n",pragma,s,sizeof(features));
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
541 len = sizeof(features);
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
542 } else {
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
543 len = s;
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
544 }
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
545 } else {
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
546 len = MIN(end-pragma,sizeof(features));
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
547 }
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
548 strncpy( features, pragma, len );
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
549 features[len]='\0';
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
550 break;
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
551 }
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
552 comma_ptr = strstr( pragma, "," );
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
553 if( comma_ptr!=NULL ) {
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
554 pragma = comma_ptr+1;
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
555 if( pragma[0]==' ' ) pragma++;
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
556 }
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
557 } while( comma_ptr!=NULL );
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
558 pragma = http_get_next_field( http_hdr );
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
559 }
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
560
4312
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
561 return asf_http_streaming_type( content_type, features, http_hdr );
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
562 }
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
563
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
564 int
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
565 asf_http_streaming_start( stream_t *stream ) {
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
566 HTTP_header_t *http_hdr=NULL;
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
567 URL_t *url_next=NULL;
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
568 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
569 asf_http_streaming_ctrl_t *asf_http_ctrl;
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
570 ASF_StreamType_e streaming_type;
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
571 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
572 int i, ret;
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
573 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
574 int done;
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
575
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
576 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
577 if( asf_http_ctrl==NULL ) {
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
578 printf("Memory allocation failed\n");
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
579 return -1;
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
580 }
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
581 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
582 asf_http_ctrl->request = 1;
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
583 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
584 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
585 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
586
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
587 do {
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
588 done = 1;
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
589 if( fd>0 ) close( fd );
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
590
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 if( url->port==0 ) url->port = 8080;
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
593 } else {
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
594 if( url->port==0 ) url->port = 80;
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
595 }
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
596 fd = connect2Server( url->hostname, url->port );
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
597 if( fd<0 ) return -1;
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
598
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
599 http_hdr = asf_http_request( stream->streaming_ctrl );
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
600 if( verbose>0 ) {
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
601 printf("Request [%s]\n", http_hdr->buffer );
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
602 }
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
603 for(i=0; i < http_hdr->buffer_size ; ) {
3494
fb9de639ed30 Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3475
diff changeset
604 int r = write( fd, http_hdr->buffer+i, http_hdr->buffer_size-i );
fb9de639ed30 Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3475
diff changeset
605 if(r <0) {
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
606 printf("Socket write error : %s\n",strerror(errno));
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
607 return -1;
3494
fb9de639ed30 Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3475
diff changeset
608 }
fb9de639ed30 Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3475
diff changeset
609 i += r;
fb9de639ed30 Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3475
diff changeset
610 }
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
611 http_free( http_hdr );
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
612 http_hdr = http_new_header();
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
613 do {
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
614 i = read( fd, buffer, BUFFER_SIZE );
4121
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
615 //printf("read: %d\n", i );
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
616 if( i<0 ) {
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
617 perror("read");
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
618 http_free( http_hdr );
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
619 return -1;
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
620 }
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
621 http_response_append( http_hdr, buffer, i );
2489
0ecc1b4f7cf8 Added ASF http server streaming (Not mms streaming).
bertrand
parents: 2310
diff changeset
622 } while( !http_is_header_entire( http_hdr ) );
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
623 if( verbose>0 ) {
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
624 http_hdr->buffer[http_hdr->buffer_size]='\0';
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
625 printf("Response [%s]\n", http_hdr->buffer );
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
626 }
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
627 streaming_type = asf_http_parse_response(http_hdr);
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
628 if( streaming_type<0 ) {
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
629 printf("Failed to parse header\n");
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
630 http_free( http_hdr );
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
631 return -1;
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
632 }
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
633 asf_http_ctrl->streaming_type = streaming_type;
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
634 switch( streaming_type ) {
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
635 case ASF_Live_e:
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
636 case ASF_Prerecorded_e:
2489
0ecc1b4f7cf8 Added ASF http server streaming (Not mms streaming).
bertrand
parents: 2310
diff changeset
637 case ASF_PlainText_e:
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
638 if( http_hdr->body_size>0 ) {
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
639 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
640 http_free( http_hdr );
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
641 return -1;
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
642 }
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
643 }
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
644 if( asf_http_ctrl->request==1 ) {
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
645 if( streaming_type!=ASF_PlainText_e ) {
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
646 // First request, we only got the ASF header.
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
647 ret = asf_streaming_parse_header(fd,stream->streaming_ctrl);
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
648 if(ret < 0) return -1;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
649 if(asf_http_ctrl->n_audio == 0 && asf_http_ctrl->n_video == 0) {
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
650 printf("No stream found\n");
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
651 return -1;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
652 }
4312
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
653 asf_http_ctrl->request++;
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
654 done = 0;
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
655 } else {
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
656 done = 1;
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
657 }
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
658 }
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
659 break;
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
660 case ASF_Redirector_e:
4073
5f28d9d7d346 Changed the return value of the start function. Doesn't return the fd
bertrand
parents: 4046
diff changeset
661 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
662 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
663 http_free( http_hdr );
5f28d9d7d346 Changed the return value of the start function. Doesn't return the fd
bertrand
parents: 4046
diff changeset
664 return -1;
5f28d9d7d346 Changed the return value of the start function. Doesn't return the fd
bertrand
parents: 4046
diff changeset
665 }
5f28d9d7d346 Changed the return value of the start function. Doesn't return the fd
bertrand
parents: 4046
diff changeset
666 }
5f28d9d7d346 Changed the return value of the start function. Doesn't return the fd
bertrand
parents: 4046
diff changeset
667 stream->type = STREAMTYPE_PLAYLIST;
5f28d9d7d346 Changed the return value of the start function. Doesn't return the fd
bertrand
parents: 4046
diff changeset
668 done = 1;
5f28d9d7d346 Changed the return value of the start function. Doesn't return the fd
bertrand
parents: 4046
diff changeset
669 break;
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
670 case ASF_Unknown_e:
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
671 default:
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
672 printf("Unknown ASF streaming type\n");
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
673 close(fd);
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
674 http_free( http_hdr );
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
675 return -1;
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
676 }
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
677 // Check if we got a redirect.
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
678 } while(!done);
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
679
4073
5f28d9d7d346 Changed the return value of the start function. Doesn't return the fd
bertrand
parents: 4046
diff changeset
680 stream->fd = fd;
4041
879a668ee540 various small streaming fixes by Alban Bedel <albeu@free.fr>
arpi
parents: 3727
diff changeset
681 if( streaming_type==ASF_PlainText_e || streaming_type==ASF_Redirector_e ) {
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
682 stream->streaming_ctrl->streaming_read = nop_streaming_read;
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
683 stream->streaming_ctrl->streaming_seek = nop_streaming_seek;
2489
0ecc1b4f7cf8 Added ASF http server streaming (Not mms streaming).
bertrand
parents: 2310
diff changeset
684 } else {
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
685 stream->streaming_ctrl->streaming_read = asf_http_streaming_read;
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
686 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
687 stream->streaming_ctrl->buffering = 1;
2489
0ecc1b4f7cf8 Added ASF http server streaming (Not mms streaming).
bertrand
parents: 2310
diff changeset
688 }
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
689 stream->streaming_ctrl->status = streaming_playing_e;
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
690
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
691 http_free( http_hdr );
4073
5f28d9d7d346 Changed the return value of the start function. Doesn't return the fd
bertrand
parents: 4046
diff changeset
692 return 0;
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
693 }
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
694