annotate libmpdemux/asf_streaming.c @ 4076:47b9d8d3f3c5

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