annotate stream/asf_streaming.c @ 33771:6e774a02d00c

Remove gtkClearStruct code from mplayer() in interface.c. Move it as static function guiInfoMediumClear() where it is used and rename the symbolic constants used with this code.
author ib
date Sat, 09 Jul 2011 11:48:13 +0000
parents b39155e98ac3
children 54a706166f5d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
30426
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29923
diff changeset
1 /*
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29923
diff changeset
2 * This file is part of MPlayer.
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29923
diff changeset
3 *
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29923
diff changeset
4 * MPlayer is free software; you can redistribute it and/or modify
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29923
diff changeset
5 * it under the terms of the GNU General Public License as published by
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29923
diff changeset
6 * the Free Software Foundation; either version 2 of the License, or
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29923
diff changeset
7 * (at your option) any later version.
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29923
diff changeset
8 *
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29923
diff changeset
9 * MPlayer is distributed in the hope that it will be useful,
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29923
diff changeset
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29923
diff changeset
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29923
diff changeset
12 * GNU General Public License for more details.
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29923
diff changeset
13 *
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29923
diff changeset
14 * You should have received a copy of the GNU General Public License along
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29923
diff changeset
15 * with MPlayer; if not, write to the Free Software Foundation, Inc.,
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29923
diff changeset
16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29923
diff changeset
17 */
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29923
diff changeset
18
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
19 #include <stdio.h>
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
20 #include <stdlib.h>
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
21 #include <string.h>
1430
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1340
diff changeset
22 #include <unistd.h>
3494
fb9de639ed30 Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3475
diff changeset
23 #include <errno.h>
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
24 #include <limits.h>
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
25
2555
66837325b929 config.h cleanup, few things added to steram/demuxer headers
arpi
parents: 2489
diff changeset
26 #include "config.h"
16882
dfbe8cd0e081 libmpdemux translatables to help_mp part 1 / mp_msg calls / try 2
reynaldo
parents: 16418
diff changeset
27 #include "mp_msg.h"
dfbe8cd0e081 libmpdemux translatables to help_mp part 1 / mp_msg calls / try 2
reynaldo
parents: 16418
diff changeset
28 #include "help_mp.h"
32053
abf1b2360d4f Replace audio_id / video_id extern declarations by mpcommon.h #include.
diego
parents: 31500
diff changeset
29 #include "mpcommon.h"
27472
c0b233cd30ca Revert moving closesocket definition and network headers to network.h.
diego
parents: 27464
diff changeset
30
28402
c884d17bd005 Convert HAVE_WINSOCK2_H into a 0/1 definition.
diego
parents: 27473
diff changeset
31 #if HAVE_WINSOCK2_H
27472
c0b233cd30ca Revert moving closesocket definition and network headers to network.h.
diego
parents: 27464
diff changeset
32 #include <winsock2.h>
c0b233cd30ca Revert moving closesocket definition and network headers to network.h.
diego
parents: 27464
diff changeset
33 #endif
c0b233cd30ca Revert moving closesocket definition and network headers to network.h.
diego
parents: 27464
diff changeset
34
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
35 #include "url.h"
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
36 #include "http.h"
19312
ab8d6b6deb63 proper inclusion of demuxer.h (including libmpdemux in Makefile only was to make previous split easier)
ben
parents: 19271
diff changeset
37 #include "libmpdemux/asf.h"
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
38
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
39 #include "stream.h"
19312
ab8d6b6deb63 proper inclusion of demuxer.h (including libmpdemux in Makefile only was to make previous split easier)
ben
parents: 19271
diff changeset
40 #include "libmpdemux/demuxer.h"
30648
74d39bc2b2c4 Add header for asf_mmst_streaming_start() instead of forward declaring it.
diego
parents: 30633
diff changeset
41 #include "asf_mmst_streaming.h"
4315
0d5cba15772b 10l ...
nexus
parents: 4312
diff changeset
42 #include "network.h"
19335
2a9d669e5ff6 isolated tcp socket code from network.c to a dedicated file
ben
parents: 19312
diff changeset
43 #include "tcp.h"
4315
0d5cba15772b 10l ...
nexus
parents: 4312
diff changeset
44
25452
25fc785eab22 Reduce some extreme parsing ugliness (mostly cosmetic)
reimar
parents: 25451
diff changeset
45 #include "libavutil/intreadwrite.h"
25fc785eab22 Reduce some extreme parsing ugliness (mostly cosmetic)
reimar
parents: 25451
diff changeset
46
26325
890180cde40f Make stream independent of libmpdemux, the asf demuxer and streaming
albeu
parents: 25898
diff changeset
47 #include "libmpdemux/asfguid.h"
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
48
15585
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
49 static int asf_http_streaming_start(stream_t *stream, int *demuxer_type);
7953
60624e692b95 GCC warning fixes
bertrand
parents: 7472
diff changeset
50
25450
aacc1ec5cf43 Reduce code duplication: add a asf_read_wrapper function that never does partial reads
reimar
parents: 25388
diff changeset
51 static int asf_read_wrapper(int fd, void *buffer, int len, streaming_ctrl_t *stream_ctrl) {
aacc1ec5cf43 Reduce code duplication: add a asf_read_wrapper function that never does partial reads
reimar
parents: 25388
diff changeset
52 uint8_t *buf = buffer;
aacc1ec5cf43 Reduce code duplication: add a asf_read_wrapper function that never does partial reads
reimar
parents: 25388
diff changeset
53 while (len > 0) {
aacc1ec5cf43 Reduce code duplication: add a asf_read_wrapper function that never does partial reads
reimar
parents: 25388
diff changeset
54 int got = nop_streaming_read(fd, buf, len, stream_ctrl);
aacc1ec5cf43 Reduce code duplication: add a asf_read_wrapper function that never does partial reads
reimar
parents: 25388
diff changeset
55 if (got <= 0) {
aacc1ec5cf43 Reduce code duplication: add a asf_read_wrapper function that never does partial reads
reimar
parents: 25388
diff changeset
56 mp_msg(MSGT_NETWORK, MSGL_ERR, MSGTR_MPDEMUX_ASF_ErrReadingNetworkStream);
aacc1ec5cf43 Reduce code duplication: add a asf_read_wrapper function that never does partial reads
reimar
parents: 25388
diff changeset
57 return got;
aacc1ec5cf43 Reduce code duplication: add a asf_read_wrapper function that never does partial reads
reimar
parents: 25388
diff changeset
58 }
aacc1ec5cf43 Reduce code duplication: add a asf_read_wrapper function that never does partial reads
reimar
parents: 25388
diff changeset
59 buf += got;
aacc1ec5cf43 Reduce code duplication: add a asf_read_wrapper function that never does partial reads
reimar
parents: 25388
diff changeset
60 len -= got;
aacc1ec5cf43 Reduce code duplication: add a asf_read_wrapper function that never does partial reads
reimar
parents: 25388
diff changeset
61 }
aacc1ec5cf43 Reduce code duplication: add a asf_read_wrapper function that never does partial reads
reimar
parents: 25388
diff changeset
62 return 1;
aacc1ec5cf43 Reduce code duplication: add a asf_read_wrapper function that never does partial reads
reimar
parents: 25388
diff changeset
63 }
aacc1ec5cf43 Reduce code duplication: add a asf_read_wrapper function that never does partial reads
reimar
parents: 25388
diff changeset
64
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
65 // 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
66 // * first the UDP protcol, if there is a firewall, UDP
15585
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
67 // packets will not come back, so the mmsu will fail.
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
68 // * 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
69 // 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
70 // through
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
71 // * Then we can try HTTP.
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29031
diff changeset
72 //
12535
48ae29c2298c Use same order as WMP for mms protocols (MMSU, MMST, HTTP)
rtognimp
parents: 12396
diff changeset
73 // Note: Using WMP sequence MMSU then MMST and then HTTP.
48ae29c2298c Use same order as WMP for mms protocols (MMSU, MMST, HTTP)
rtognimp
parents: 12396
diff changeset
74
15585
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
75 static int asf_streaming_start( stream_t *stream, int *demuxer_type) {
12879
542d1d2200c1 reduced code complexity, and also made consistent with other parts
alex
parents: 12878
diff changeset
76 char *proto = stream->streaming_ctrl->url->protocol;
542d1d2200c1 reduced code complexity, and also made consistent with other parts
alex
parents: 12878
diff changeset
77 int fd = -1;
14525
47dc1d9c350d If asf/tcp fails, asf/http used a wrong port
rtognimp
parents: 14262
diff changeset
78 int port = stream->streaming_ctrl->url->port;
6643
01eaf5358176 Changed the way that the streams are requested.
bertrand
parents: 6094
diff changeset
79
12535
48ae29c2298c Use same order as WMP for mms protocols (MMSU, MMST, HTTP)
rtognimp
parents: 12396
diff changeset
80 // Is protocol mms or mmsu?
16112
0aeb954fc11c strncasecmp is not necessary and e.g. strncasecmp(prot, "mms", 3) will
reimar
parents: 15626
diff changeset
81 if (!strcasecmp(proto, "mmsu") || !strcasecmp(proto, "mms"))
12879
542d1d2200c1 reduced code complexity, and also made consistent with other parts
alex
parents: 12878
diff changeset
82 {
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
83 mp_msg(MSGT_NETWORK,MSGL_V,"Trying ASF/UDP...\n");
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
84 //fd = asf_mmsu_streaming_start( stream );
12535
48ae29c2298c Use same order as WMP for mms protocols (MMSU, MMST, HTTP)
rtognimp
parents: 12396
diff changeset
85 if( fd>-1 ) return fd; //mmsu support is not implemented yet - using this code
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
86 mp_msg(MSGT_NETWORK,MSGL_V," ===> ASF/UDP failed\n");
7252
0a0527c82560 - If fatal error while trying to connect to a WM server, skip other proto.
bertrand
parents: 6677
diff changeset
87 if( fd==-2 ) return -1;
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
88 }
12535
48ae29c2298c Use same order as WMP for mms protocols (MMSU, MMST, HTTP)
rtognimp
parents: 12396
diff changeset
89
48ae29c2298c Use same order as WMP for mms protocols (MMSU, MMST, HTTP)
rtognimp
parents: 12396
diff changeset
90 //Is protocol mms or mmst?
16112
0aeb954fc11c strncasecmp is not necessary and e.g. strncasecmp(prot, "mms", 3) will
reimar
parents: 15626
diff changeset
91 if (!strcasecmp(proto, "mmst") || !strcasecmp(proto, "mms"))
12879
542d1d2200c1 reduced code complexity, and also made consistent with other parts
alex
parents: 12878
diff changeset
92 {
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
93 mp_msg(MSGT_NETWORK,MSGL_V,"Trying ASF/TCP...\n");
6094
0f4dbbe57c08 Enable mmst support. MMST will be tried if the HTTP support failed.
bertrand
parents: 5915
diff changeset
94 fd = asf_mmst_streaming_start( stream );
14525
47dc1d9c350d If asf/tcp fails, asf/http used a wrong port
rtognimp
parents: 14262
diff changeset
95 stream->streaming_ctrl->url->port = port;
8823
557d34fe438a 10l bug...
bertrand
parents: 8718
diff changeset
96 if( fd>-1 ) return fd;
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
97 mp_msg(MSGT_NETWORK,MSGL_V," ===> ASF/TCP failed\n");
7252
0a0527c82560 - If fatal error while trying to connect to a WM server, skip other proto.
bertrand
parents: 6677
diff changeset
98 if( fd==-2 ) return -1;
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
99 }
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
100
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29031
diff changeset
101 //Is protocol http, http_proxy, or mms?
16112
0aeb954fc11c strncasecmp is not necessary and e.g. strncasecmp(prot, "mms", 3) will
reimar
parents: 15626
diff changeset
102 if (!strcasecmp(proto, "http_proxy") || !strcasecmp(proto, "http") ||
29029
c9db53414b53 Add support for mmsh:// as alias for mmshttp://
reimar
parents: 28402
diff changeset
103 !strcasecmp(proto, "mms") || !strcasecmp(proto, "mmsh") ||
c9db53414b53 Add support for mmsh:// as alias for mmshttp://
reimar
parents: 28402
diff changeset
104 !strcasecmp(proto, "mmshttp"))
12879
542d1d2200c1 reduced code complexity, and also made consistent with other parts
alex
parents: 12878
diff changeset
105 {
12535
48ae29c2298c Use same order as WMP for mms protocols (MMSU, MMST, HTTP)
rtognimp
parents: 12396
diff changeset
106 mp_msg(MSGT_NETWORK,MSGL_V,"Trying ASF/HTTP...\n");
48ae29c2298c Use same order as WMP for mms protocols (MMSU, MMST, HTTP)
rtognimp
parents: 12396
diff changeset
107 fd = asf_http_streaming_start( stream, demuxer_type );
14525
47dc1d9c350d If asf/tcp fails, asf/http used a wrong port
rtognimp
parents: 14262
diff changeset
108 stream->streaming_ctrl->url->port = port;
12535
48ae29c2298c Use same order as WMP for mms protocols (MMSU, MMST, HTTP)
rtognimp
parents: 12396
diff changeset
109 if( fd>-1 ) return fd;
48ae29c2298c Use same order as WMP for mms protocols (MMSU, MMST, HTTP)
rtognimp
parents: 12396
diff changeset
110 mp_msg(MSGT_NETWORK,MSGL_V," ===> ASF/HTTP failed\n");
48ae29c2298c Use same order as WMP for mms protocols (MMSU, MMST, HTTP)
rtognimp
parents: 12396
diff changeset
111 if( fd==-2 ) return -1;
48ae29c2298c Use same order as WMP for mms protocols (MMSU, MMST, HTTP)
rtognimp
parents: 12396
diff changeset
112 }
48ae29c2298c Use same order as WMP for mms protocols (MMSU, MMST, HTTP)
rtognimp
parents: 12396
diff changeset
113
48ae29c2298c Use same order as WMP for mms protocols (MMSU, MMST, HTTP)
rtognimp
parents: 12396
diff changeset
114 //everything failed
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
115 return -1;
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
116 }
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
117
15626
941b1a71351f printf converted to mp_msg; made static many unnecessarily global symbols
nicodvb
parents: 15585
diff changeset
118 static int asf_streaming(ASF_stream_chunck_t *stream_chunck, int *drop_packet ) {
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29031
diff changeset
119 /*
4046
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
120 printf("ASF stream chunck size=%d\n", stream_chunck->size);
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
121 printf("length: %d\n", length );
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
122 printf("0x%02X\n", stream_chunck->type );
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
123 */
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
124 if( drop_packet!=NULL ) *drop_packet = 0;
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
125
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
126 if( stream_chunck->size<8 ) {
16882
dfbe8cd0e081 libmpdemux translatables to help_mp part 1 / mp_msg calls / try 2
reynaldo
parents: 16418
diff changeset
127 mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_ASF_StreamChunkSize2Small, stream_chunck->size);
4046
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
128 return -1;
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
129 }
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
130 if( stream_chunck->size!=stream_chunck->size_confirm ) {
16882
dfbe8cd0e081 libmpdemux translatables to help_mp part 1 / mp_msg calls / try 2
reynaldo
parents: 16418
diff changeset
131 mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_ASF_SizeConfirmMismatch, stream_chunck->size, stream_chunck->size_confirm);
4046
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
132 return -1;
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
133 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29031
diff changeset
134 /*
4046
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
135 printf(" type: 0x%02X\n", stream_chunck->type );
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
136 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
137 printf(" sequence_number: 0x%04X\n", stream_chunck->sequence_number );
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
138 printf(" unknown: 0x%02X\n", stream_chunck->unknown );
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
139 printf(" size_confirm: 0x%02X\n", stream_chunck->size_confirm );
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
140 */
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
141 switch(stream_chunck->type) {
5617
75a43bb3ed80 Added big endian handling for the ASF_chunk_t struct.
bertrand
parents: 4334
diff changeset
142 case ASF_STREAMING_CLEAR: // $C Clear ASF configuration
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
143 mp_msg(MSGT_NETWORK,MSGL_V,"=====> Clearing ASF stream configuration!\n");
4046
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
144 if( drop_packet!=NULL ) *drop_packet = 1;
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
145 return stream_chunck->size;
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
146 break;
5617
75a43bb3ed80 Added big endian handling for the ASF_chunk_t struct.
bertrand
parents: 4334
diff changeset
147 case ASF_STREAMING_DATA: // $D Data follows
4046
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
148 // printf("=====> Data follows\n");
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
149 break;
5617
75a43bb3ed80 Added big endian handling for the ASF_chunk_t struct.
bertrand
parents: 4334
diff changeset
150 case ASF_STREAMING_END_TRANS: // $E Transfer complete
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
151 mp_msg(MSGT_NETWORK,MSGL_V,"=====> Transfer complete\n");
4046
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
152 if( drop_packet!=NULL ) *drop_packet = 1;
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
153 return stream_chunck->size;
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
154 break;
5617
75a43bb3ed80 Added big endian handling for the ASF_chunk_t struct.
bertrand
parents: 4334
diff changeset
155 case ASF_STREAMING_HEADER: // $H ASF header chunk follows
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
156 mp_msg(MSGT_NETWORK,MSGL_V,"=====> ASF header chunk follows\n");
4046
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
157 break;
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
158 default:
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
159 mp_msg(MSGT_NETWORK,MSGL_V,"=====> Unknown stream type 0x%x\n", stream_chunck->type );
4046
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
160 }
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
161 return stream_chunck->size+4;
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
162 }
f732854e3d16 Kept the HTTP connection open after autodetect, so
bertrand
parents: 4041
diff changeset
163
15585
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
164 static void close_s(stream_t *stream) {
29031
1706acdd3705 change close to closesocket, unifies close streaming code
compn
parents: 29029
diff changeset
165 closesocket(stream->fd);
15585
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
166 stream->fd=-1;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
167 }
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
168
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
169 static int max_idx(int s_count, int *s_rates, int bound) {
14639
cb261c423a06 fix for streams that do not send a bitrate
reimar
parents: 14525
diff changeset
170 int i, best = -1, rate = -1;
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
171 for (i = 0; i < s_count; i++) {
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
172 if (s_rates[i] > rate && s_rates[i] <= bound) {
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
173 rate = s_rates[i];
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
174 best = i;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
175 }
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
176 }
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
177 return best;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
178 }
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
179
15626
941b1a71351f printf converted to mp_msg; made static many unnecessarily global symbols
nicodvb
parents: 15585
diff changeset
180 static int asf_streaming_parse_header(int fd, streaming_ctrl_t* streaming_ctrl) {
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
181 ASF_stream_chunck_t chunk;
25454
e2bbaf29e61e Remove another useless cast
reimar
parents: 25453
diff changeset
182 asf_http_streaming_ctrl_t* asf_ctrl = streaming_ctrl->data;
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
183 char* buffer=NULL, *chunk_buffer=NULL;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
184 int i,r,size,pos = 0;
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
185 int start;
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
186 int buffer_size = 0;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
187 int chunk_size2read = 0;
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
188 int bw = streaming_ctrl->bandwidth;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
189 int *v_rates = NULL, *a_rates = NULL;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
190 int v_rate = 0, a_rate = 0, a_idx = -1, v_idx = -1;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29031
diff changeset
191
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
192 if(asf_ctrl == NULL) return -1;
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
193
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
194 // 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
195 // 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
196 // 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
197 do {
25450
aacc1ec5cf43 Reduce code duplication: add a asf_read_wrapper function that never does partial reads
reimar
parents: 25388
diff changeset
198 if (asf_read_wrapper(fd, &chunk, sizeof(ASF_stream_chunck_t), streaming_ctrl) <= 0)
aacc1ec5cf43 Reduce code duplication: add a asf_read_wrapper function that never does partial reads
reimar
parents: 25388
diff changeset
199 return -1;
5617
75a43bb3ed80 Added big endian handling for the ASF_chunk_t struct.
bertrand
parents: 4334
diff changeset
200 // Endian handling of the stream chunk
75a43bb3ed80 Added big endian handling for the ASF_chunk_t struct.
bertrand
parents: 4334
diff changeset
201 le2me_ASF_stream_chunck_t(&chunk);
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
202 size = asf_streaming( &chunk, &r) - sizeof(ASF_stream_chunck_t);
16882
dfbe8cd0e081 libmpdemux translatables to help_mp part 1 / mp_msg calls / try 2
reynaldo
parents: 16418
diff changeset
203 if(r) mp_msg(MSGT_NETWORK,MSGL_WARN,MSGTR_MPDEMUX_ASF_WarnDropHeader);
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
204 if(size < 0){
16882
dfbe8cd0e081 libmpdemux translatables to help_mp part 1 / mp_msg calls / try 2
reynaldo
parents: 16418
diff changeset
205 mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_ASF_ErrorParsingChunkHeader);
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
206 return -1;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
207 }
5617
75a43bb3ed80 Added big endian handling for the ASF_chunk_t struct.
bertrand
parents: 4334
diff changeset
208 if (chunk.type != ASF_STREAMING_HEADER) {
16882
dfbe8cd0e081 libmpdemux translatables to help_mp part 1 / mp_msg calls / try 2
reynaldo
parents: 16418
diff changeset
209 mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_ASF_NoHeaderAtFirstChunk);
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
210 return -1;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
211 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29031
diff changeset
212
18558
4928dd61f136 Fix potential integer overflows in memory allocation.
rtogni
parents: 17932
diff changeset
213 // audit: do not overflow buffer_size
4928dd61f136 Fix potential integer overflows in memory allocation.
rtogni
parents: 17932
diff changeset
214 if (size > SIZE_MAX - buffer_size) return -1;
25451
bc4355ca4326 Remove useless alloc casts
reimar
parents: 25450
diff changeset
215 buffer = malloc(size+buffer_size);
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
216 if(buffer == NULL) {
16882
dfbe8cd0e081 libmpdemux translatables to help_mp part 1 / mp_msg calls / try 2
reynaldo
parents: 16418
diff changeset
217 mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MPDEMUX_ASF_BufferMallocFailed,size+buffer_size);
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
218 return -1;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
219 }
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
220 if( chunk_buffer!=NULL ) {
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
221 memcpy( buffer, chunk_buffer, buffer_size );
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
222 free( chunk_buffer );
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
223 }
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
224 chunk_buffer = buffer;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
225 buffer += buffer_size;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
226 buffer_size += size;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29031
diff changeset
227
25450
aacc1ec5cf43 Reduce code duplication: add a asf_read_wrapper function that never does partial reads
reimar
parents: 25388
diff changeset
228 if (asf_read_wrapper(fd, buffer, size, streaming_ctrl) <= 0)
aacc1ec5cf43 Reduce code duplication: add a asf_read_wrapper function that never does partial reads
reimar
parents: 25388
diff changeset
229 return -1;
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
230
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
231 if( chunk_size2read==0 ) {
25459
133905f56a89 Simplify a little bit
reimar
parents: 25458
diff changeset
232 ASF_header_t *asfh = (ASF_header_t *)buffer;
133905f56a89 Simplify a little bit
reimar
parents: 25458
diff changeset
233 if(size < (int)sizeof(ASF_header_t)) {
16882
dfbe8cd0e081 libmpdemux translatables to help_mp part 1 / mp_msg calls / try 2
reynaldo
parents: 16418
diff changeset
234 mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_ASF_ErrChunk2Small);
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
235 return -1;
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
236 } else mp_msg(MSGT_NETWORK,MSGL_DBG2,"Got chunk\n");
25459
133905f56a89 Simplify a little bit
reimar
parents: 25458
diff changeset
237 chunk_size2read = AV_RL64(&asfh->objh.size);
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
238 mp_msg(MSGT_NETWORK,MSGL_DBG2,"Size 2 read=%d\n", chunk_size2read);
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
239 }
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
240 } while( buffer_size<chunk_size2read);
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
241 buffer = chunk_buffer;
3551
314987c0aaf4 Fixed the multiple ASF header stream chunk.
bertrand
parents: 3533
diff changeset
242 size = buffer_size;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29031
diff changeset
243
25459
133905f56a89 Simplify a little bit
reimar
parents: 25458
diff changeset
244 start = sizeof(ASF_header_t);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29031
diff changeset
245
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
246 pos = find_asf_guid(buffer, asf_file_header_guid, start, size);
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
247 if (pos >= 0) {
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
248 ASF_file_header_t *fileh = (ASF_file_header_t *) &buffer[pos];
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
249 pos += sizeof(ASF_file_header_t);
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
250 if (pos > size) goto len_err_out;
4288
b84e9861461c Changed the asf_file_header_t struct to read all the fields properly.
bertrand
parents: 4145
diff changeset
251 /*
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
252 if(fileh.packetsize != fileh.packetsize2) {
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
253 printf("Error packetsize check don't match\n");
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
254 return -1;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
255 }
4288
b84e9861461c Changed the asf_file_header_t struct to read all the fields properly.
bertrand
parents: 4145
diff changeset
256 */
25456
d7e586404846 Avoid some le2me_ASF_* stuff operating directly on buffer, should
reimar
parents: 25454
diff changeset
257 asf_ctrl->packet_size = AV_RL32(&fileh->max_packet_size);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29031
diff changeset
258 // before playing.
4288
b84e9861461c Changed the asf_file_header_t struct to read all the fields properly.
bertrand
parents: 4145
diff changeset
259 // preroll: time in ms to bufferize before playing
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
260 streaming_ctrl->prebuffer_size = (unsigned int)(((double)fileh->preroll/1000.0)*((double)fileh->max_bitrate/8.0));
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
261 }
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
262
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
263 pos = start;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
264 while ((pos = find_asf_guid(buffer, asf_stream_header_guid, pos, size)) >= 0)
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
265 {
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
266 ASF_stream_header_t *streamh = (ASF_stream_header_t *)&buffer[pos];
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
267 pos += sizeof(ASF_stream_header_t);
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
268 if (pos > size) goto len_err_out;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
269 switch(ASF_LOAD_GUID_PREFIX(streamh->type)) {
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
270 case 0xF8699E40 : // audio stream
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
271 if(asf_ctrl->audio_streams == NULL){
19062
83c3afeab35d drops casts from void * on malloc/calloc from libmpdemux code
reynaldo
parents: 18558
diff changeset
272 asf_ctrl->audio_streams = malloc(sizeof(int));
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
273 asf_ctrl->n_audio = 1;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
274 } else {
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
275 asf_ctrl->n_audio++;
25451
bc4355ca4326 Remove useless alloc casts
reimar
parents: 25450
diff changeset
276 asf_ctrl->audio_streams = realloc(asf_ctrl->audio_streams,
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
277 asf_ctrl->n_audio*sizeof(int));
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
278 }
25456
d7e586404846 Avoid some le2me_ASF_* stuff operating directly on buffer, should
reimar
parents: 25454
diff changeset
279 asf_ctrl->audio_streams[asf_ctrl->n_audio-1] = AV_RL16(&streamh->stream_no);
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
280 break;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
281 case 0xBC19EFC0 : // video stream
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
282 if(asf_ctrl->video_streams == NULL){
19062
83c3afeab35d drops casts from void * on malloc/calloc from libmpdemux code
reynaldo
parents: 18558
diff changeset
283 asf_ctrl->video_streams = malloc(sizeof(int));
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
284 asf_ctrl->n_video = 1;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
285 } else {
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
286 asf_ctrl->n_video++;
25451
bc4355ca4326 Remove useless alloc casts
reimar
parents: 25450
diff changeset
287 asf_ctrl->video_streams = realloc(asf_ctrl->video_streams,
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
288 asf_ctrl->n_video*sizeof(int));
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
289 }
25456
d7e586404846 Avoid some le2me_ASF_* stuff operating directly on buffer, should
reimar
parents: 25454
diff changeset
290 asf_ctrl->video_streams[asf_ctrl->n_video-1] = AV_RL16(&streamh->stream_no);
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
291 break;
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
292 }
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
293 }
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
294
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
295 // always allocate to avoid lots of ifs later
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
296 v_rates = calloc(asf_ctrl->n_video, sizeof(int));
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
297 a_rates = calloc(asf_ctrl->n_audio, sizeof(int));
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
298
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
299 pos = find_asf_guid(buffer, asf_stream_group_guid, start, size);
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
300 if (pos >= 0) {
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
301 // stream bitrate properties object
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
302 int stream_count;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
303 char *ptr = &buffer[pos];
25452
25fc785eab22 Reduce some extreme parsing ugliness (mostly cosmetic)
reimar
parents: 25451
diff changeset
304 char *end = &buffer[size];
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29031
diff changeset
305
14262
04ed193d1e32 10l, variable declarations must be before mp_msg.
reimar
parents: 14236
diff changeset
306 mp_msg(MSGT_NETWORK, MSGL_V, "Stream bitrate properties object\n");
25453
7cde1324cf14 100l, buffer bound checks work better when done _before_ access.
reimar
parents: 25452
diff changeset
307 if (ptr + 2 > end) goto len_err_out;
25452
25fc785eab22 Reduce some extreme parsing ugliness (mostly cosmetic)
reimar
parents: 25451
diff changeset
308 stream_count = AV_RL16(ptr);
25fc785eab22 Reduce some extreme parsing ugliness (mostly cosmetic)
reimar
parents: 25451
diff changeset
309 ptr += 2;
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
310 mp_msg(MSGT_NETWORK, MSGL_V, " stream count=[0x%x][%u]\n",
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
311 stream_count, stream_count );
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
312 for( i=0 ; i<stream_count ; i++ ) {
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
313 uint32_t rate;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
314 int id;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
315 int j;
25453
7cde1324cf14 100l, buffer bound checks work better when done _before_ access.
reimar
parents: 25452
diff changeset
316 if (ptr + 6 > end) goto len_err_out;
25452
25fc785eab22 Reduce some extreme parsing ugliness (mostly cosmetic)
reimar
parents: 25451
diff changeset
317 id = AV_RL16(ptr);
25fc785eab22 Reduce some extreme parsing ugliness (mostly cosmetic)
reimar
parents: 25451
diff changeset
318 ptr += 2;
25fc785eab22 Reduce some extreme parsing ugliness (mostly cosmetic)
reimar
parents: 25451
diff changeset
319 rate = AV_RL32(ptr);
25fc785eab22 Reduce some extreme parsing ugliness (mostly cosmetic)
reimar
parents: 25451
diff changeset
320 ptr += 4;
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
321 mp_msg(MSGT_NETWORK, MSGL_V,
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
322 " stream id=[0x%x][%u]\n", id, id);
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
323 mp_msg(MSGT_NETWORK, MSGL_V,
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
324 " max bitrate=[0x%x][%u]\n", rate, rate);
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
325 for (j = 0; j < asf_ctrl->n_video; j++) {
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
326 if (id == asf_ctrl->video_streams[j]) {
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
327 mp_msg(MSGT_NETWORK, MSGL_V, " is video stream\n");
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
328 v_rates[j] = rate;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
329 break;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
330 }
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
331 }
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
332 for (j = 0; j < asf_ctrl->n_audio; j++) {
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
333 if (id == asf_ctrl->audio_streams[j]) {
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
334 mp_msg(MSGT_NETWORK, MSGL_V, " is audio stream\n");
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
335 a_rates[j] = rate;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
336 break;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
337 }
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
338 }
6643
01eaf5358176 Changed the way that the streams are requested.
bertrand
parents: 6094
diff changeset
339 }
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
340 }
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
341 free(buffer);
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
342
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
343 // automatic stream selection based on bandwidth
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
344 if (bw == 0) bw = INT_MAX;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
345 mp_msg(MSGT_NETWORK, MSGL_V, "Max bandwidth set to %d\n", bw);
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
346
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
347 if (asf_ctrl->n_audio) {
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
348 // find lowest-bitrate audio stream
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
349 a_rate = a_rates[0];
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
350 a_idx = 0;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
351 for (i = 0; i < asf_ctrl->n_audio; i++) {
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
352 if (a_rates[i] < a_rate) {
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
353 a_rate = a_rates[i];
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
354 a_idx = i;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
355 }
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
356 }
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
357 if (max_idx(asf_ctrl->n_video, v_rates, bw - a_rate) < 0) {
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
358 // both audio and video are not possible, try video only next
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
359 a_idx = -1;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
360 a_rate = 0;
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
361 }
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
362 }
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
363 // find best video stream
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
364 v_idx = max_idx(asf_ctrl->n_video, v_rates, bw - a_rate);
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
365 if (v_idx >= 0)
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
366 v_rate = v_rates[v_idx];
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
367
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
368 // find best audio stream
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
369 a_idx = max_idx(asf_ctrl->n_audio, a_rates, bw - v_rate);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29031
diff changeset
370
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
371 free(v_rates);
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
372 free(a_rates);
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
373
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
374 if (a_idx < 0 && v_idx < 0) {
16882
dfbe8cd0e081 libmpdemux translatables to help_mp part 1 / mp_msg calls / try 2
reynaldo
parents: 16418
diff changeset
375 mp_msg(MSGT_NETWORK, MSGL_FATAL, MSGTR_MPDEMUX_ASF_Bandwidth2SmallCannotPlay);
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
376 return -1;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
377 }
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
378
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
379 if (audio_id > 0)
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
380 // a audio stream was forced
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
381 asf_ctrl->audio_id = audio_id;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
382 else if (a_idx >= 0)
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
383 asf_ctrl->audio_id = asf_ctrl->audio_streams[a_idx];
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
384 else if (asf_ctrl->n_audio) {
16882
dfbe8cd0e081 libmpdemux translatables to help_mp part 1 / mp_msg calls / try 2
reynaldo
parents: 16418
diff changeset
385 mp_msg(MSGT_NETWORK, MSGL_WARN, MSGTR_MPDEMUX_ASF_Bandwidth2SmallDeselectedAudio);
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
386 audio_id = -2;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
387 }
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
388
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
389 if (video_id > 0)
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
390 // a video stream was forced
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
391 asf_ctrl->video_id = video_id;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
392 else if (v_idx >= 0)
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
393 asf_ctrl->video_id = asf_ctrl->video_streams[v_idx];
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
394 else if (asf_ctrl->n_video) {
16882
dfbe8cd0e081 libmpdemux translatables to help_mp part 1 / mp_msg calls / try 2
reynaldo
parents: 16418
diff changeset
395 mp_msg(MSGT_NETWORK, MSGL_WARN, MSGTR_MPDEMUX_ASF_Bandwidth2SmallDeselectedVideo);
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
396 video_id = -2;
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
397 }
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
398
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
399 return 1;
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
400
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
401 len_err_out:
16882
dfbe8cd0e081 libmpdemux translatables to help_mp part 1 / mp_msg calls / try 2
reynaldo
parents: 16418
diff changeset
402 mp_msg(MSGT_NETWORK, MSGL_FATAL, MSGTR_MPDEMUX_ASF_InvalidLenInHeader);
32511
b39155e98ac3 Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents: 32053
diff changeset
403 free(buffer);
b39155e98ac3 Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents: 32053
diff changeset
404 free(v_rates);
b39155e98ac3 Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents: 32053
diff changeset
405 free(a_rates);
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
406 return -1;
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
407 }
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
408
15626
941b1a71351f printf converted to mp_msg; made static many unnecessarily global symbols
nicodvb
parents: 15585
diff changeset
409 static int 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
410 static ASF_stream_chunck_t chunk;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
411 int read,chunk_size = 0;
7472
c4434bdf6e51 tons of warning fixes, also some 10l bugfixes, including Dominik's PVA bug
arpi
parents: 7310
diff changeset
412 static int rest = 0, drop_chunk = 0, waiting = 0;
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
413 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
414
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
415 while(1) {
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
416 if (rest == 0 && waiting == 0) {
25450
aacc1ec5cf43 Reduce code duplication: add a asf_read_wrapper function that never does partial reads
reimar
parents: 25388
diff changeset
417 if (asf_read_wrapper(fd, &chunk, sizeof(ASF_stream_chunck_t), streaming_ctrl) <= 0)
aacc1ec5cf43 Reduce code duplication: add a asf_read_wrapper function that never does partial reads
reimar
parents: 25388
diff changeset
418 return -1;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29031
diff changeset
419
5617
75a43bb3ed80 Added big endian handling for the ASF_chunk_t struct.
bertrand
parents: 4334
diff changeset
420 // Endian handling of the stream chunk
75a43bb3ed80 Added big endian handling for the ASF_chunk_t struct.
bertrand
parents: 4334
diff changeset
421 le2me_ASF_stream_chunck_t(&chunk);
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
422 chunk_size = asf_streaming( &chunk, &drop_chunk );
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
423 if(chunk_size < 0) {
16882
dfbe8cd0e081 libmpdemux translatables to help_mp part 1 / mp_msg calls / try 2
reynaldo
parents: 16418
diff changeset
424 mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_ASF_ErrorParsingChunkHeader);
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
425 return -1;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
426 }
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
427 chunk_size -= sizeof(ASF_stream_chunck_t);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29031
diff changeset
428
5617
75a43bb3ed80 Added big endian handling for the ASF_chunk_t struct.
bertrand
parents: 4334
diff changeset
429 if(chunk.type != ASF_STREAMING_HEADER && (!drop_chunk)) {
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
430 if (asf_http_ctrl->packet_size < chunk_size) {
16882
dfbe8cd0e081 libmpdemux translatables to help_mp part 1 / mp_msg calls / try 2
reynaldo
parents: 16418
diff changeset
431 mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_ASF_ErrChunkBiggerThanPacket);
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
432 return -1;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
433 }
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
434 waiting = asf_http_ctrl->packet_size;
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
435 } else {
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
436 waiting = chunk_size;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
437 }
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
438
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
439 } else if (rest){
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
440 chunk_size = rest;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
441 rest = 0;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
442 }
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
443
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
444 read = 0;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
445 if ( waiting >= chunk_size) {
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
446 if (chunk_size > size){
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
447 rest = chunk_size - size;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
448 chunk_size = size;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
449 }
25450
aacc1ec5cf43 Reduce code duplication: add a asf_read_wrapper function that never does partial reads
reimar
parents: 25388
diff changeset
450 if (asf_read_wrapper(fd, buffer, chunk_size, streaming_ctrl) <= 0)
aacc1ec5cf43 Reduce code duplication: add a asf_read_wrapper function that never does partial reads
reimar
parents: 25388
diff changeset
451 return -1;
aacc1ec5cf43 Reduce code duplication: add a asf_read_wrapper function that never does partial reads
reimar
parents: 25388
diff changeset
452 read = chunk_size;
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
453 waiting -= read;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
454 if (drop_chunk) continue;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
455 }
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
456 if (rest == 0 && waiting > 0 && size-read > 0) {
22378
dc9d2940fc05 Replace MIN with FFMIN
reimar
parents: 21537
diff changeset
457 int s = FFMIN(waiting,size-read);
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
458 memset(buffer+read,0,s);
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
459 waiting -= s;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
460 read += s;
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
461 }
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
462 break;
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
463 }
3475
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
464
390388c75209 Applied the patch from Alban Bedel <albeu@free.fr> to
bertrand
parents: 3454
diff changeset
465 return read;
2489
0ecc1b4f7cf8 Added ASF http server streaming (Not mms streaming).
bertrand
parents: 2310
diff changeset
466 }
0ecc1b4f7cf8 Added ASF http server streaming (Not mms streaming).
bertrand
parents: 2310
diff changeset
467
15626
941b1a71351f printf converted to mp_msg; made static many unnecessarily global symbols
nicodvb
parents: 15585
diff changeset
468 static int asf_http_streaming_seek( int fd, off_t pos, streaming_ctrl_t *streaming_ctrl ) {
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
469 return -1;
7953
60624e692b95 GCC warning fixes
bertrand
parents: 7472
diff changeset
470 // to shut up gcc warning
60624e692b95 GCC warning fixes
bertrand
parents: 7472
diff changeset
471 fd++;
60624e692b95 GCC warning fixes
bertrand
parents: 7472
diff changeset
472 pos++;
60624e692b95 GCC warning fixes
bertrand
parents: 7472
diff changeset
473 streaming_ctrl=NULL;
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
474 }
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
475
15626
941b1a71351f printf converted to mp_msg; made static many unnecessarily global symbols
nicodvb
parents: 15585
diff changeset
476 static int asf_header_check( HTTP_header_t *http_hdr ) {
4312
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
477 ASF_obj_header_t *objh;
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
478 if( http_hdr==NULL ) return -1;
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
479 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
480
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
481 objh = (ASF_obj_header_t*)http_hdr->body;
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
482 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
483 return -1;
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
484 }
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
485
15626
941b1a71351f printf converted to mp_msg; made static many unnecessarily global symbols
nicodvb
parents: 15585
diff changeset
486 static int asf_http_streaming_type(char *content_type, char *features, HTTP_header_t *http_hdr ) {
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
487 if( content_type==NULL ) return ASF_Unknown_e;
7252
0a0527c82560 - If fatal error while trying to connect to a WM server, skip other proto.
bertrand
parents: 6677
diff changeset
488 if( !strcasecmp(content_type, "application/octet-stream") ||
0a0527c82560 - If fatal error while trying to connect to a WM server, skip other proto.
bertrand
parents: 6677
diff changeset
489 !strcasecmp(content_type, "application/vnd.ms.wms-hdr.asfv1") || // New in Corona, first request
11349
786407b1bc78 Accept video/x-ms-asf as the MIME type for ASF as well. Patch by Dominique Andre Gunia <Dominique.Gunia@schunter.etc.tu-bs.de>.
mosu
parents: 10939
diff changeset
490 !strcasecmp(content_type, "application/x-mms-framed") || // New in Corana, second request
29923
88272f3b9b19 mime type [video/x-ms-wmv] is not an ASF redirector.
compn
parents: 29263
diff changeset
491 !strcasecmp(content_type, "video/x-ms-wmv") ||
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29031
diff changeset
492 !strcasecmp(content_type, "video/x-ms-asf")) {
7252
0a0527c82560 - If fatal error while trying to connect to a WM server, skip other proto.
bertrand
parents: 6677
diff changeset
493
8718
d630a6f4c7c0 - Now mmst will use the MMS/TCP implementation first, instead of trying
bertrand
parents: 7953
diff changeset
494 if( strstr(features, "broadcast") ) {
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
495 mp_msg(MSGT_NETWORK,MSGL_V,"=====> ASF Live stream\n");
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
496 return ASF_Live_e;
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
497 } else {
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
498 mp_msg(MSGT_NETWORK,MSGL_V,"=====> ASF Prerecorded\n");
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
499 return ASF_Prerecorded_e;
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
500 }
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
501 } else {
4312
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
502 // 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
503 // 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
504 // 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
505 // 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
506 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
507 if( asf_header_check( http_hdr )==0 ) {
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
508 mp_msg(MSGT_NETWORK,MSGL_V,"=====> ASF Plain text\n");
4334
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
509 return ASF_PlainText_e;
8718
d630a6f4c7c0 - Now mmst will use the MMS/TCP implementation first, instead of trying
bertrand
parents: 7953
diff changeset
510 } else if( (!strcasecmp(content_type, "text/html")) ) {
12654
433c0d389f6f correct spelling
alex
parents: 12535
diff changeset
511 mp_msg(MSGT_NETWORK,MSGL_V,"=====> HTML, MPlayer is not a browser...yet!\n");
8718
d630a6f4c7c0 - Now mmst will use the MMS/TCP implementation first, instead of trying
bertrand
parents: 7953
diff changeset
512 return ASF_Unknown_e;
4334
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
513 } else {
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
514 mp_msg(MSGT_NETWORK,MSGL_V,"=====> ASF Redirector\n");
4334
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
515 return ASF_Redirector_e;
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
516 }
4312
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
517 } else {
4334
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
518 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
519 (!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
520 (!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
521 (!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
522 (!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
523 (!strcasecmp(content_type, "video/x-ms-wma")) ) {
16882
dfbe8cd0e081 libmpdemux translatables to help_mp part 1 / mp_msg calls / try 2
reynaldo
parents: 16418
diff changeset
524 mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_ASF_ASFRedirector);
4334
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
525 return ASF_Redirector_e;
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
526 } else if( !strcasecmp(content_type, "text/plain") ) {
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
527 mp_msg(MSGT_NETWORK,MSGL_V,"=====> ASF Plain text\n");
4334
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
528 return ASF_PlainText_e;
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
529 } else {
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
530 mp_msg(MSGT_NETWORK,MSGL_V,"=====> ASF unknown content-type: %s\n", content_type );
4334
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
531 return ASF_Unknown_e;
3fb147d59ca6 Readded the content-type checking, in case of the no HTTP body are
bertrand
parents: 4315
diff changeset
532 }
4312
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
533 }
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
534 }
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
535 return ASF_Unknown_e;
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
536 }
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
537
15626
941b1a71351f printf converted to mp_msg; made static many unnecessarily global symbols
nicodvb
parents: 15585
diff changeset
538 static HTTP_header_t *asf_http_request(streaming_ctrl_t *streaming_ctrl) {
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
539 HTTP_header_t *http_hdr;
4121
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
540 URL_t *url = NULL;
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
541 URL_t *server_url = NULL;
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
542 asf_http_streaming_ctrl_t *asf_http_ctrl;
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
543 char str[250];
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
544 char *ptr;
6643
01eaf5358176 Changed the way that the streams are requested.
bertrand
parents: 6094
diff changeset
545 int i, enable;
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
546
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
547 int offset_hi=0, offset_lo=0, length=0;
6643
01eaf5358176 Changed the way that the streams are requested.
bertrand
parents: 6094
diff changeset
548 int asf_nb_stream=0, stream_id;
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
549
4121
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
550 // Sanity check
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
551 if( streaming_ctrl==NULL ) return NULL;
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
552 url = streaming_ctrl->url;
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
553 asf_http_ctrl = (asf_http_streaming_ctrl_t*)streaming_ctrl->data;
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
554 if( url==NULL || asf_http_ctrl==NULL ) return NULL;
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
555
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
556 // Common header for all requests.
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
557 http_hdr = http_new_header();
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
558 http_set_field( http_hdr, "Accept: */*" );
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
559 http_set_field( http_hdr, "User-Agent: NSPlayer/4.1.0.3856" );
6670
70b54c2e0292 Add missing authentication for asf streaming.
atmos4
parents: 6643
diff changeset
560 http_add_basic_authentication( http_hdr, url->username, url->password );
4121
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
561
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
562 // Check if we are using a proxy
4145
c66fddd8867c Changed the proxy protocol to http_proxy.
bertrand
parents: 4121
diff changeset
563 if( !strcasecmp( url->protocol, "http_proxy" ) ) {
4121
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
564 server_url = url_new( (url->file)+1 );
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
565 if( server_url==NULL ) {
16882
dfbe8cd0e081 libmpdemux translatables to help_mp part 1 / mp_msg calls / try 2
reynaldo
parents: 16418
diff changeset
566 mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_ASF_InvalidProxyURL);
4121
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
567 http_free( http_hdr );
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
568 return NULL;
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
569 }
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
570 http_set_uri( http_hdr, server_url->url );
10939
55c9903bd51c simple fix for buffer overflow (remotely exploitable). feel free to
rfelker
parents: 10625
diff changeset
571 sprintf( str, "Host: %.220s:%d", server_url->hostname, server_url->port );
4121
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
572 url_free( server_url );
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
573 } else {
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
574 http_set_uri( http_hdr, url->file );
10939
55c9903bd51c simple fix for buffer overflow (remotely exploitable). feel free to
rfelker
parents: 10625
diff changeset
575 sprintf( str, "Host: %.220s:%d", url->hostname, url->port );
4121
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
576 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29031
diff changeset
577
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
578 http_set_field( http_hdr, str );
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
579 http_set_field( http_hdr, "Pragma: xClientGUID={c77e7400-738a-11d2-9add-0020af0a3278}" );
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29031
diff changeset
580 sprintf(str,
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
581 "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
582 offset_hi, offset_lo, asf_http_ctrl->request, length );
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
583 http_set_field( http_hdr, str );
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
584
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
585 switch( asf_http_ctrl->streaming_type ) {
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
586 case ASF_Live_e:
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
587 case ASF_Prerecorded_e:
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
588 http_set_field( http_hdr, "Pragma: xPlayStrm=1" );
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
589 ptr = str;
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
590 ptr += sprintf( ptr, "Pragma: stream-switch-entry=");
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
591 if(asf_http_ctrl->n_audio > 0) {
6643
01eaf5358176 Changed the way that the streams are requested.
bertrand
parents: 6094
diff changeset
592 for( i=0; i<asf_http_ctrl->n_audio ; i++ ) {
01eaf5358176 Changed the way that the streams are requested.
bertrand
parents: 6094
diff changeset
593 stream_id = asf_http_ctrl->audio_streams[i];
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
594 if(stream_id == asf_http_ctrl->audio_id) {
6643
01eaf5358176 Changed the way that the streams are requested.
bertrand
parents: 6094
diff changeset
595 enable = 0;
01eaf5358176 Changed the way that the streams are requested.
bertrand
parents: 6094
diff changeset
596 } else {
01eaf5358176 Changed the way that the streams are requested.
bertrand
parents: 6094
diff changeset
597 enable = 2;
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
598 continue;
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
599 }
6643
01eaf5358176 Changed the way that the streams are requested.
bertrand
parents: 6094
diff changeset
600 asf_nb_stream++;
25898
b61b5a697afc Stream IDs must be written as hex numbers. Fixes
rtogni
parents: 25459
diff changeset
601 ptr += sprintf(ptr, "ffff:%x:%d ", stream_id, enable);
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
602 }
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
603 }
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
604 if(asf_http_ctrl->n_video > 0) {
6643
01eaf5358176 Changed the way that the streams are requested.
bertrand
parents: 6094
diff changeset
605 for( i=0; i<asf_http_ctrl->n_video ; i++ ) {
01eaf5358176 Changed the way that the streams are requested.
bertrand
parents: 6094
diff changeset
606 stream_id = asf_http_ctrl->video_streams[i];
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
607 if(stream_id == asf_http_ctrl->video_id) {
6643
01eaf5358176 Changed the way that the streams are requested.
bertrand
parents: 6094
diff changeset
608 enable = 0;
01eaf5358176 Changed the way that the streams are requested.
bertrand
parents: 6094
diff changeset
609 } else {
01eaf5358176 Changed the way that the streams are requested.
bertrand
parents: 6094
diff changeset
610 enable = 2;
14236
2dc4595c3998 fix stream selection and -bandwidth for mms-over-http.
reimar
parents: 12879
diff changeset
611 continue;
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
612 }
6643
01eaf5358176 Changed the way that the streams are requested.
bertrand
parents: 6094
diff changeset
613 asf_nb_stream++;
25898
b61b5a697afc Stream IDs must be written as hex numbers. Fixes
rtogni
parents: 25459
diff changeset
614 ptr += sprintf(ptr, "ffff:%x:%d ", stream_id, enable);
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
615 }
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
616 }
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
617 http_set_field( http_hdr, str );
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
618 sprintf( str, "Pragma: stream-switch-count=%d", asf_nb_stream );
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
619 http_set_field( http_hdr, str );
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
620 break;
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
621 case ASF_Redirector_e:
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
622 break;
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
623 case ASF_Unknown_e:
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
624 // First request goes here.
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
625 break;
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
626 default:
16882
dfbe8cd0e081 libmpdemux translatables to help_mp part 1 / mp_msg calls / try 2
reynaldo
parents: 16418
diff changeset
627 mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_ASF_UnknownASFStreamType);
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
628 }
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
629
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
630 http_set_field( http_hdr, "Connection: Close" );
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
631 http_build_request( http_hdr );
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
632
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
633 return http_hdr;
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
634 }
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
635
15626
941b1a71351f printf converted to mp_msg; made static many unnecessarily global symbols
nicodvb
parents: 15585
diff changeset
636 static int asf_http_parse_response(asf_http_streaming_ctrl_t *asf_http_ctrl, HTTP_header_t *http_hdr ) {
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
637 char *content_type, *pragma;
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
638 char features[64] = "\0";
7953
60624e692b95 GCC warning fixes
bertrand
parents: 7472
diff changeset
639 size_t len;
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
640 if( http_response_parse(http_hdr)<0 ) {
16882
dfbe8cd0e081 libmpdemux translatables to help_mp part 1 / mp_msg calls / try 2
reynaldo
parents: 16418
diff changeset
641 mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_ASF_Failed2ParseHTTPResponse);
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
642 return -1;
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
643 }
6677
0b3d4b298056 Fixed the asf http authentication.
bertrand
parents: 6670
diff changeset
644 switch( http_hdr->status_code ) {
0b3d4b298056 Fixed the asf http authentication.
bertrand
parents: 6670
diff changeset
645 case 200:
0b3d4b298056 Fixed the asf http authentication.
bertrand
parents: 6670
diff changeset
646 break;
0b3d4b298056 Fixed the asf http authentication.
bertrand
parents: 6670
diff changeset
647 case 401: // Authentication required
0b3d4b298056 Fixed the asf http authentication.
bertrand
parents: 6670
diff changeset
648 return ASF_Authenticate_e;
0b3d4b298056 Fixed the asf http authentication.
bertrand
parents: 6670
diff changeset
649 default:
16882
dfbe8cd0e081 libmpdemux translatables to help_mp part 1 / mp_msg calls / try 2
reynaldo
parents: 16418
diff changeset
650 mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_ASF_ServerReturn, http_hdr->status_code, http_hdr->reason_phrase);
6677
0b3d4b298056 Fixed the asf http authentication.
bertrand
parents: 6670
diff changeset
651 return -1;
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
652 }
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
653
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
654 content_type = http_get_field( http_hdr, "Content-Type");
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
655 //printf("Content-Type: [%s]\n", content_type);
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
656
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
657 pragma = http_get_field( http_hdr, "Pragma");
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
658 while( pragma!=NULL ) {
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
659 char *comma_ptr=NULL;
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
660 char *end;
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
661 //printf("Pragma: [%s]\n", pragma );
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29031
diff changeset
662 // The pragma line can get severals attributes
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
663 // separeted with a comma ','.
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
664 do {
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
665 if( !strncasecmp( pragma, "features=", 9) ) {
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
666 pragma += 9;
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
667 end = strstr( pragma, "," );
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
668 if( end==NULL ) {
17837
eabc94f30183 fix feature pragma length check
reimar
parents: 16930
diff changeset
669 len = strlen(pragma);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29031
diff changeset
670 } else {
17837
eabc94f30183 fix feature pragma length check
reimar
parents: 16930
diff changeset
671 len = (unsigned int)(end-pragma);
eabc94f30183 fix feature pragma length check
reimar
parents: 16930
diff changeset
672 }
eabc94f30183 fix feature pragma length check
reimar
parents: 16930
diff changeset
673 if(len > sizeof(features) - 1) {
17840
42843606bc06 Fix compilation error introduced by last commit
reimar
parents: 17837
diff changeset
674 mp_msg(MSGT_NETWORK,MSGL_WARN,MSGTR_MPDEMUX_ASF_ASFHTTPParseWarnCuttedPragma,pragma,len,sizeof(features) - 1);
17837
eabc94f30183 fix feature pragma length check
reimar
parents: 16930
diff changeset
675 len = sizeof(features) - 1;
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
676 }
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
677 strncpy( features, pragma, len );
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
678 features[len]='\0';
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
679 break;
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
680 }
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
681 comma_ptr = strstr( pragma, "," );
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
682 if( comma_ptr!=NULL ) {
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
683 pragma = comma_ptr+1;
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
684 if( pragma[0]==' ' ) pragma++;
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
685 }
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
686 } while( comma_ptr!=NULL );
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
687 pragma = http_get_next_field( http_hdr );
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
688 }
7953
60624e692b95 GCC warning fixes
bertrand
parents: 7472
diff changeset
689 asf_http_ctrl->streaming_type = asf_http_streaming_type( content_type, features, http_hdr );
60624e692b95 GCC warning fixes
bertrand
parents: 7472
diff changeset
690 return 0;
871
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
691 }
ab94c4cf96d8 Continue implementation of ASF streaming.
bertrand
parents: 833
diff changeset
692
15626
941b1a71351f printf converted to mp_msg; made static many unnecessarily global symbols
nicodvb
parents: 15585
diff changeset
693 static int asf_http_streaming_start( stream_t *stream, int *demuxer_type ) {
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
694 HTTP_header_t *http_hdr=NULL;
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
695 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
696 asf_http_streaming_ctrl_t *asf_http_ctrl;
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
697 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
698 int i, ret;
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
699 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
700 int done;
6677
0b3d4b298056 Fixed the asf http authentication.
bertrand
parents: 6670
diff changeset
701 int auth_retry = 0;
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
702
19062
83c3afeab35d drops casts from void * on malloc/calloc from libmpdemux code
reynaldo
parents: 18558
diff changeset
703 asf_http_ctrl = malloc(sizeof(asf_http_streaming_ctrl_t));
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
704 if( asf_http_ctrl==NULL ) {
16907
54a414dd1c0b Changed MSGTR_MPDEMUX_ASF_MallocFailed to MSGTR_MemAllocFailed (msg defined two times inhelp_mp-en.h)
ptt
parents: 16882
diff changeset
705 mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MemAllocFailed);
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
706 return -1;
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
707 }
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
708 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
709 asf_http_ctrl->request = 1;
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
710 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
711 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
712 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
713
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
714 do {
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
715 done = 1;
10281
54bcbf28698a Networking support under MinGW.
diego
parents: 10206
diff changeset
716 if( fd>0 ) closesocket( fd );
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
717
4145
c66fddd8867c Changed the proxy protocol to http_proxy.
bertrand
parents: 4121
diff changeset
718 if( !strcasecmp( url->protocol, "http_proxy" ) ) {
4121
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
719 if( url->port==0 ) url->port = 8080;
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
720 } else {
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
721 if( url->port==0 ) url->port = 80;
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
722 }
10625
620cc649f519 ftp support. The change on connect2Server is needed bcs we need 2
albeu
parents: 10281
diff changeset
723 fd = connect2Server( url->hostname, url->port, 1);
7252
0a0527c82560 - If fatal error while trying to connect to a WM server, skip other proto.
bertrand
parents: 6677
diff changeset
724 if( fd<0 ) return fd;
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
725
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
726 http_hdr = asf_http_request( stream->streaming_ctrl );
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
727 mp_msg(MSGT_NETWORK,MSGL_DBG2,"Request [%s]\n", http_hdr->buffer );
7953
60624e692b95 GCC warning fixes
bertrand
parents: 7472
diff changeset
728 for(i=0; i < (int)http_hdr->buffer_size ; ) {
31500
b01f807eb183 Use MSG_NOSIGNAL flag if available for send().
reimar
parents: 31427
diff changeset
729 int r = send( fd, http_hdr->buffer+i, http_hdr->buffer_size-i, DEFAULT_SEND_FLAGS );
3494
fb9de639ed30 Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3475
diff changeset
730 if(r <0) {
16882
dfbe8cd0e081 libmpdemux translatables to help_mp part 1 / mp_msg calls / try 2
reynaldo
parents: 16418
diff changeset
731 mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_ASF_SocketWriteError,strerror(errno));
21537
21263c9ddd87 Avoid memory and fd leaks in asf streaming open code.
reimar
parents: 20100
diff changeset
732 goto err_out;
3494
fb9de639ed30 Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3475
diff changeset
733 }
fb9de639ed30 Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3475
diff changeset
734 i += r;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29031
diff changeset
735 }
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
736 http_free( http_hdr );
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
737 http_hdr = http_new_header();
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
738 do {
10206
35e306346e59 Using recv/send instead read/write for proper MinGW support (it's a 4.2BSD standard). Patch by FloDt <flodt8@yahoo.de>
alex
parents: 9749
diff changeset
739 i = recv( fd, buffer, BUFFER_SIZE, 0 );
4121
a71d4ffc6c97 Added proxy support.
bertrand
parents: 4073
diff changeset
740 //printf("read: %d\n", i );
7310
d8e2623a2ea1 Don't try to reread from the socket if the server says EOF
bertrand
parents: 7252
diff changeset
741 if( i<=0 ) {
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
742 perror("read");
21537
21263c9ddd87 Avoid memory and fd leaks in asf streaming open code.
reimar
parents: 20100
diff changeset
743 goto err_out;
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
744 }
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
745 http_response_append( http_hdr, buffer, i );
2489
0ecc1b4f7cf8 Added ASF http server streaming (Not mms streaming).
bertrand
parents: 2310
diff changeset
746 } while( !http_is_header_entire( http_hdr ) );
17932
3fe3b2b3a6ce Convert all if(verbose>X) to mp_msg_test calls.
diego
parents: 17840
diff changeset
747 if( mp_msg_test(MSGT_NETWORK,MSGL_V) ) {
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
748 http_hdr->buffer[http_hdr->buffer_size]='\0';
5915
f716aa9e2df2 Convert printf to mp_msg in the network layer
albeu
parents: 5617
diff changeset
749 mp_msg(MSGT_NETWORK,MSGL_DBG2,"Response [%s]\n", http_hdr->buffer );
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
750 }
7953
60624e692b95 GCC warning fixes
bertrand
parents: 7472
diff changeset
751 ret = asf_http_parse_response(asf_http_ctrl, http_hdr);
60624e692b95 GCC warning fixes
bertrand
parents: 7472
diff changeset
752 if( ret<0 ) {
16882
dfbe8cd0e081 libmpdemux translatables to help_mp part 1 / mp_msg calls / try 2
reynaldo
parents: 16418
diff changeset
753 mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_ASF_HeaderParseFailed);
21537
21263c9ddd87 Avoid memory and fd leaks in asf streaming open code.
reimar
parents: 20100
diff changeset
754 goto err_out;
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
755 }
7953
60624e692b95 GCC warning fixes
bertrand
parents: 7472
diff changeset
756 switch( asf_http_ctrl->streaming_type ) {
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
757 case ASF_Live_e:
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
758 case ASF_Prerecorded_e:
2489
0ecc1b4f7cf8 Added ASF http server streaming (Not mms streaming).
bertrand
parents: 2310
diff changeset
759 case ASF_PlainText_e:
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
760 if( http_hdr->body_size>0 ) {
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
761 if( streaming_bufferize( stream->streaming_ctrl, http_hdr->body, http_hdr->body_size )<0 ) {
21537
21263c9ddd87 Avoid memory and fd leaks in asf streaming open code.
reimar
parents: 20100
diff changeset
762 goto err_out;
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
763 }
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
764 }
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
765 if( asf_http_ctrl->request==1 ) {
7953
60624e692b95 GCC warning fixes
bertrand
parents: 7472
diff changeset
766 if( asf_http_ctrl->streaming_type!=ASF_PlainText_e ) {
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
767 // First request, we only got the ASF header.
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
768 ret = asf_streaming_parse_header(fd,stream->streaming_ctrl);
21537
21263c9ddd87 Avoid memory and fd leaks in asf streaming open code.
reimar
parents: 20100
diff changeset
769 if(ret < 0) goto err_out;
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
770 if(asf_http_ctrl->n_audio == 0 && asf_http_ctrl->n_video == 0) {
16882
dfbe8cd0e081 libmpdemux translatables to help_mp part 1 / mp_msg calls / try 2
reynaldo
parents: 16418
diff changeset
771 mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_ASF_NoStreamFound);
21537
21263c9ddd87 Avoid memory and fd leaks in asf streaming open code.
reimar
parents: 20100
diff changeset
772 goto err_out;
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
773 }
4312
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
774 asf_http_ctrl->request++;
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
775 done = 0;
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
776 } else {
971836f677a9 Added a turn around for badly configured web servers.
bertrand
parents: 4288
diff changeset
777 done = 1;
3533
6e6a74d2d1ea Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3494
diff changeset
778 }
3454
78057c7120f6 Added a switch for the ASF streaming protocol. It will first try ASF/UDP,
bertrand
parents: 3042
diff changeset
779 }
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
780 break;
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
781 case ASF_Redirector_e:
4073
5f28d9d7d346 Changed the return value of the start function. Doesn't return the fd
bertrand
parents: 4046
diff changeset
782 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
783 if( streaming_bufferize( stream->streaming_ctrl, http_hdr->body, http_hdr->body_size )<0 ) {
21537
21263c9ddd87 Avoid memory and fd leaks in asf streaming open code.
reimar
parents: 20100
diff changeset
784 goto err_out;
4073
5f28d9d7d346 Changed the return value of the start function. Doesn't return the fd
bertrand
parents: 4046
diff changeset
785 }
5f28d9d7d346 Changed the return value of the start function. Doesn't return the fd
bertrand
parents: 4046
diff changeset
786 }
9749
58e5880f4788 Use new config headers
albeu
parents: 8823
diff changeset
787 *demuxer_type = DEMUXER_TYPE_PLAYLIST;
4073
5f28d9d7d346 Changed the return value of the start function. Doesn't return the fd
bertrand
parents: 4046
diff changeset
788 done = 1;
5f28d9d7d346 Changed the return value of the start function. Doesn't return the fd
bertrand
parents: 4046
diff changeset
789 break;
6677
0b3d4b298056 Fixed the asf http authentication.
bertrand
parents: 6670
diff changeset
790 case ASF_Authenticate_e:
0b3d4b298056 Fixed the asf http authentication.
bertrand
parents: 6670
diff changeset
791 if( http_authenticate( http_hdr, url, &auth_retry)<0 ) return -1;
0b3d4b298056 Fixed the asf http authentication.
bertrand
parents: 6670
diff changeset
792 asf_http_ctrl->streaming_type = ASF_Unknown_e;
0b3d4b298056 Fixed the asf http authentication.
bertrand
parents: 6670
diff changeset
793 done = 0;
0b3d4b298056 Fixed the asf http authentication.
bertrand
parents: 6670
diff changeset
794 break;
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
795 case ASF_Unknown_e:
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
796 default:
16882
dfbe8cd0e081 libmpdemux translatables to help_mp part 1 / mp_msg calls / try 2
reynaldo
parents: 16418
diff changeset
797 mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_ASF_UnknownASFStreamingType);
21537
21263c9ddd87 Avoid memory and fd leaks in asf streaming open code.
reimar
parents: 20100
diff changeset
798 goto err_out;
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
799 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29031
diff changeset
800 // Check if we got a redirect.
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
801 } while(!done);
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
802
4073
5f28d9d7d346 Changed the return value of the start function. Doesn't return the fd
bertrand
parents: 4046
diff changeset
803 stream->fd = fd;
7953
60624e692b95 GCC warning fixes
bertrand
parents: 7472
diff changeset
804 if( asf_http_ctrl->streaming_type==ASF_PlainText_e || asf_http_ctrl->streaming_type==ASF_Redirector_e ) {
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
805 stream->streaming_ctrl->streaming_read = nop_streaming_read;
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
806 stream->streaming_ctrl->streaming_seek = nop_streaming_seek;
2489
0ecc1b4f7cf8 Added ASF http server streaming (Not mms streaming).
bertrand
parents: 2310
diff changeset
807 } else {
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
808 stream->streaming_ctrl->streaming_read = asf_http_streaming_read;
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
809 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
810 stream->streaming_ctrl->buffering = 1;
2489
0ecc1b4f7cf8 Added ASF http server streaming (Not mms streaming).
bertrand
parents: 2310
diff changeset
811 }
3042
6b6fa2be9b97 Removed my buffer hack to use cache2.
bertrand
parents: 2555
diff changeset
812 stream->streaming_ctrl->status = streaming_playing_e;
15585
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
813 stream->close = close_s;
1001
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
814
876c3edc2fa9 Continue implementation of ASF streaming.
bertrand
parents: 905
diff changeset
815 http_free( http_hdr );
4073
5f28d9d7d346 Changed the return value of the start function. Doesn't return the fd
bertrand
parents: 4046
diff changeset
816 return 0;
21537
21263c9ddd87 Avoid memory and fd leaks in asf streaming open code.
reimar
parents: 20100
diff changeset
817
21263c9ddd87 Avoid memory and fd leaks in asf streaming open code.
reimar
parents: 20100
diff changeset
818 err_out:
21263c9ddd87 Avoid memory and fd leaks in asf streaming open code.
reimar
parents: 20100
diff changeset
819 if (fd > 0)
21263c9ddd87 Avoid memory and fd leaks in asf streaming open code.
reimar
parents: 20100
diff changeset
820 closesocket(fd);
21263c9ddd87 Avoid memory and fd leaks in asf streaming open code.
reimar
parents: 20100
diff changeset
821 stream->fd = -1;
21263c9ddd87 Avoid memory and fd leaks in asf streaming open code.
reimar
parents: 20100
diff changeset
822 http_free(http_hdr);
21263c9ddd87 Avoid memory and fd leaks in asf streaming open code.
reimar
parents: 20100
diff changeset
823 return -1;
905
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
824 }
4b6f81dbb2da Continue implementation.
bertrand
parents: 871
diff changeset
825
15585
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
826 static int open_s(stream_t *stream,int mode, void* opts, int* file_format) {
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
827 URL_t *url;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
828
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
829 stream->streaming_ctrl = streaming_ctrl_new();
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
830 if( stream->streaming_ctrl==NULL ) {
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
831 return STREAM_ERROR;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
832 }
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
833 stream->streaming_ctrl->bandwidth = network_bandwidth;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
834 url = url_new(stream->url);
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
835 stream->streaming_ctrl->url = check4proxies(url);
16418
264b3b909850 check4proxies always creates a copy, so url should be freed
reimar
parents: 16112
diff changeset
836 url_free(url);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29031
diff changeset
837
16930
41aeb5e0cb4b Fix bugs/crash introduced by translation patch
reimar
parents: 16907
diff changeset
838 mp_msg(MSGT_OPEN, MSGL_INFO, MSGTR_MPDEMUX_ASF_InfoStreamASFURL, stream->url);
15585
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
839 if((!strncmp(stream->url, "http", 4)) && (*file_format!=DEMUXER_TYPE_ASF && *file_format!=DEMUXER_TYPE_UNKNOWN)) {
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
840 streaming_ctrl_free(stream->streaming_ctrl);
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
841 stream->streaming_ctrl = NULL;
24257
d261f5109660 cosmetics: typo fix UNSUPORTED --> UNSUPPORTED
diego
parents: 23675
diff changeset
842 return STREAM_UNSUPPORTED;
15585
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
843 }
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
844
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
845 if(asf_streaming_start(stream, file_format) < 0) {
16882
dfbe8cd0e081 libmpdemux translatables to help_mp part 1 / mp_msg calls / try 2
reynaldo
parents: 16418
diff changeset
846 mp_msg(MSGT_OPEN, MSGL_ERR, MSGTR_MPDEMUX_ASF_StreamingFailed);
15585
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
847 streaming_ctrl_free(stream->streaming_ctrl);
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
848 stream->streaming_ctrl = NULL;
24257
d261f5109660 cosmetics: typo fix UNSUPORTED --> UNSUPPORTED
diego
parents: 23675
diff changeset
849 return STREAM_UNSUPPORTED;
15585
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
850 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29031
diff changeset
851
25387
95893c0e5108 do not override *file_format if already set by asf_streaming_start()
ben
parents: 25211
diff changeset
852 if (*file_format != DEMUXER_TYPE_PLAYLIST)
25388
57c207e33831 cosmetic: indent after r25415
ben
parents: 25387
diff changeset
853 *file_format = DEMUXER_TYPE_ASF;
15585
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
854 stream->type = STREAMTYPE_STREAM;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
855 fixup_network_stream_cache(stream);
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
856 return STREAM_OK;
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
857 }
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
858
25211
c1d17bd6683c Mark all stream_info_t as const
reimar
parents: 24257
diff changeset
859 const stream_info_t stream_info_asf = {
15585
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
860 "mms and mms over http streaming",
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
861 "null",
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
862 "Bertrand, Reimar Doeffinger, Albeu",
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
863 "originally based on work by Majormms (is that code still there?)",
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
864 open_s,
29029
c9db53414b53 Add support for mmsh:// as alias for mmshttp://
reimar
parents: 28402
diff changeset
865 {"mms", "mmsu", "mmst", "http", "http_proxy", "mmsh", "mmshttp", NULL},
15585
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
866 NULL,
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
867 0 // Urls are an option string
281d155fb37f ported all network streams to the new API
nicodvb
parents: 14639
diff changeset
868 };